matplotlib
diff --git a/‎doc/users/next_whats_new/mathtext_supports_text.rst‎
Lines changed: 10 additions & 0 deletions b/‎doc/users/next_whats_new/mathtext_supports_text.rst‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎lib/matplotlib/_mathtext.py‎
Lines changed: 13 additions & 0 deletions b/‎lib/matplotlib/_mathtext.py‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_83.pdf‎
14.3 KB b/‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_83.pdf‎
14.3 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_83.png‎
4.48 KB b/‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_83.png‎
4.48 KB
@@ -0,0 +1,10 @@
+``mathtext`` now supports ``\text``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``\text`` can be used to obtain upright text within an equation.
+
+.. code-block:: python
+
+import matplotlib.pyplot as plt
+plt.text(0.1, 0.5, r"$a = \sin(\phi) \text{ such that } \phi = \frac{x}{y}$")
+plt.draw()
@@ -1857,6 +1857,7 @@ def csnames(group, names):
         p.optional_group   = Forward()
         p.sqrt             = Forward()
         p.subsuper         = Forward()
+        p.text             = Forward()
         p.token            = Forward()
         p.underset         = Forward()
 
@@ -1907,6 +1908,8 @@ def csnames(group, names):
             r"\underset",
             p.optional_group("annotation") + p.optional_group("body"))
 
+        p.text <<= cmd(r"\text", QuotedString('{', '\\', endQuoteChar="}"))
+
         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
@@ -1922,6 +1925,7 @@ def csnames(group, names):
             | p.underset
             | p.sqrt
             | p.overline
+            | p.text
         )
 
         p.simple        <<= (
@@ -2022,6 +2026,15 @@ def non_math(self, s, loc, toks):
 
     float_literal = staticmethod(pyparsing_common.convertToFloat)
 
+    def text(self, s, loc, toks):
+        self.push_state()
+        state = self.get_state()
+        state.font = 'rm'
+        s = toks[1].replace(r'\$', '$').replace(r'\{', '{').replace(r'\}', '}')
+        hlist = Hlist([Char(c, state) for c in s])
+        self.pop_state()
+        return [hlist]
+
     def _make_space(self, percentage):
         # In TeX, an em (the unit usually used to measure horizontal lengths)
         # is not the width of the character 'm'; it is the same in different