Skip to content

Commit ce0ad48

Browse files
committed
update latex processing + repr_gallery.ipynb
1 parent 4186750 commit ce0ad48

File tree

3 files changed

+1230
-10
lines changed

3 files changed

+1230
-10
lines changed

control/statesp.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ def _repr_html_(self):
421421
if syssize > config.defaults['statesp.latex_maxsize']:
422422
return None
423423
elif config.defaults['statesp.latex_repr_type'] == 'partitioned':
424-
return super()._repr_info(html=True) + self._latex_partitioned()
424+
return super()._repr_info_(html=True) + self._latex_partitioned()
425425
elif config.defaults['statesp.latex_repr_type'] == 'separate':
426-
return super()._repr_info(html=True) + self._latex_separate()
426+
return super()._repr_info_(html=True) + self._latex_separate()
427427
else:
428428
raise ValueError(
429429
"Unknown statesp.latex_repr_type '{cfg}'".format(
@@ -444,7 +444,7 @@ def _latex_partitioned_stateless(self):
444444

445445
lines = [
446446
r'$$',
447-
(r'\left('
447+
(r'\left['
448448
+ r'\begin{array}'
449449
+ r'{' + 'rll' * self.ninputs + '}')
450450
]
@@ -455,7 +455,7 @@ def _latex_partitioned_stateless(self):
455455

456456
lines.extend([
457457
r'\end{array}'
458-
r'\right)',
458+
r'\right]',
459459
r'$$'])
460460

461461
return '\n'.join(lines)
@@ -480,7 +480,7 @@ def _latex_partitioned(self):
480480

481481
lines = [
482482
r'$$',
483-
(r'\left('
483+
(r'\left['
484484
+ r'\begin{array}'
485485
+ r'{' + 'rll' * self.nstates + '|' + 'rll' * self.ninputs + '}')
486486
]
@@ -497,7 +497,7 @@ def _latex_partitioned(self):
497497

498498
lines.extend([
499499
r'\end{array}'
500-
+ r'\right)',
500+
+ r'\right]',
501501
r'$$'])
502502

503503
return '\n'.join(lines)
@@ -518,15 +518,15 @@ def _latex_separate(self):
518518

519519
def fmt_matrix(matrix, name):
520520
matlines = [name
521-
+ r' = \left(\begin{array}{'
521+
+ r' = \left[\begin{array}{'
522522
+ 'rll' * matrix.shape[1]
523523
+ '}']
524524
for row in asarray(matrix):
525525
matlines.append('&'.join(_f2s(entry) for entry in row)
526526
+ '\\\\')
527527
matlines.extend([
528528
r'\end{array}'
529-
r'\right)'])
529+
r'\right]'])
530530
return matlines
531531

532532
if self.nstates > 0:

control/xferfcn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ def _repr_html_(self, var=None):
519519
mimo = not self.issiso()
520520
if var is None:
521521
var = 's' if self.isctime() else 'z'
522-
out = ['$$']
522+
out = [super()._repr_info_(html=True), '$$']
523523

524524
if mimo:
525525
out.append(r"\begin{bmatrix}")
@@ -542,7 +542,7 @@ def _repr_html_(self, var=None):
542542
numstr = _tf_string_to_latex(numstr, var=var)
543543
denstr = _tf_string_to_latex(denstr, var=var)
544544

545-
out += [r"\frac{", numstr, "}{", denstr, "}"]
545+
out += [r"\dfrac{", numstr, "}{", denstr, "}"]
546546

547547
if mimo and ni < self.ninputs - 1:
548548
out.append("&")

0 commit comments

Comments
 (0)