Merge pull request #20818 from QuLogic/fix-stix-glyphs

timhoffm · web-flow · commit efdcfc27ae88 · 2021-08-17T16:31:31.000+02:00
Swap Cap/Cup glyphs when using STIX font.
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -20,7 +20,8 @@
 import matplotlib as mpl
 from . import _api, cbook
 from ._mathtext_data import (
-    latex_to_bakoma, latex_to_standard, stix_virtual_fonts, tex2uni)
+    latex_to_bakoma, latex_to_standard, stix_glyph_fixes, stix_virtual_fonts,
+    tex2uni)
 from .afm import AFM
 from .font_manager import FontProperties, findfont, get_font
 from .ft2font import KERNING_DEFAULT
@@ -720,6 +721,10 @@ def _map_virtual_font(self, fontname, font_class, uniindex):
                 uniindex = 0x1
                 fontname = mpl.rcParams['mathtext.default']
 
+        # Fix some incorrect glyphs.
+        if fontname in ('rm', 'it'):
+            uniindex = stix_glyph_fixes.get(uniindex, uniindex)
+
         # Handle private use area glyphs
         if fontname in ('it', 'rm', 'bf') and 0xe000 <= uniindex <= 0xf8ff:
             fontname = 'nonuni' + fontname
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -1384,3 +1384,11 @@
         (0x0061, 0x007a, 'rm', 0x1d68a)  # a-z
         ],
     }
+
+
+# Fix some incorrect glyphs.
+stix_glyph_fixes = {
+    # Cap and Cup glyphs are swapped.
+    0x22d2: 0x22d3,
+    0x22d3: 0x22d2,
+}
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_71.svg
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with matplotlib (http://matplotlib.org/) -->
-<svg height="54pt" version="1.1" viewBox="0 0 378 54" width="378pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="378pt" height="54pt" viewBox="0 0 378 54" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <metadata>
+  <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+   <cc:Work>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:date>2021-08-10T16:39:40.187285</dc:date>
+    <dc:format>image/svg+xml</dc:format>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Matplotlib v3.4.2.post1645+ge771650c3a.d20210810, https://matplotlib.org/</dc:title>
+     </cc:Agent>
+    </dc:creator>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
-  </style>
+  <style type="text/css">*{stroke-linejoin: round; stroke-linecap: butt}</style>
  </defs>
  <g id="figure_1">
   <g id="patch_1">
@@ -15,117 +26,125 @@ L 378 54
 L 378 0 
 L 0 0 
 z
-" style="fill:#ffffff;"/>
+" style="fill: #ffffff"/>
   </g>
   <g id="text_1">
-   <!-- $\Cup$ $\Cap$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$ -->
-   <defs>
-    <path d="M 9.765625 74.03125 
-L 63.421875 74.03125 
-L 63.421875 65.71875 
-L 9.765625 65.71875 
+   <!-- $\Cap$ $\Cup$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$ -->
+   <g transform="translate(152.16 30.31125)scale(0.12 -0.12)">
+    <defs>
+     <path id="DejaVuSans-22d2" d="M 3113 0 
+L 3113 2219 
+Q 3113 2400 2988 2525 
+Q 2863 2650 2681 2650 
+Q 2500 2650 2375 2525 
+Q 2250 2400 2250 2219 
+L 2250 0 
+L 1719 0 
+L 1719 2225 
+Q 1719 2625 2000 2906 
+Q 2275 3181 2681 3181 
+Q 3081 3181 3362 2903 
+Q 3644 2625 3644 2225 
+L 3644 0 
+L 3113 0 
 z
-M 12.890625 0 
-L 30.515625 57.90625 
-L 42.71875 57.90625 
-L 60.296875 0 
-L 50.78125 0 
-L 36.625 45.90625 
-L 22.40625 0 
+M 656 0 
+L 656 2219 
+Q 656 3069 1250 3656 
+Q 1844 4244 2681 4244 
+Q 3519 4244 4119 3656 
+Q 4706 3075 4706 2225 
+L 4706 0 
+L 4175 0 
+L 4175 2225 
+Q 4175 2850 3744 3281 
+Q 3306 3713 2681 3713 
+Q 2056 3713 1625 3281 
+Q 1188 2850 1188 2219 
+L 1188 0 
+L 656 0 
 z
-" id="DejaVuSans-22bc"/>
-    <path d="M 48.640625 0 
-L 48.640625 34.671875 
-Q 48.640625 37.5 46.6875 39.453125 
-Q 44.734375 41.40625 41.890625 41.40625 
-Q 39.0625 41.40625 37.109375 39.453125 
-Q 35.15625 37.5 35.15625 34.671875 
-L 35.15625 0 
-L 26.859375 0 
-L 26.859375 34.765625 
-Q 26.859375 41.015625 31.25 45.40625 
-Q 35.546875 49.703125 41.890625 49.703125 
-Q 48.140625 49.703125 52.53125 45.359375 
-Q 56.9375 41.015625 56.9375 34.765625 
-L 56.9375 0 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-20" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-22d3" d="M 2250 4153 
+L 2250 1934 
+Q 2250 1753 2375 1628 
+Q 2500 1503 2681 1503 
+Q 2863 1503 2988 1628 
+Q 3113 1753 3113 1934 
+L 3113 4153 
+L 3644 4153 
+L 3644 1928 
+Q 3644 1528 3363 1247 
+Q 3088 972 2681 972 
+Q 2281 972 2000 1250 
+Q 1719 1528 1719 1928 
+L 1719 4153 
+L 2250 4153 
 z
-M 10.25 0 
-L 10.25 34.671875 
-Q 10.25 47.953125 19.53125 57.125 
-Q 28.8125 66.3125 41.890625 66.3125 
-Q 54.984375 66.3125 64.359375 57.125 
-Q 73.53125 48.046875 73.53125 34.765625 
-L 73.53125 0 
-L 65.234375 0 
-L 65.234375 34.765625 
-Q 65.234375 44.53125 58.5 51.265625 
-Q 51.65625 58.015625 41.890625 58.015625 
-Q 32.125 58.015625 25.390625 51.265625 
-Q 18.5625 44.53125 18.5625 34.671875 
-L 18.5625 0 
+M 4706 4153 
+L 4706 1934 
+Q 4706 1084 4112 496 
+Q 3519 -91 2681 -91 
+Q 1844 -91 1244 497 
+Q 656 1078 656 1928 
+L 656 4153 
+L 1188 4153 
+L 1188 1928 
+Q 1188 1303 1619 872 
+Q 2056 441 2681 441 
+Q 3306 441 3738 872 
+Q 4175 1303 4175 1934 
+L 4175 4153 
+L 4706 4153 
 z
-" id="DejaVuSans-22d2"/>
-    <path d="M 78.90625 27.203125 
-L 5.71875 27.203125 
-L 5.71875 35.5 
-L 65.234375 35.5 
-L 53.859375 46.875 
-L 59.71875 52.734375 
-L 78.90625 33.546875 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-21bc" d="M 313 1741 
+L 313 2147 
+L 1541 3375 
+L 1916 3000 
+L 1188 2272 
+L 4997 2272 
+L 4997 1741 
+L 313 1741 
 z
-" id="DejaVuSans-21c0"/>
-    <path d="M 35.15625 64.890625 
-L 35.15625 30.21875 
-Q 35.15625 27.390625 37.109375 25.4375 
-Q 39.0625 23.484375 41.890625 23.484375 
-Q 44.734375 23.484375 46.6875 25.4375 
-Q 48.640625 27.390625 48.640625 30.21875 
-L 48.640625 64.890625 
-L 56.9375 64.890625 
-L 56.9375 30.125 
-Q 56.9375 23.875 52.546875 19.484375 
-Q 48.25 15.1875 41.890625 15.1875 
-Q 35.640625 15.1875 31.25 19.53125 
-Q 26.859375 23.875 26.859375 30.125 
-L 26.859375 64.890625 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-22bc" d="M 625 4738 
+L 4059 4738 
+L 4059 4206 
+L 625 4206 
+L 625 4738 
 z
-M 73.53125 64.890625 
-L 73.53125 30.21875 
-Q 73.53125 16.9375 64.25 7.75 
-Q 54.984375 -1.421875 41.890625 -1.421875 
-Q 28.8125 -1.421875 19.4375 7.765625 
-Q 10.25 16.84375 10.25 30.125 
-L 10.25 64.890625 
-L 18.5625 64.890625 
-L 18.5625 30.125 
-Q 18.5625 20.359375 25.296875 13.625 
-Q 32.125 6.890625 41.890625 6.890625 
-Q 51.65625 6.890625 58.40625 13.625 
-Q 65.234375 20.359375 65.234375 30.21875 
-L 65.234375 64.890625 
+M 825 0 
+L 1953 3706 
+L 2734 3706 
+L 3859 0 
+L 3250 0 
+L 2344 2938 
+L 1434 0 
+L 825 0 
 z
-" id="DejaVuSans-22d3"/>
-    <path d="M 4.890625 27.203125 
-L 4.890625 33.546875 
-L 24.078125 52.734375 
-L 29.9375 46.875 
-L 18.5625 35.5 
-L 78.078125 35.5 
-L 78.078125 27.203125 
+" transform="scale(0.015625)"/>
+     <path id="DejaVuSans-21c0" d="M 5050 1741 
+L 366 1741 
+L 366 2272 
+L 4175 2272 
+L 3447 3000 
+L 3822 3375 
+L 5050 2147 
+L 5050 1741 
 z
-" id="DejaVuSans-21bc"/>
-    <path id="DejaVuSans-20"/>
-   </defs>
-   <g transform="translate(152.160000 30.311250)scale(0.120000 -0.120000)">
-    <use transform="translate(0.000000 0.968750)" xlink:href="#DejaVuSans-22d3"/>
-    <use transform="translate(83.789062 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(115.576172 0.968750)" xlink:href="#DejaVuSans-22d2"/>
-    <use transform="translate(199.365234 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(250.634766 0.968750)" xlink:href="#DejaVuSans-21bc"/>
-    <use transform="translate(353.906250 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(385.693359 0.968750)" xlink:href="#DejaVuSans-22bc"/>
-    <use transform="translate(458.886719 0.968750)" xlink:href="#DejaVuSans-20"/>
-    <use transform="translate(510.156250 0.968750)" xlink:href="#DejaVuSans-21c0"/>
+" transform="scale(0.015625)"/>
+    </defs>
+    <use xlink:href="#DejaVuSans-22d2" transform="translate(0 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(83.789062 0.96875)"/>
+    <use xlink:href="#DejaVuSans-22d3" transform="translate(115.576172 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(199.365234 0.96875)"/>
+    <use xlink:href="#DejaVuSans-21bc" transform="translate(250.634766 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(353.90625 0.96875)"/>
+    <use xlink:href="#DejaVuSans-22bc" transform="translate(385.693359 0.96875)"/>
+    <use xlink:href="#DejaVuSans-20" transform="translate(458.886719 0.96875)"/>
+    <use xlink:href="#DejaVuSans-21c0" transform="translate(510.15625 0.96875)"/>
    </g>
   </g>
  </g>
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -103,7 +103,7 @@
     r"$\left\Vert a \right\Vert \left\vert b \right\vert \left| a \right| \left\| b\right\| \Vert a \Vert \vert b \vert$",
     r'$\mathring{A}  \AA$',
     r'$M \, M \thinspace M \/ M \> M \: M \; M \ M \enspace M \quad M \qquad M \! M$',
-    r'$\Cup$ $\Cap$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$',
+    r'$\Cap$ $\Cup$ $\leftharpoonup$ $\barwedge$ $\rightharpoonup$',
     r'$\dotplus$ $\doteq$ $\doteqdot$ $\ddots$',
     r'$xyz^kx_kx^py^{p-2} d_i^jb_jc_kd x^j_i E^0 E^0_u$',  # github issue #4873
     r'${xyz}^k{x}_{k}{x}^{p}{y}^{p-2} {d}_{i}^{j}{b}_{j}{c}_{k}{d} {x}^{j}_{i}{E}^{0}{E}^0_u$',
