Skip to content

Commit 9609937

Browse files
authored
Merge pull request matplotlib#26102 from oscargus/mathtextdocgeneration
Start basing mathtext tutorial on mathtext parser
2 parents f1fd3df + 63e60ef commit 9609937

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

doc/sphinxext/math_symbol_table.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,23 @@
99
r"""\alpha \beta \gamma \chi \delta \epsilon \eta \iota \kappa
1010
\lambda \mu \nu \omega \phi \pi \psi \rho \sigma \tau \theta
1111
\upsilon \xi \zeta \digamma \varepsilon \varkappa \varphi
12-
\varpi \varrho \varsigma \vartheta"""],
12+
\varpi \varrho \varsigma \vartheta""".split()],
1313
["Upper-case Greek",
1414
8,
1515
r"""\Delta \Gamma \Lambda \Omega \Phi \Pi \Psi \Sigma \Theta
16-
\Upsilon \Xi \mho \nabla"""],
16+
\Upsilon \Xi \mho \nabla""".split()],
1717
["Hebrew",
1818
6,
19-
r"""\aleph \beth \daleth \gimel"""],
19+
r"""\aleph \beth \daleth \gimel""".split()],
2020
["Delimiters",
2121
6,
22-
r"""| \{ \lfloor / \Uparrow \llcorner \vert \} \rfloor \backslash
23-
\uparrow \lrcorner \| \langle \lceil [ \Downarrow \ulcorner
24-
\Vert \rangle \rceil ] \downarrow \urcorner"""],
22+
_mathtext.Parser._delims],
2523
["Big symbols",
2624
6,
27-
r"""\bigcap \bigcup \bigodot \bigoplus \bigotimes \biguplus
28-
\bigvee \bigwedge \coprod \oint \prod \sum \int"""],
25+
_mathtext.Parser._overunder_symbols | _mathtext.Parser._dropsub_symbols],
2926
["Standard function names",
3027
6,
31-
r"""\arccos \csc \ker \min \arcsin \deg \lg \Pr \arctan \det \lim
32-
\gcd \ln \sup \cot \hom \log \tan \coth \inf \max \tanh
33-
\sec \arg \dim \liminf \sin \cos \exp \limsup \sinh \cosh"""],
28+
{fr"\{fn}" for fn in _mathtext.Parser._function_names}],
3429
["Binary operation and relation symbols",
3530
4,
3631
r"""\ast \pm \slash \cap \star \mp \cup \cdot \uplus
@@ -62,7 +57,7 @@
6257
\lneqq \gneqq \ntriangleright \lnsim \gnsim \ntrianglerighteq
6358
\coloneq \eqsim \nequiv \napprox \nsupset \doublebarwedge \nVdash
6459
\Doteq \nsubset \eqcolon \ne
65-
"""],
60+
""".split()],
6661
["Arrow symbols",
6762
4,
6863
r"""\leftarrow \longleftarrow \uparrow \Leftarrow \Longleftarrow
@@ -85,7 +80,7 @@
8580
\nrightarrow \nLeftarrow \nRightarrow \nleftrightarrow
8681
\nLeftrightarrow \to \Swarrow \Searrow \Nwarrow \Nearrow
8782
\leftsquigarrow
88-
"""],
83+
""".split()],
8984
["Miscellaneous symbols",
9085
4,
9186
r"""\neg \infty \forall \wp \exists \bigstar \angle \partial
@@ -95,7 +90,7 @@
9590
\hslash \vdots \blacksquare \ldots \blacktriangle \ddots \sharp
9691
\prime \blacktriangledown \Im \flat \backprime \Re \natural
9792
\circledS \P \copyright \ss \circledR \S \yen \AA \checkmark \$
98-
\iiint \iint \oiiint"""]
93+
\cent \triangle \QED \sinewave""".split()]
9994
]
10095

10196

@@ -110,7 +105,7 @@ def render_symbol(sym):
110105

111106
lines = []
112107
for category, columns, syms in symbols:
113-
syms = sorted(syms.split())
108+
syms = sorted(list(syms))
114109
columns = min(columns, len(syms))
115110
lines.append("**%s**" % category)
116111
lines.append('')
@@ -155,7 +150,6 @@ def setup(app):
155150
for category, columns, syms in symbols:
156151
if category == "Standard Function Names":
157152
continue
158-
syms = syms.split()
159153
for sym in syms:
160154
if len(sym) > 1:
161155
all_symbols[sym[1:]] = None

lib/matplotlib/_mathtext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@ class _MathStyle(enum.Enum):
17721772

17731773
_overunder_functions = set("lim liminf limsup sup max min".split())
17741774

1775-
_dropsub_symbols = set(r'''\int \oint'''.split())
1775+
_dropsub_symbols = set(r'\int \oint \iint \oiint \iiint \oiiint \iiiint'.split())
17761776

17771777
_fontnames = set("rm cal it tt sf bf bfit "
17781778
"default bb frak scr regular".split())

lib/matplotlib/_mathtext_data.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@
795795
'eth' : 240,
796796
'colon' : 58,
797797
'sqcup' : 8852,
798+
'bigsqcup' : 10758,
798799
'rightrightarrows' : 8649,
799800
'sqsupset' : 8848,
800801
'mapsto' : 8614,
@@ -1078,7 +1079,8 @@
10781079
'varniobar' : 8957,
10791080
'niobar' : 8958,
10801081
'bagmember' : 8959,
1081-
'triangle' : 9651
1082+
'triangle' : 9651,
1083+
'iiiint' : 10764,
10821084
}
10831085

10841086
# Each element is a 4-tuple of the form:

0 commit comments

Comments
 (0)