diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 46f4fb100454..4d20944a5192 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -906,6 +906,15 @@ def _get_glyph(self, fontname, font_class, sym, fontsize): return self.bakoma._get_glyph(fontname, font_class, sym, fontsize) else: + # check whether the glyph is available in the display font + uniindex = get_unicode_index(sym) + font = self._get_font('ex') + if font is not None: + glyphindex = font.get_char_index(uniindex) + if glyphindex != 0: + return super(DejaVuFonts, self)._get_glyph('ex', + font_class, sym, fontsize) + # otherwise return regular glyph return super(DejaVuFonts, self)._get_glyph(fontname, font_class, sym, fontsize) @@ -921,6 +930,7 @@ class DejaVuSerifFonts(DejaVuFonts): 'bf' : 'DejaVu Serif:weight=bold', 'sf' : 'DejaVu Sans', 'tt' : 'DejaVu Sans Mono', + 'ex' : 'DejaVu Serif Display', } class DejaVuSansFonts(DejaVuFonts): @@ -934,6 +944,7 @@ class DejaVuSansFonts(DejaVuFonts): 'bf' : 'DejaVu Sans:weight=bold', 'sf' : 'DejaVu Sans', 'tt' : 'DejaVu Sans Mono', + 'ex' : 'DejaVu Sans Display', } class StixFonts(UnicodeFonts): diff --git a/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSansDisplay.ttf b/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSansDisplay.ttf new file mode 100644 index 000000000000..36758a2e70b6 Binary files /dev/null and b/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSansDisplay.ttf differ diff --git a/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSerifDisplay.ttf b/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSerifDisplay.ttf new file mode 100644 index 000000000000..1623714d223f Binary files /dev/null and b/lib/matplotlib/mpl-data/fonts/ttf/DejaVuSerifDisplay.ttf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.pdf index 553e4f3d0644..e97795982139 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.png index 2854343756d6..d4f0d5d20f56 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.svg index f326bd461b2e..41c197b7394b 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_18.svg @@ -20,17 +20,6 @@ z - + + - - + - - - - - - - - - + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.pdf index e69a651a4205..137a4698dfaa 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.png index a97689ed49fb..3a451305f3ae 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.svg index f8a78b4223d9..0aafa473d57f 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_22.svg @@ -20,24 +20,6 @@ z - + + - +" id="DejaVuSans-Oblique-66"/> + + - - - - - + +" id="DejaVuSans-69"/> - - - + + - + - +" id="DejaVuSans-31"/> + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf index 57c85298868a..1783edfa14e6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png index cf30a02b4286..05b1e65e1419 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg index 72a95468dcba..7a3dbf0a65f7 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_30.svg @@ -20,65 +20,46 @@ z - - +M 30.328125 22.796875 +L 31.84375 55.21875 +Q 27.640625 54.046875 24.5625 50.875 +Q 19.578125 45.75 19.625 38.625 +Q 19.625 31.5 24.8125 26.515625 +Q 27.34375 24.03125 30.328125 22.796875 +" id="DejaVuSansDisplay-222e"/> + - - - - + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.pdf index d1dcfb3bdd72..ab067acbe277 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.png index 4595ca03f527..d2f422df3029 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.svg index 72e91d161043..273fa30ba06d 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_34.svg @@ -34,28 +34,6 @@ L 30.8125 34.90625 L 49.125 54.6875 z " id="DejaVuSans-Oblique-78"/> - - - +" id="DejaVuSansDisplay-220f"/> + + - - - - - - - - - - + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.pdf index 2b2e7496b411..59a84de62094 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.png index 140941b6bcc4..c358b6fcdf16 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.svg index c3b0070ec1c3..b7aa72105a93 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_37.svg @@ -20,6 +20,100 @@ z + + + + + - +" id="DejaVuSans-Oblique-3c0"/> + + + + + + + + - - - - - - - - - - - - - - +" id="DejaVuSansDisplay-222b"/> - + @@ -456,42 +456,42 @@ z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.pdf index 61959811cbc5..2533a3903e10 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.png index b17daaa64b82..7a85988a7552 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.svg index 912fe6b92de0..6ed825edb67e 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_38.svg @@ -20,6 +20,88 @@ z + + + + - - - + - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.pdf index e2c98f938499..c6832bf30ecf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.png index a5384f424de4..c4b6c35ecac9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.svg index bb57f93df84a..b512e97ce756 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_52.svg @@ -20,19 +20,6 @@ z - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.pdf index 4b002a49419b..2d9b133174a1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.png index fdc84fefb714..d74d688ff605 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.svg index a5383eb64653..cc1bf2ab72a8 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_56.svg @@ -20,20 +20,48 @@ z - + +" id="DejaVuSansDisplay-222b"/> - +" id="DejaVuSans-Oblique-78"/> - - +" id="DejaVuSans-31"/> - - - - - - - - + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.pdf index 349cb050fa66..93bc08b756fc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.png index 945c13810e0e..0bd8fc8552c2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.svg index c936b2b19780..00642a3c0c79 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_57.svg @@ -20,6 +20,20 @@ z + - - + - - - - - - - - + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf index 770d61db7c8a..9c8367f57e84 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png index 2c02378f33e9..80398a01d521 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg index 2cec346ec2ac..ea4555326269 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_67.svg @@ -20,88 +20,6 @@ z - - - - - - - - +" id="DejaVuSans-Oblique-69"/> + - + +M 25.203125 64.796875 +L 19.921875 37.40625 +L 32.328125 37.40625 +Q 40.71875 37.40625 45.203125 41.703125 +Q 49.703125 46 49.703125 54 +Q 49.703125 59.125 46.65625 61.953125 +Q 43.609375 64.796875 38.09375 64.796875 +z +" id="DejaVuSans-Oblique-50"/> + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.pdf index c50551fee9f4..ddb7ef07712d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.png index 607d5bf707ed..d370e8ba8cba 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.svg index 5310cedb13db..892aa4955dc4 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_75.svg @@ -20,6 +20,46 @@ z + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.pdf index 705bc0d8f7b2..e7e234c912f7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.png index 96164f45cdc7..497132c6903b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.svg index a1169a447fb1..dca804b1f09b 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_18.svg @@ -20,20 +20,6 @@ z - - + + +" id="DejaVuSerif-2b"/> - - +" id="DejaVuSerifDisplay-220f"/> - - - - - - - - - + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.pdf index 7b1bb287f958..f609974e6a36 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.png index 40b213fc6ff0..c3684cd87fe7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.svg index b2a58cb272e5..d957c135b3a5 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_22.svg @@ -20,20 +20,45 @@ z - +M 40.328125 22.359375 +L 40.09375 36.71875 +Q 39.84375 48.140625 33.109375 48.1875 +Q 27.546875 48.1875 22.171875 42.234375 +Q 17.671875 37.3125 15.484375 25.984375 +Q 14.5 21.046875 14.5 17.234375 +Q 14.5 12.703125 15.875 9.71875 +Q 18.359375 4.15625 24.21875 4.15625 +Q 30.671875 4.15625 37.25 16.609375 +z +" id="DejaVuSerif-Italic-3b1"/> - - - +" id="DejaVuSerif-Italic-69"/> - + + - - - +" id="DejaVuSerif-28"/> - - - - +M 12.84375 14.65625 +Q 12.84375 4.203125 22.953125 4.203125 +Q 29.109375 4.203125 33.28125 9.109375 +Q 37.453125 14.015625 39.3125 23.390625 +L 43.84375 46.921875 +L 43.84375 46.921875 +Q 43.84375 48.34375 39.9375 48.34375 +Q 30.5625 48.34375 23.296875 41.015625 +Q 16.0625 33.640625 13.484375 20.265625 +Q 12.84375 17.140625 12.84375 14.65625 +" id="DejaVuSerif-Italic-61"/> + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.pdf index b5c9aaf0ee83..58369bb0185c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.png index ad062000f544..9d26f036987c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.svg index 2699778438bd..a375b656a075 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_34.svg @@ -20,42 +20,6 @@ z - + - - + +" id="DejaVuSerif-Italic-3c0"/> - +" id="DejaVuSerifDisplay-220f"/> - - - - - - - - - - + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.pdf index 6e00c2d3cd67..791d8ff891b8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.png index 0b7115c06095..dba4a7e809d0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.svg index 840e40747983..f525c0e6b009 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_37.svg @@ -20,43 +20,30 @@ z - - +" id="DejaVuSerif-Italic-3c1"/> - - + + + - + - - - + + - - + +" id="DejaVuSerif-33"/> + + - - - - - + +" id="DejaVuSerif-Italic-3c0"/> + - + @@ -506,42 +506,42 @@ z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.pdf index 03bb7f3ecf23..90e267267c81 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.png index 9afaa89848b9..5ef7f9e77949 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.svg index b69f3f430671..eed7e5f058a3 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_38.svg @@ -53,6 +53,79 @@ Q 22.609375 52.4375 32.171875 52.4375 Q 34.8125 52.4375 39.75 51.65625 Q 44.671875 50.828125 49.859375 49.3125 " id="DejaVuSerif-Italic-3b5"/> + + - + + +M 10.59375 25.296875 +L 73.1875 25.296875 +L 73.1875 17.484375 +L 10.59375 17.484375 +z +" id="DejaVuSerif-3d"/> + - - - + - +" id="DejaVuSerif-Italic-3c4"/> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.pdf index a5e5f3fc3a04..34fd24000bad 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.png index 6747a9fa97e2..36f441e49eae 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.svg index df2181cbf1fd..a1c605fcca50 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_52.svg @@ -20,6 +20,36 @@ z + - - - +M 45.5625 48.34375 +Q 36.1875 48.34375 28.90625 41.015625 +Q 21.6875 33.640625 19.046875 20.265625 +Q 18.3125 16.3125 18.5 13.328125 +Q 18.703125 10.296875 19.921875 8.25 +Q 22.3125 4.203125 28.5625 4.203125 +Q 34.71875 4.203125 38.890625 9.109375 +Q 43.0625 14.015625 44.875 23.390625 +L 49.46875 46.921875 +Q 49.515625 48.34375 45.5625 48.34375 +" id="DejaVuSerif-Italic-71"/> - +M 10.59375 25.296875 +L 73.1875 25.296875 +L 73.1875 17.484375 +L 10.59375 17.484375 +z +" id="DejaVuSerif-3d"/> + + - - - + +" id="DejaVuSerif-Italic-63"/> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.pdf index 906f25dfc325..560df6008e28 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.png index cb90000cc77c..0bc6d0250527 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.svg index 5170e60ce2f4..e79ba8b3505e 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_56.svg @@ -33,6 +33,46 @@ L 49.421875 5.171875 L 49.421875 0 z " id="DejaVuSerif-31"/> + + - - + - - - - - - - - - + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.pdf index 1574e97c9196..a6b050f5648d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.png index 1eeb4e8d166a..b0b5310192dc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.svg index 7e186c993a8a..23e9856fa69c 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_57.svg @@ -49,27 +49,6 @@ Q 22.5625 4.203125 29.5 4.203125 Q 36.328125 4.203125 39.90625 9.109375 Q 43.5 14.015625 43.5 23.390625 " id="DejaVuSerif-64"/> - + + - - - - - - - - - + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf index c3efcdee08b8..cf4f15c108e4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png index 450421c39fc2..f61dd990d849 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg index ec65dca33108..37d5c996ded4 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_67.svg @@ -20,48 +20,61 @@ z - - +M -1.515625 0 +L -0.53125 5.171875 +L 8.734375 5.171875 +L 20.90625 67.671875 +L 11.625 67.671875 +L 12.640625 72.90625 +L 47.125 72.90625 +Q 58.0625 72.90625 63.375 67.359375 +Q 68.703125 61.8125 66.84375 52.390625 +Q 65.046875 43.015625 57.5625 37.453125 +Q 50.09375 31.890625 39.15625 31.890625 +L 23.875 31.890625 +L 18.65625 5.171875 +L 29.9375 5.171875 +L 28.953125 0 +z +" id="DejaVuSerif-Italic-50"/> + + - + +" id="DejaVuSerif-Italic-6e"/> + + - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.pdf index e272e9d88da3..67c52f03bd4b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.png index ed53420d4f3b..831e1c767c73 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.svg index d193ccdf9cfb..97d2d4efb2bb 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavuserif_75.svg @@ -20,54 +20,6 @@ z - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/create_DejaVuDisplay.sh b/tools/create_DejaVuDisplay.sh new file mode 100755 index 000000000000..1b9d49935fd0 --- /dev/null +++ b/tools/create_DejaVuDisplay.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Subsetting DejaVu fonts to create a display-math-only font + +# The DejaVu fonts include math display variants outside of the unicode range, +# and it is currently hard to access them from matploltib. The subset.py script +# in `tools` has been modified to move the math display variants found in DejaVu +# fonts into a new TTF font with these variants in the unicode range. + +# This bash script calls the subset.py scripts with the appropriate options to +# generate the new font files `DejaVuSansDisplay.ttf` and +# `DejaVuSerifDisplay.ttf`: + +mpldir=$(dirname $0)/../ + +# test that fontforge is installed +python -c 'import fontforge' 2> /dev/null +if [ $? != 0 ]; then + echo "The python installation at $(which python) does not have fontforge" + echo "installed. Please install it before using subset.py." + exit 1 +fi + +FONTDIR=$mpldir/lib/matplotlib/mpl-data/fonts/ttf/ + +python $mpldir/tools/subset.py --move-display --subset=dejavu-ext $FONTDIR/DejaVuSans.ttf \ + $FONTDIR/DejaVuSansDisplay.ttf +python $mpldir/tools/subset.py --move-display --subset=dejavu-ext $FONTDIR/DejaVuSerif.ttf \ + $FONTDIR/DejaVuSerifDisplay.ttf diff --git a/tools/subset.py b/tools/subset.py new file mode 100644 index 000000000000..97441c2cfa47 --- /dev/null +++ b/tools/subset.py @@ -0,0 +1,369 @@ +#!/usr/bin/env python +# +# Copyright 2010-2012, Google Inc. +# Author: Mikhail Kashkin (mkashkin@gmail.com) +# Author: Raph Levien (@gmail.com) +# Author: Dave Crossland (dave@understandinglimited.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Version 1.01 Released 2012-03-27 +# +# A script for subsetting a font, using FontForge. See README for details. + +# TODO 2013-04-08 ensure the menu files are as compact as possible by default, similar to subset.pl +# TODO 2013-05-22 in Arimo, the latin subset doesn't include ; but the greek does. why on earth is this happening? +from __future__ import print_function +import fontforge +import sys +import getopt +import os +import struct + +def log_namelist(nam, unicode): + if nam and isinstance(unicode, int): + print("0x%0.4X" % unicode, fontforge.nameFromUnicode(unicode), file=nam) + +def select_with_refs(font, unicode, newfont, pe = None, nam = None): + newfont.selection.select(('more', 'unicode'), unicode) + log_namelist(nam, unicode) + if pe: + print("SelectMore(%d)" % unicode, file=pe) + try: + for ref in font[unicode].references: + newfont.selection.select(('more',), ref[0]) + log_namelist(nam, ref[0]) + if pe: + print('SelectMore("%s")' % ref[0], file=pe) + except: + print('Resolving references on u+%04x failed' % unicode) + +def subset_font_raw(font_in, font_out, unicodes, opts): + if '--namelist' in opts: + # 2010-12-06 DC To allow setting namelist filenames, + # change getopt.gnu_getopt from namelist to namelist= + # and invert comments on following 2 lines + # nam_fn = opts['--namelist'] + nam_fn = font_out + '.nam' + nam = file(nam_fn, 'w') + else: + nam = None + if '--script' in opts: + pe_fn = "/tmp/script.pe" + pe = file(pe_fn, 'w') + else: + pe = None + font = fontforge.open(font_in) + if pe: + print('Open("' + font_in + '")', file=pe) + extract_vert_to_script(font_in, pe) + for i in unicodes: + select_with_refs(font, i, font, pe, nam) + + addl_glyphs = [] + if '--nmr' in opts: addl_glyphs.append('nonmarkingreturn') + if '--null' in opts: addl_glyphs.append('.null') + if '--nd' in opts: addl_glyphs.append('.notdef') + for glyph in addl_glyphs: + font.selection.select(('more',), glyph) + if nam: + print("0x%0.4X" % fontforge.unicodeFromName(glyph), glyph, file=nam) + if pe: + print('SelectMore("%s")' % glyph, file=pe) + + flags = () + + if '--opentype-features' in opts: + flags += ('opentype',) + + if '--simplify' in opts: + font.simplify() + font.round() + flags += ('omit-instructions',) + + if '--strip_names' in opts: + font.sfnt_names = () + + if '--new' in opts: + font.copy() + new = fontforge.font() + new.encoding = font.encoding + new.em = font.em + new.layers['Fore'].is_quadratic = font.layers['Fore'].is_quadratic + for i in unicodes: + select_with_refs(font, i, new, pe, nam) + new.paste() + # This is a hack - it should have been taken care of above. + font.selection.select('space') + font.copy() + new.selection.select('space') + new.paste() + new.sfnt_names = font.sfnt_names + font = new + else: + font.selection.invert() + print("SelectInvert()", file=pe) + font.cut() + print("Clear()", file=pe) + + if '--move-display' in opts: + print("Moving display glyphs into unicode ranges...") + font.familyname += " Display" + font.fullname += " Display" + font.fontname += "Display" + font.appendSFNTName('English (US)', 'Family', font.familyname) + font.appendSFNTName('English (US)', 16, font.familyname) + font.appendSFNTName('English (US)', 17, 'Display') + font.appendSFNTName('English (US)', 'Fullname', font.fullname) + for glname in unicodes: + font.selection.none() + if isinstance(glname, str): + if glname.endswith('.display'): + font.selection.select(glname) + font.copy() + font.selection.none() + newgl = glname.replace('.display','') + font.selection.select(newgl) + font.paste() + font.selection.select(glname) + font.cut() + + if nam: + print("Writing NameList", end="") + nam.close() + + if pe: + print('Generate("' + font_out + '")', file=pe) + pe.close() + os.system("fontforge -script " + pe_fn) + else: + font.generate(font_out, flags = flags) + font.close() + + if '--roundtrip' in opts: + # FontForge apparently contains a bug where it incorrectly calculates + # the advanceWidthMax in the hhea table, and a workaround is to open + # and re-generate + font2 = fontforge.open(font_out) + font2.generate(font_out, flags = flags) + +def subset_font(font_in, font_out, unicodes, opts): + font_out_raw = font_out + if not font_out_raw.endswith('.ttf'): + font_out_raw += '.ttf'; + subset_font_raw(font_in, font_out_raw, unicodes, opts) + if font_out != font_out_raw: + os.rename(font_out_raw, font_out) +# 2011-02-14 DC this needs to only happen with --namelist is used +# os.rename(font_out_raw + '.nam', font_out + '.nam') + +def getsubset(subset, font_in): + subsets = subset.split('+') + + quotes = [0x2013] # endash + quotes += [0x2014] # emdash + quotes += [0x2018] # quoteleft + quotes += [0x2019] # quoteright + quotes += [0x201A] # quotesinglbase + quotes += [0x201C] # quotedblleft + quotes += [0x201D] # quotedblright + quotes += [0x201E] # quotedblbase + quotes += [0x2022] # bullet + quotes += [0x2039] # guilsinglleft + quotes += [0x203A] # guilsinglright + + latin = range(0x20, 0x7f) # Basic Latin (A-Z, a-z, numbers) + latin += range(0xa0, 0x100) # Western European symbols and diacritics + latin += [0x20ac] # Euro + latin += [0x0152] # OE + latin += [0x0153] # oe + latin += [0x003b] # semicolon + latin += [0x00b7] # periodcentered + latin += [0x0131] # dotlessi + latin += [0x02c6] # circumflex + latin += [0x02da] # ring + latin += [0x02dc] # tilde + latin += [0x2074] # foursuperior + latin += [0x2215] # divison slash + latin += [0x2044] # fraction slash + latin += [0xe0ff] # PUA: Font logo + latin += [0xeffd] # PUA: Font version number + latin += [0xf000] # PUA: font ppem size indicator: run `ftview -f 1255 10 Ubuntu-Regular.ttf` to see it in action! + + result = quotes + + if 'menu' in subset: + font = fontforge.open(font_in) + result = map(ord, font.familyname) + result += [0x0020] + + if 'latin' in subset: + result += latin + if 'latin-ext' in subset: + # These ranges include Extended A, B, C, D, and Additional with the + # exception of Vietnamese, which is a separate range + result += (range(0x100, 0x370) + + range(0x1d00, 0x1ea0) + + range(0x1ef2, 0x1f00) + + range(0x2070, 0x20d0) + + range(0x2c60, 0x2c80) + + range(0xa700, 0xa800)) + if 'vietnamese' in subset: + # 2011-07-16 DC: Charset from http://vietunicode.sourceforge.net/charset/ + U+1ef9 from Fontaine + result += [0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00C8, 0x00C9, + 0x00CA, 0x00CC, 0x00CD, 0x00D2, 0x00D3, 0x00D4, + 0x00D5, 0x00D9, 0x00DA, 0x00DD, 0x00E0, 0x00E1, + 0x00E2, 0x00E3, 0x00E8, 0x00E9, 0x00EA, 0x00EC, + 0x00ED, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F9, + 0x00FA, 0x00FD, 0x0102, 0x0103, 0x0110, 0x0111, + 0x0128, 0x0129, 0x0168, 0x0169, 0x01A0, 0x01A1, + 0x01AF, 0x01B0, 0x20AB] + range(0x1EA0, 0x1EFA) + if 'greek' in subset: + # Could probably be more aggressive here and exclude archaic characters, + # but lack data + result += range(0x370, 0x400) + if 'greek-ext' in subset: + result += range(0x370, 0x400) + range(0x1f00, 0x2000) + if 'cyrillic' in subset: + # Based on character frequency analysis + result += range(0x400, 0x460) + [0x490, 0x491, 0x4b0, 0x4b1, 0x2116] + if 'cyrillic-ext' in subset: + result += (range(0x400, 0x530) + + [0x20b4, 0x2116] + # 0x2116 is the russian No, a number abbreviation similar to the latin #, suggested by Alexei Vanyashin + range(0x2de0, 0x2e00) + + range(0xa640, 0xa6a0)) + if 'arabic' in subset: + # Based on Droid Arabic Kufi 1.0 + result += [0x000D, 0x0020, 0x0621, 0x0627, 0x062D, + 0x062F, 0x0631, 0x0633, 0x0635, 0x0637, 0x0639, + 0x0643, 0x0644, 0x0645, 0x0647, 0x0648, 0x0649, + 0x0640, 0x066E, 0x066F, 0x0660, 0x0661, 0x0662, + 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, + 0x0669, 0x06F4, 0x06F5, 0x06F6, 0x06BE, 0x06D2, + 0x06A9, 0x06AF, 0x06BA, 0x066A, 0x061F, 0x060C, + 0x061B, 0x066B, 0x066C, 0x066D, 0x064B, 0x064D, + 0x064E, 0x064F, 0x064C, 0x0650, 0x0651, 0x0652, + 0x0653, 0x0654, 0x0655, 0x0670, 0x0656, 0x0615, + 0x0686, 0x0623, 0x0625, 0x0622, 0x0671, 0x0628, + 0x067E, 0x062A, 0x062B, 0x0679, 0x0629, 0x062C, + 0x062E, 0x0630, 0x0688, 0x0632, 0x0691, 0x0698, + 0x0634, 0x0636, 0x0638, 0x063A, 0x0641, 0x0642, + 0x0646, 0x06D5, 0x06C0, 0x0624, 0x064A, 0x06CC, + 0x06D3, 0x0626, 0x06C2, 0x06C1, 0x06C3, 0x06F0, + 0x06F1, 0x06F2, 0x06F3, 0x06F9, 0x06F7, 0x06F8, + 0xFC63, 0x0672, 0x0673, 0x0675, 0x0676, 0x0677, + 0x0678, 0x067A, 0x067B, 0x067C, 0x067D, 0x067F, + 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, + 0x0687, 0x0689, 0x068A, 0x068B, 0x068C, 0x068D, + 0x068E, 0x068F, 0x0690, 0x0692, 0x0693, 0x0694, + 0x0695, 0x0696, 0x0697, 0x0699, 0x069A, 0x069B, + 0x069C, 0x069D, 0x069E, 0x069F, 0x06A0, 0x06A1, + 0x06A2, 0x06A3, 0x06A5, 0x06A6, 0x06A7, 0x06A8, + 0x06AA, 0x06AB, 0x06AC, 0x06AD, 0x06AE, 0x06B0, + 0x06B1, 0x06B2, 0x06B3, 0x06B4, 0x06B5, 0x06B6, + 0x06B7, 0x06B8, 0x06B9, 0x06BB, 0x06BC, 0x06BD, + 0x06BF, 0x06C4, 0x06C5, 0x06CD, 0x06D6, 0x06D7, + 0x06D8, 0x06D9, 0x06DA, 0x06DB, 0x06DC, 0x06DF, + 0x06E1, 0x06E2, 0x06E3, 0x06E4, 0x06E5, 0x06E6, + 0x06E7, 0x06E8, 0x06EA, 0x06EB, 0x06ED, 0x06FB, + 0x06FC, 0x06FD, 0x06FE, 0x0600, 0x0601, 0x0602, + 0x0603, 0x060E, 0x060F, 0x0610, 0x0611, 0x0612, + 0x0613, 0x0614, 0x0657, 0x0658, 0x06EE, 0x06EF, + 0x06FF, 0x060B, 0x061E, 0x0659, 0x065A, 0x065B, + 0x065C, 0x065D, 0x065E, 0x0750, 0x0751, 0x0752, + 0x0753, 0x0754, 0x0755, 0x0756, 0x0757, 0x0758, + 0x0759, 0x075A, 0x075B, 0x075C, 0x075D, 0x075E, + 0x075F, 0x0760, 0x0761, 0x0762, 0x0763, 0x0764, + 0x0765, 0x0766, 0x0767, 0x0768, 0x0769, 0x076A, + 0x076B, 0x076C, 0x076D, 0x06A4, 0x06C6, 0x06C7, + 0x06C8, 0x06C9, 0x06CA, 0x06CB, 0x06CF, 0x06CE, + 0x06D0, 0x06D1, 0x06D4, 0x06FA, 0x06DD, 0x06DE, + 0x06E0, 0x06E9, 0x060D, 0xFD3E, 0xFD3F, 0x25CC, + # Added from https://groups.google.com/d/topic/googlefontdirectory-discuss/MwlMWMPNCXs/discussion + 0x063b, 0x063c, 0x063d, 0x063e, 0x063f, 0x0620, + 0x0674, 0x0674, 0x06EC] + + if 'dejavu-ext' in subset: + # add all glyphnames ending in .display + font = fontforge.open(font_in) + for glyph in font.glyphs(): + if glyph.glyphname.endswith('.display'): + result.append(glyph.glyphname) + + # print(result) + return result + +# code for extracting vertical metrics from a TrueType font + +class Sfnt: + def __init__(self, data): + version, numTables, _, _, _ = struct.unpack('>IHHHH', data[:12]) + self.tables = {} + for i in range(numTables): + tag, checkSum, offset, length = struct.unpack('>4sIII', data[12 + 16 * i: 28 + 16 * i]) + self.tables[tag] = data[offset: offset + length] + + def hhea(self): + r = {} + d = self.tables['hhea'] + r['Ascender'], r['Descender'], r['LineGap'] = struct.unpack('>hhh', d[4:10]) + return r + + def os2(self): + r = {} + d = self.tables['OS/2'] + r['fsSelection'], = struct.unpack('>H', d[62:64]) + r['sTypoAscender'], r['sTypoDescender'], r['sTypoLineGap'] = struct.unpack('>hhh', d[68:74]) + r['usWinAscender'], r['usWinDescender'] = struct.unpack('>HH', d[74:78]) + return r + +def set_os2(pe, name, val): + print('SetOS2Value("' + name + '", %d)' % val, file=pe) + +def set_os2_vert(pe, name, val): + set_os2(pe, name + 'IsOffset', 0) + set_os2(pe, name, val) + +# Extract vertical metrics data directly out of font file, and emit +# script code to set the values in the generated font. This is a (rather +# ugly) workaround for the issue described in: +# http://sourceforge.net/mailarchive/forum.php?thread_name=20100906085718.GB1907%40khaled-laptop&forum_name=fontforge-users + +def extract_vert_to_script(font_in, pe): + data = file(font_in, 'rb').read() + sfnt = Sfnt(data) + hhea = sfnt.hhea() + os2 = sfnt.os2() + set_os2_vert(pe, "WinAscent", os2['usWinAscender']) + set_os2_vert(pe, "WinDescent", os2['usWinDescender']) + set_os2_vert(pe, "TypoAscent", os2['sTypoAscender']) + set_os2_vert(pe, "TypoDescent", os2['sTypoDescender']) + set_os2_vert(pe, "HHeadAscent", hhea['Ascender']) + set_os2_vert(pe, "HHeadDescent", hhea['Descender']) + +def main(argv): + optlist, args = getopt.gnu_getopt(argv, '', ['string=', 'strip_names', 'opentype-features', + 'simplify', 'new', 'script', + 'nmr', 'roundtrip', 'subset=', + 'namelist', 'null', 'nd', 'move-display']) + + font_in, font_out = args + opts = dict(optlist) + if '--string' in opts: + subset = map(ord, opts['--string']) + else: + subset = getsubset(opts.get('--subset', 'latin'), font_in) + subset_font(font_in, font_out, subset, opts) + +if __name__ == '__main__': + main(sys.argv[1:])