Merge pull request #18533 from anntzer/unstackrel

QuLogic · web-flow · commit aa82b50c349d · 2020-09-21T17:38:03.000-04:00
Correctly remove support for \stackrel.
diff --git a/doc/api/prev_api_changes/api_changes_3.1.0.rst b/doc/api/prev_api_changes/api_changes_3.1.0.rst
@@ -727,7 +727,7 @@ Mathtext changes
 
 Deprecations
 ~~~~~~~~~~~~
-- The ``\stackrel`` mathtext command hsa been deprecated (it behaved differently
+- The ``\stackrel`` mathtext command has been deprecated (it behaved differently
   from LaTeX's ``\stackrel``.  To stack two mathtext expressions, use
   ``\genfrac{left-delim}{right-delim}{fraction-bar-thickness}{}{top}{bottom}``.
 - The ``\mathcircled`` mathtext command (which is not a real TeX command)
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -2059,7 +2059,6 @@ def __init__(self):
         p.accentprefixed   = Forward()
         p.space            = Forward()
         p.sqrt             = Forward()
-        p.stackrel         = Forward()
         p.start_group      = Forward()
         p.subsuper         = Forward()
         p.subsuperop       = Forward()
@@ -2144,12 +2143,6 @@ def __init__(self):
                | Error(r"Expected \dfrac{num}{den}"))
         )
 
-        p.stackrel      <<= Group(
-            Suppress(Literal(r"\stackrel"))
-            - ((p.required_group + p.required_group)
-               | Error(r"Expected \stackrel{num}{den}"))
-        )
-
         p.binom         <<= Group(
             Suppress(Literal(r"\binom"))
             - ((p.required_group + p.required_group)
@@ -2206,7 +2199,6 @@ def __init__(self):
             | p.group
             | p.frac
             | p.dfrac
-            | p.stackrel
             | p.binom
             | p.genfrac
             | p.sqrt
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -218,8 +218,6 @@ def test_fontinfo():
         (r'$\hspace{foo}$', r'Expected \hspace{n}'),
         (r'$\frac$', r'Expected \frac{num}{den}'),
         (r'$\frac{}{}$', r'Expected \frac{num}{den}'),
-        (r'$\stackrel$', r'Expected \stackrel{num}{den}'),
-        (r'$\stackrel{}{}$', r'Expected \stackrel{num}{den}'),
         (r'$\binom$', r'Expected \binom{num}{den}'),
         (r'$\binom{}{}$', r'Expected \binom{num}{den}'),
         (r'$\genfrac$',
@@ -242,8 +240,6 @@ def test_fontinfo():
         'hspace with invalid value',
         'frac without parameters',
         'frac with empty parameters',
-        'stackrel without parameters',
-        'stackrel with empty parameters',
         'binom without parameters',
         'binom with empty parameters',
         'genfrac without parameters',
diff --git a/tutorials/text/mathtext.py b/tutorials/text/mathtext.py
@@ -97,7 +97,7 @@
 
 .. math::
 
-    \frac{3}{4} \binom{3}{4} \stackrel{}{}{0}{}{3}{4}
+    \frac{3}{4} \binom{3}{4} \genfrac{}{}{0}{}{3}{4}
 
 Fractions can be arbitrarily nested::
 
