update substack cmd

devRD · devRD · commit e5f318dfacd0 · 2023-07-10T04:11:58.000+05:30
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -14,10 +14,10 @@
 
 import numpy as np
 from pyparsing import (
-    Empty, Forward, Literal, NotAny, oneOf, OneOrMore, Optional, delimited_list,
+    Empty, Forward, Literal, NotAny, oneOf, OneOrMore, Optional,
     ParseBaseException, ParseException, ParseExpression, ParseFatalException,
     ParserElement, ParseResults, QuotedString, Regex, StringEnd, ZeroOrMore,
-    pyparsing_common)
+    pyparsing_common, nested_expr, Group)
 
 import matplotlib as mpl
 from . import cbook
@@ -1700,7 +1700,6 @@ def names(elt):
     csname = expr.split("{", 1)[0]
     err = (csname + "".join("{%s}" % name for name in names(args))
            if expr == csname else expr)
-    print(csname, args, err)
     return csname - (args | Error(f"Expected {err}"))
 
 
@@ -1871,7 +1870,6 @@ def csnames(group, names):
         p.required_group   = Forward()
         p.optional_group   = Forward()
         p.token            = Forward()
-        p.substack         = Forward()
 
         set_names_and_parse_actions()  # for mutually recursive definitions.
 
@@ -1917,6 +1915,11 @@ def csnames(group, names):
 
         p.text = cmd(r"\text", QuotedString('{', '\\', endQuoteChar="}"))
 
+        p.substack = cmd(r"\substack",
+                           nested_expr(opener="{", closer="}",
+                                       content=Group(OneOrMore(p.token)) +
+                                       ZeroOrMore(Literal("\\\\").suppress()))("parts"))
+
         p.subsuper = (
             (Optional(p.placeable)("nucleus")
              + OneOrMore(oneOf(["_", "^"]) - p.placeable)("subsuper")
@@ -1935,9 +1938,6 @@ def csnames(group, names):
 
         p.operatorname = cmd(r"\operatorname", "{" + ZeroOrMore(p.simple)("name") + "}")
 
-        p.substack <<= cmd(
-            r"\substack", "{"+delimited_list(OneOrMore(p.token), delim="\\\\", combine=True)("parts")+"}")
-
         p.placeable     <<= (
             p.accent     # Must be before symbol as all accents are symbols
             | p.symbol   # Must be second to catch all named symbols and single
@@ -1953,8 +1953,8 @@ def csnames(group, names):
             | p.underset
             | p.sqrt
             | p.overline
-            | p.substack
             | p.text
+            | p.substack
         )
 
         p.auto_delim    <<= (
@@ -1977,7 +1977,6 @@ def csnames(group, names):
 
         # To add space to nucleus operators after sub/superscripts
         self._in_subscript_or_superscript = False
-        self.p = p
 
     def parse(self, s, fonts_object, fontsize, dpi):
         """
@@ -2606,17 +2605,15 @@ def auto_delim(self, s, loc, toks):
             toks["right"])
 
     def substack(self, s, loc, toks):
-        print(list(toks.keys()))
-        print(toks["parts"])
-        parts = toks["parts"].split("\\\\")
-        print(parts)
+        parts = toks["parts"]
         state = self.get_state()
         thickness = state.get_current_underline_thickness()
         vlist = []
 
-        max_width = max(map(lambda c: c.width, parts))
+        hlist = [Hlist(k) for k in parts[0]]
+        max_width = max(map(lambda c: c.width, hlist))
 
-        for sub in parts:
+        for sub in hlist:
             cp = HCentered([sub])
             cp.hpack(max_width, 'exactly')
             vlist.append(cp)
@@ -2625,7 +2622,6 @@ def substack(self, s, loc, toks):
                                      [Vbox(0, thickness * 2)] *
                                      len(vlist)) for val in pair]
         del vlist[-1]
-
         vlt = Vlist(vlist)
         result = [Hlist([vlt])]
         return result
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_05.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_05.png
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -134,7 +134,7 @@
     r'$\sum x\quad\sum^nx\quad\sum_nx\quad\sum_n^nx\quad\prod x\quad\prod^nx\quad\prod_nx\quad\prod_n^nx$',  # GitHub issue 18085
     r'$1.$ $2.$ $19680801.$ $a.$ $b.$ $mpl.$',
     r'$\text{text}_{\text{sub}}^{\text{sup}} + \text{\$foo\$} + \frac{\text{num}}{\mathbf{\text{den}}}\text{with space, curly brackets \{\}, and dash -}$',
-    r'$\sum_{\substack{k = 1}{k \neq \lfloor n/2\rfloor}}^{n}P(i,j) \sum_{\substack{i \neq 0}{-1 \leq i \leq 3}{1 \leq j \leq 5}} F^i(x,y) \sum_{\substack{\left \lfloor \frac{n}{2} \right\rfloor}} F(n)$',
+    r'$\sum_{\substack{k = 1\\ k \neq \lfloor n/2\rfloor}}^{n}P(i,j) \sum_{\substack{i \neq 0\\ -1 \leq i \leq 3\\ 1 \leq j \leq 5}} F^i(x,y) \sum_{\substack{\left \lfloor \frac{n}{2} \right\rfloor}} F(n)$',
 ]
 
 digits = "0123456789"

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@`
`134`	`134`	`r'$\sum x\quad\sum^nx\quad\sum_nx\quad\sum_n^nx\quad\prod x\quad\prod^nx\quad\prod_nx\quad\prod_n^nx$', # GitHub issue 18085`
`135`	`135`	`r'$1.$ $2.$ $19680801.$ $a.$ $b.$ $mpl.$',`
`136`	`136`	`r'$\text{text}_{\text{sub}}^{\text{sup}} + \text{\$foo\$} + \frac{\text{num}}{\mathbf{\text{den}}}\text{with space, curly brackets \{\}, and dash -}$',`
`137`		`- r'$\sum_{\substack{k = 1}{k \neq \lfloor n/2\rfloor}}^{n}P(i,j) \sum_{\substack{i \neq 0}{-1 \leq i \leq 3}{1 \leq j \leq 5}} F^i(x,y) \sum_{\substack{\left \lfloor \frac{n}{2} \right\rfloor}} F(n)$',`
	`137`	`+ r'$\sum_{\substack{k = 1\\ k \neq \lfloor n/2\rfloor}}^{n}P(i,j) \sum_{\substack{i \neq 0\\ -1 \leq i \leq 3\\ 1 \leq j \leq 5}} F^i(x,y) \sum_{\substack{\left \lfloor \frac{n}{2} \right\rfloor}} F(n)$',`
`138`	`138`	`]`
`139`	`139`
`140`	`140`	`digits = "0123456789"`