Support luatex-generated dvi.

To be used together with the same-named branch on Matplotlib.

Author: anntzer

ext/_mplcairo.cpp

@@ -1847,25 +1847,30 @@ void MathtextBackend::draw(
         return FT_Get_Name_Index(ft_face, name.data());
       },
       [&](FT_ULong idx) {
-        // For classic fonts, the index maps to the "native" font charmap,
-        // which typically has an ADOBE_STANDARD or ADOBE_CUSTOM encoding,
-        // unlike the FreeType-synthesized one which has a UNICODE encoding.
-        auto found = false;
-        for (auto i = 0; i < ft_face->num_charmaps; ++i) {
-          auto const& cmap = ft_face->charmaps[i];
-          if (cmap->encoding == FT_ENCODING_ADOBE_STANDARD
-              || cmap->encoding == FT_ENCODING_ADOBE_CUSTOM) {
-            if (found) {
-              throw std::runtime_error{"multiple Adobe charmaps found"};
+        if (FT_IS_SFNT(ft_face)) {
+          // For OpenType fonts, luatex directly outputs glyph indices.
+          return FT_UInt(idx);
+        } else {
+          // For classic fonts, the index maps to the "native" font charmap,
+          // which typically has an ADOBE_STANDARD or ADOBE_CUSTOM encoding,
+          // unlike the FreeType-synthesized one which has a UNICODE encoding.
+          auto found = false;
+          for (auto i = 0; i < ft_face->num_charmaps; ++i) {
+            auto const& cmap = ft_face->charmaps[i];
+            if (cmap->encoding == FT_ENCODING_ADOBE_STANDARD
+                || cmap->encoding == FT_ENCODING_ADOBE_CUSTOM) {
+              if (found) {
+                throw std::runtime_error{"multiple Adobe charmaps found"};
+              }
+              FT_CHECK(FT_Set_Charmap, ft_face, cmap);
+              found = true;
             }
-            FT_CHECK(FT_Set_Charmap, ft_face, cmap);
-            found = true;
           }
+          if (!found) {
+            throw std::runtime_error{"no Adobe charmap found"};
+          }
+          return FT_Get_Char_Index(ft_face, idx);
         }
-        if (!found) {
-          throw std::runtime_error{"no builtin charmap found"};
-        }
-        return FT_Get_Char_Index(ft_face, idx);
       }
     }, glyph.codepoint_or_name_or_index);
     if (!index) {

src/mplcairo/base.py

@@ -142,18 +142,24 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath="TeX!", mtext=None):
             page = next(iter(dvi))
         mb = _mplcairo.MathtextBackendCairo()
         for text in page.text:
-            texfont = _util.get_tex_font_map()[text.font.texname]
-            if texfont.filename is None:
-                # Not TypeError:
-                # :mpltest:`test_backend_svg.test_missing_psfont`.
-                raise ValueError(f"No font file found for {texfont.psname} "
-                                 f"({texfont.texname!a})")
-            mb.add_usetex_glyph(
-                text.x, -text.y,
-                texfont.filename, text.font.size,
-                _util.get_glyph_name(text) or text.glyph,
-                texfont.effects.get("slant", 0),
-                texfont.effects.get("extend", 1))
+            if text.font.texname.startswith(b"["):
+                mb.add_usetex_glyph(
+                    text.x, -text.y,
+                    text.font.texname[1:-1].decode("latin-1"), text.font.size,
+                    text.glyph, 0, 1)
+            else:
+                texfont = _util.get_tex_font_map()[text.font.texname]
+                if texfont.filename is None:
+                    # Not TypeError:
+                    # :mpltest:`test_backend_svg.test_missing_psfont`.
+                    raise ValueError(f"No font file found for {texfont.psname} "
+                                    f"({texfont.texname!a})")
+                mb.add_usetex_glyph(
+                    text.x, -text.y,
+                    texfont.filename, text.font.size,
+                    _util.get_glyph_name(text) or text.glyph,
+                    texfont.effects.get("slant", 0),
+                    texfont.effects.get("extend", 1))
         for x1, y1, h, w in page.boxes:
             mb.add_rect(x1, -y1, x1 + w, -(y1 + h))
         mb.draw(self, x, y, angle)