Merge pull request #1644 from Kozea/bitmap-fonts

Bitmap fonts
Kozea · Jun 17, 2022 · d8533da · d8533da
2 parents e38bff8 + 2190f68
commit d8533da
Show file tree

Hide file tree

Showing 6 changed files with 307 additions and 106 deletions.
diff --git a/docs/api_reference.rst b/docs/api_reference.rst
@@ -184,11 +184,8 @@ are automatically embedded in PDF files.
 Pango always uses fontconfig to access fonts, even on Windows and macOS. You
 can list the available fonts thanks to the ``fc-list`` command, and know which
 font is matched by a given pattern thanks to ``fc-match``. Copying a font file
-into the ``~/.local/share/fonts`` or ``~/.fonts`` directory is generally enough
-to install a new font. WeasyPrint should support `any font format handled by
-FreeType`_.
-
-.. _any font format handled by FreeType: https://en.wikipedia.org/wiki/FreeType#File_formats
+into the ``~/.local/share/fonts`` directory is generally enough to install a
+new font. WeasyPrint should support the major font formats handled by Harfbuzz.
 
 
 CSS

diff --git a/tests/draw/test_text.py b/tests/draw/test_text.py
@@ -743,3 +743,31 @@ def test_tabulation_character(assert_pixels):
         }
       </style>
       <pre>a&Tab;b</pre>''')
+
+
+def test_otb_font(assert_pixels):
+    assert_pixels('''
+        ____________________
+        __RR______RR________
+        __RR__RR__RR________
+        __RR__RR__RR________
+        ____________________
+        ____________________
+    ''', '''
+      <style>
+        @page {
+          size: 20px 6px;
+          margin: 1px;
+        }
+        @font-face {
+          src: url(weasyprint.otb);
+          font-family: weasyprint-otb;
+        }
+        body {
+          color: red;
+          font-family: weasyprint-otb;
+          font-size: 4px;
+          line-height: 1;
+        }
+      </style>
+      AaA''')
diff --git a/tests/resources/weasyprint.otb b/tests/resources/weasyprint.otb
diff --git a/weasyprint/draw.py b/weasyprint/draw.py
@@ -1079,7 +1079,7 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, x, y,
     while runs[-1].next != ffi.NULL:
         runs.append(runs[-1].next)
 
-    matrix = Matrix(font_size, 0, 0, -font_size, x, y)
+    matrix = Matrix(1, 0, 0, -1, x, y)
     if angle:
         matrix = Matrix(a=cos(angle), b=-sin(angle),
                         c=sin(angle), d=cos(angle)) @ matrix
@@ -1111,7 +1111,7 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, x, y,
                 stream.show_text(string)
             string = ''
             last_font = font
-        stream.set_font_size(font.hash, 1)
+        stream.set_font_size(font.hash, 1 if font.bitmap else font_size)
         string += '<'
         for i in range(num_glyphs):
             glyph_info = glyphs[i]
@@ -1126,7 +1126,7 @@ def draw_first_line(stream, textbox, text_overflow, block_ellipsis, x, y,
             offset = glyph_info.geometry.x_offset / font_size
             if offset:
                 string += f'>{-offset}<'
-            string += f'{glyph:04x}'
+            string += f'{glyph:02x}' if font.bitmap else f'{glyph:04x}'
 
             # Ink bounding box and logical widths in font
             if glyph not in font.widths: