update latex processing + repr_gallery.ipynb

murrayrm · murrayrm · commit 8402605699ee · 2025-01-12T17:28:33.000-08:00
diff --git a/control/statesp.py b/control/statesp.py
@@ -422,9 +422,9 @@ def _repr_html_(self):
         if syssize > config.defaults['statesp.latex_maxsize']:
             return None
         elif config.defaults['statesp.latex_repr_type'] == 'partitioned':
-            return super()._repr_info(html=True) + self._latex_partitioned()
+            return super()._repr_info_(html=True) + self._latex_partitioned()
         elif config.defaults['statesp.latex_repr_type'] == 'separate':
-            return super()._repr_info(html=True) + self._latex_separate()
+            return super()._repr_info_(html=True) + self._latex_separate()
         else:
             raise ValueError(
                 "Unknown statesp.latex_repr_type '{cfg}'".format(
@@ -445,7 +445,7 @@ def _latex_partitioned_stateless(self):
 
         lines = [
             r'$$',
-            (r'\left('
+            (r'\left['
              + r'\begin{array}'
              + r'{' + 'rll' * self.ninputs + '}')
             ]
@@ -456,7 +456,7 @@ def _latex_partitioned_stateless(self):
 
         lines.extend([
             r'\end{array}'
-            r'\right)',
+            r'\right]',
             r'$$'])
 
         return '\n'.join(lines)
@@ -481,7 +481,7 @@ def _latex_partitioned(self):
 
         lines = [
             r'$$',
-            (r'\left('
+            (r'\left['
              + r'\begin{array}'
              + r'{' + 'rll' * self.nstates + '|' + 'rll' * self.ninputs + '}')
             ]
@@ -498,7 +498,7 @@ def _latex_partitioned(self):
 
         lines.extend([
             r'\end{array}'
-            + r'\right)',
+            + r'\right]',
             r'$$'])
 
         return '\n'.join(lines)
@@ -519,15 +519,15 @@ def _latex_separate(self):
 
         def fmt_matrix(matrix, name):
             matlines = [name
-                        + r' = \left(\begin{array}{'
+                        + r' = \left[\begin{array}{'
                         + 'rll' * matrix.shape[1]
                         + '}']
             for row in asarray(matrix):
                 matlines.append('&'.join(_f2s(entry) for entry in row)
                                 + '\\\\')
             matlines.extend([
                 r'\end{array}'
-                r'\right)'])
+                r'\right]'])
             return matlines
 
         if self.nstates > 0:
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -522,7 +522,7 @@ def _repr_html_(self, var=None):
         mimo = not self.issiso()
         if var is None:
             var = 's' if self.isctime() else 'z'
-        out = ['$$']
+        out = [super()._repr_info_(html=True), '$$']
 
         if mimo:
             out.append(r"\begin{bmatrix}")
@@ -545,7 +545,7 @@ def _repr_html_(self, var=None):
                 numstr = _tf_string_to_latex(numstr, var=var)
                 denstr = _tf_string_to_latex(denstr, var=var)
 
-                out += [r"\frac{", numstr, "}{", denstr, "}"]
+                out += [r"\dfrac{", numstr, "}{", denstr, "}"]
 
                 if mimo and ni < self.ninputs - 1:
                     out.append("&")
diff --git a/examples/repr_gallery.ipynb b/examples/repr_gallery.ipynb
