print fontname in missing glyph warning

story645 · story645 · commit a5d314f46c77 · 2023-10-03T17:57:00.000-04:00
diff --git a/lib/matplotlib/_text_helpers.py b/lib/matplotlib/_text_helpers.py
@@ -12,11 +12,12 @@
     "LayoutItem", ["ft_object", "char", "glyph_idx", "x", "prev_kern"])
 
 
-def warn_on_missing_glyph(codepoint):
+def warn_on_missing_glyph(codepoint, font_name):
     _api.warn_external(
-        "Glyph {} ({}) missing from current font.".format(
+        "Glyph {} ({}) missing from current font {}.".format(
             codepoint,
-            chr(codepoint).encode("ascii", "namereplace").decode("ascii")))
+            chr(codepoint).encode("ascii", "namereplace").decode("ascii"),
+            font_name))
     block = ("Hebrew" if 0x0590 <= codepoint <= 0x05ff else
              "Arabic" if 0x0600 <= codepoint <= 0x06ff else
              "Devanagari" if 0x0900 <= codepoint <= 0x097f else
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -817,12 +817,14 @@ def test_pdf_kerning():
 
 def test_unsupported_script(recwarn):
     fig = plt.figure()
-    fig.text(.5, .5, "\N{BENGALI DIGIT ZERO}")
+    t = fig.text(.5, .5, "\N{BENGALI DIGIT ZERO}")
+    print(t.get_fontname())
     fig.canvas.draw()
     assert all(isinstance(warn.message, UserWarning) for warn in recwarn)
     assert (
         [warn.message.args for warn in recwarn] ==
-        [(r"Glyph 2534 (\N{BENGALI DIGIT ZERO}) missing from current font.",),
+        [(r"Glyph 2534 (\N{BENGALI DIGIT ZERO}) missing from current font "
+            + f"{t.get_fontname()}.",),
          (r"Matplotlib currently does not support Bengali natively.",)])
 
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -11,6 +11,7 @@
 #include "ft2font.h"
 #include "mplutils.h"
 #include "numpy_cpp.h"
+#include "py_converters.h"
 #include "py_exceptions.h"
 
 #ifndef M_PI
@@ -184,11 +185,13 @@ FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0, unsigned long x1,
     m_dirty = true;
 }
 
-static void ft_glyph_warn(FT_ULong charcode)
+static void ft_glyph_warn(FT_ULong charcode, FT_String * family_name)
 {
+    const char* name = (family_name != NULL)?family_name:"UNAVAILABLE";
     PyObject *text_helpers = NULL, *tmp = NULL;
+
     if (!(text_helpers = PyImport_ImportModule("matplotlib._text_helpers")) ||
-        !(tmp = PyObject_CallMethod(text_helpers, "warn_on_missing_glyph", "k", charcode))) {
+        !(tmp = PyObject_CallMethod(text_helpers, "warn_on_missing_glyph", "(k, s)", charcode, name))){
         goto exit;
     }
 exit:
@@ -207,7 +210,7 @@ ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode, bool warn = true)
         return glyph_index;
     }
     if (warn) {
-        ft_glyph_warn(charcode);
+        ft_glyph_warn(charcode, face->family_name);
     }
     return 0;
 }
@@ -515,7 +518,7 @@ void FT2Font::set_text(
                                                  char_to_font, glyph_to_font, codepoints[n], flags,
                                                  charcode_error, glyph_error, false);
         if (!was_found) {
-            ft_glyph_warn((FT_ULong)codepoints[n]);
+            ft_glyph_warn((FT_ULong)codepoints[n], (ft_object_with_glyph->face)->family_name);
 
             // render missing glyph tofu
             // come back to top-most font
@@ -582,7 +585,7 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
         bool was_found = load_char_with_fallback(ft_object_with_glyph, final_glyph_index, glyphs, char_to_font,
                                 glyph_to_font, charcode, flags, charcode_error, glyph_error, true);
         if (!was_found) {
-            ft_glyph_warn(charcode);
+            ft_glyph_warn(charcode, (ft_object_with_glyph->face)->family_name);
             if (charcode_error) {
                 throw_ft_error("Could not load charcode", charcode_error);
             }
