Merge branch '54.x'

Kozea · Feb 17, 2022 · b33df96 · b33df96
2 parents d814c2e + d6c1900
commit b33df96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/weasyprint/draw.py b/weasyprint/draw.py
@@ -1131,7 +1131,8 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, x, y,
             glyph_info = glyphs[i]
             glyph = glyph_info.glyph
             width = glyph_info.geometry.width
-            if glyph == pango.PANGO_GLYPH_EMPTY:
+            if (glyph == pango.PANGO_GLYPH_EMPTY or
+                    glyph & pango.PANGO_GLYPH_UNKNOWN_FLAG):
                 string += f'>{-width / font_size}<'
                 continue
             utf8_position = utf8_positions[i]

diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py
@@ -48,6 +48,7 @@
     typedef gint PangoGlyphUnit;
 
     const guint PANGO_GLYPH_EMPTY = 0x0FFFFFFF;
+    const guint PANGO_GLYPH_UNKNOWN_FLAG = 0x10000000;
 
     typedef enum {
         PANGO_STYLE_NORMAL,