Skip to content

Commit e077394

Browse files
timhoffmtimhoffm
authored
Merge pull request #22877 from anntzer/moremathtextcleanup
Small cleanups to mathtext.
2 parents 2666b0d + 9e80fdd commit e077394

File tree

1 file changed

+50
-52
lines changed

1 file changed

+50
-52
lines changed

‎lib/matplotlib/_mathtext.py

+50-52
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,12 @@ def _get_info(self, fontname, font_class, sym, fontsize, dpi, math=True):
223223
if bunch is not None:
224224
return bunch
225225

226-
font, num, fontsize, slanted = self._get_glyph(
226+
font, num, slanted = self._get_glyph(
227227
fontname, font_class, sym, fontsize, math)
228228

229229
font.set_size(fontsize, dpi)
230230
glyph = font.load_char(
231-
num,
232-
flags=self.mathtext_backend.get_hinting_type())
231+
num, flags=self.mathtext_backend.get_hinting_type())
233232

234233
xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox]
235234
offset = self._get_offset(font, glyph, fontsize, dpi)
@@ -327,7 +326,7 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
327326
if font is not None:
328327
num = ord(sym)
329328
if font is not None and font.get_char_index(num) != 0:
330-
return font, num, fontsize, slanted
329+
return font, num, slanted
331330
else:
332331
return self._stix_fallback._get_glyph(
333332
fontname, font_class, sym, fontsize, math)
@@ -487,10 +486,10 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
487486

488487
g = self._fallback_font._get_glyph(fontname, font_class,
489488
sym, fontsize)
490-
fname = g[0].family_name
491-
if fname in list(BakomaFonts._fontmap.values()):
492-
fname = "Computer Modern"
493-
_log.info("Substituting symbol %s from %s", sym, fname)
489+
family = g[0].family_name
490+
if family in list(BakomaFonts._fontmap.values()):
491+
family = "Computer Modern"
492+
_log.info("Substituting symbol %s from %s", sym, family)
494493
return g
495494

496495
else:
@@ -504,7 +503,7 @@ def _get_glyph(self, fontname, font_class, sym, fontsize, math=True):
504503
uniindex = 0xA4 # currency char, for lack of anything better
505504
slanted = False
506505

507-
return font, uniindex, fontsize, slanted
506+
return font, uniindex, slanted
508507

509508
def get_sized_alternatives_for_symbol(self, fontname, sym):
510509
if self._fallback_font:
@@ -1625,46 +1624,46 @@ class _MathStyle(enum.Enum):
16251624
SCRIPTSTYLE = enum.auto()
16261625
SCRIPTSCRIPTSTYLE = enum.auto()
16271626

1628-
_binary_operators = set('''
1627+
_binary_operators = set(r'''
16291628
+ * -
1630-
\\pm \\sqcap \\rhd
1631-
\\mp \\sqcup \\unlhd
1632-
\\times \\vee \\unrhd
1633-
\\div \\wedge \\oplus
1634-
\\ast \\setminus \\ominus
1635-
\\star \\wr \\otimes
1636-
\\circ \\diamond \\oslash
1637-
\\bullet \\bigtriangleup \\odot
1638-
\\cdot \\bigtriangledown \\bigcirc
1639-
\\cap \\triangleleft \\dagger
1640-
\\cup \\triangleright \\ddagger
1641-
\\uplus \\lhd \\amalg'''.split())
1642-
1643-
_relation_symbols = set('''
1629+
\pm \sqcap \rhd
1630+
\mp \sqcup \unlhd
1631+
\times \vee \unrhd
1632+
\div \wedge \oplus
1633+
\ast \setminus \ominus
1634+
\star \wr \otimes
1635+
\circ \diamond \oslash
1636+
\bullet \bigtriangleup \odot
1637+
\cdot \bigtriangledown \bigcirc
1638+
\cap \triangleleft \dagger
1639+
\cup \triangleright \ddagger
1640+
\uplus \lhd \amalg'''.split())
1641+
1642+
_relation_symbols = set(r'''
16441643
= < > :
1645-
\\leq \\geq \\equiv \\models
1646-
\\prec \\succ \\sim \\perp
1647-
\\preceq \\succeq \\simeq \\mid
1648-
\\ll \\gg \\asymp \\parallel
1649-
\\subset \\supset \\approx \\bowtie
1650-
\\subseteq \\supseteq \\cong \\Join
1651-
\\sqsubset \\sqsupset \\neq \\smile
1652-
\\sqsubseteq \\sqsupseteq \\doteq \\frown
1653-
\\in \\ni \\propto \\vdash
1654-
\\dashv \\dots \\dotplus \\doteqdot'''.split())
1655-
1656-
_arrow_symbols = set('''
1657-
\\leftarrow \\longleftarrow \\uparrow
1658-
\\Leftarrow \\Longleftarrow \\Uparrow
1659-
\\rightarrow \\longrightarrow \\downarrow
1660-
\\Rightarrow \\Longrightarrow \\Downarrow
1661-
\\leftrightarrow \\longleftrightarrow \\updownarrow
1662-
\\Leftrightarrow \\Longleftrightarrow \\Updownarrow
1663-
\\mapsto \\longmapsto \\nearrow
1664-
\\hookleftarrow \\hookrightarrow \\searrow
1665-
\\leftharpoonup \\rightharpoonup \\swarrow
1666-
\\leftharpoondown \\rightharpoondown \\nwarrow
1667-
\\rightleftharpoons \\leadsto'''.split())
1644+
\leq \geq \equiv \models
1645+
\prec \succ \sim \perp
1646+
\preceq \succeq \simeq \mid
1647+
\ll \gg \asymp \parallel
1648+
\subset \supset \approx \bowtie
1649+
\subseteq \supseteq \cong \Join
1650+
\sqsubset \sqsupset \neq \smile
1651+
\sqsubseteq \sqsupseteq \doteq \frown
1652+
\in \ni \propto \vdash
1653+
\dashv \dots \dotplus \doteqdot'''.split())
1654+
1655+
_arrow_symbols = set(r'''
1656+
\leftarrow \longleftarrow \uparrow
1657+
\Leftarrow \Longleftarrow \Uparrow
1658+
\rightarrow \longrightarrow \downarrow
1659+
\Rightarrow \Longrightarrow \Downarrow
1660+
\leftrightarrow \longleftrightarrow \updownarrow
1661+
\Leftrightarrow \Longleftrightarrow \Updownarrow
1662+
\mapsto \longmapsto \nearrow
1663+
\hookleftarrow \hookrightarrow \searrow
1664+
\leftharpoonup \rightharpoonup \swarrow
1665+
\leftharpoondown \rightharpoondown \nwarrow
1666+
\rightleftharpoons \leadsto'''.split())
16681667

16691668
_spaced_symbols = _binary_operators | _relation_symbols | _arrow_symbols
16701669

@@ -1675,8 +1674,7 @@ class _MathStyle(enum.Enum):
16751674
\bigwedge \bigodot \bigotimes \bigoplus \biguplus
16761675
'''.split())
16771676

1678-
_overunder_functions = set(
1679-
"lim liminf limsup sup max min".split())
1677+
_overunder_functions = set("lim liminf limsup sup max min".split())
16801678

16811679
_dropsub_symbols = set(r'''\int \oint'''.split())
16821680

@@ -1687,9 +1685,9 @@ class _MathStyle(enum.Enum):
16871685
liminf sin cos exp limsup sinh cosh gcd ln sup cot hom log tan
16881686
coth inf max tanh""".split())
16891687

1690-
_ambi_delim = set("""
1691-
| \\| / \\backslash \\uparrow \\downarrow \\updownarrow \\Uparrow
1692-
\\Downarrow \\Updownarrow . \\vert \\Vert \\\\|""".split())
1688+
_ambi_delim = set(r"""
1689+
| \| / \backslash \uparrow \downarrow \updownarrow \Uparrow
1690+
\Downarrow \Updownarrow . \vert \Vert \\|""".split())
16931691

16941692
_left_delim = set(r"( [ \{ < \lfloor \langle \lceil".split())
16951693

0 commit comments

Comments
 (0)