svg-ultralight 0.43.1__py3-none-any.whl → 0.44.0__py3-none-any.whl

svg_ultralight/font_tools/comp_results.py

@@ -31,8 +31,8 @@ from svg_ultralight.bounding_boxes.padded_text_initializers import (
     pad_text_ft,
 )
 from svg_ultralight.constructors import new_element
-from svg_ultralight.font_tools.font_info import get_svg_font_attributes
-from svg_ultralight.main import write_svg
+from svg_ultralight.font_tools.font_info import FTFontInfo, get_svg_font_attributes
+from svg_ultralight.inkscape import write_root
 from svg_ultralight.root_elements import new_svg_root_around_bounds
 
 if TYPE_CHECKING:
@@ -201,7 +201,15 @@ def draw_comparison(
         text = Path(font).stem
     font_size = 12
     font_attributes = get_svg_font_attributes(font)
-    text_elem = new_element("text", text=text, **font_attributes, font_size=font_size)
+    text_elem = new_element(
+        "text",
+        text=text,
+        **font_attributes,
+        font_size=font_size,
+        fill="none",
+        stroke="green",
+        stroke_width=0.1,
+    )
     padded_pt = pad_text(inkscape, text_elem)
     padded_ft = pad_text_ft(
         font,
@@ -210,10 +218,10 @@ def draw_comparison(
         y_bounds_reference=DEFAULT_Y_BOUNDS_REFERENCE,
         fill="none",
         stroke="orange",
-        stroke_width=0.05,
+        stroke_width=0.1,
     )
 
-    root = new_svg_root_around_bounds(pad_bbox(padded_pt.bbox, 10))
+    root = new_svg_root_around_bounds(pad_bbox(padded_pt.bbox, 1))
     root.append(
         new_bbox_rect(
             padded_pt.unpadded_bbox, fill="none", stroke_width=0.07, stroke="red"
@@ -227,7 +235,7 @@ def draw_comparison(
     root.append(padded_pt.elem)
     root.append(padded_ft.elem)
     _ = sys.stdout.write(f"{Path(font).stem} comparison drawn at {output}.\n")
-    _ = write_svg(Path(output), root)
+    _ = write_root(inkscape, Path(output), root)
 
 
 def _iter_fonts(*fonts_dirs: Path) -> Iterator[Path]:
@@ -273,11 +281,13 @@ def _test_every_font_on_my_system(
 
 if __name__ == "__main__":
     _INKSCAPE = Path(r"C:\Program Files\Inkscape\bin\inkscape")
-    _FONT_DIRS = [
-        Path(r"C:\Windows\Fonts"),
-        Path(r"C:\Users\shaya\AppData\Local\Microsoft\Windows\Fonts"),
-    ]
-    _test_every_font_on_my_system(_INKSCAPE, _FONT_DIRS)
+    # _FONT_DIRS = [
+    #     Path(r"C:\Windows\Fonts"),
+    #     Path(r"C:\Users\shaya\AppData\Local\Microsoft\Windows\Fonts"),
+    # ]
+    # _test_every_font_on_my_system(_INKSCAPE, _FONT_DIRS)
 
     font = Path(r"C:\Windows\Fonts\arial.ttf")
-    draw_comparison(_INKSCAPE, "temp.svg", font)
+    font = Path("C:/Windows/Fonts/Aptos-Display-Bold.ttf")
+    info = FTFontInfo(font)
+    draw_comparison(_INKSCAPE, "temp.svg", font, "AApple")

svg_ultralight/font_tools/font_info.py

@@ -105,6 +105,7 @@ from typing import TYPE_CHECKING, Any, cast
 from fontTools.pens.basePen import BasePen
 from fontTools.pens.boundsPen import BoundsPen
 from fontTools.ttLib import TTFont
+from paragraphs import par
 from svg_path_data import format_svgd_shortest, get_cpts_from_svgd, get_svgd_from_cpts
 
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
@@ -121,9 +122,63 @@ if TYPE_CHECKING:
 logging.getLogger("fontTools").setLevel(logging.ERROR)
 
 
-def _split_into_quadratic(
-    *pts: tuple[float, float],
-) -> Iterator[tuple[tuple[float, float], tuple[float, float]]]:
+# extract_gpos_kerning is an unfinished attempt to extract kerning from the GPOS
+# table.
+def get_gpos_kerning(font: TTFont) -> dict[tuple[str, str], int]:
+    """Extract kerning pairs from the GPOS table of a font.
+
+    :param font: A fontTools TTFont object.
+    :return: A dictionary mapping glyph pairs to their kerning values.
+    :raises ValueError: If the font does not have a GPOS table.
+
+    This is the more elaborate kerning that is used in OTF fonts and some TTF fonts.
+    It has several flavors, I'm only implementing glyph-pair kerning (Format 1),
+    because I don't have fonts to test anything else.
+    """
+    if "GPOS" not in font:
+        msg = "Font does not have a GPOS table."
+        raise ValueError(msg)
+
+    gpos = font["GPOS"].table
+    kern_table: dict[tuple[str, str], int] = {}
+
+    type2_lookups = (x for x in gpos.LookupList.Lookup if x.LookupType == 2)
+    subtables = list(it.chain(*(x.SubTable for x in type2_lookups)))
+    for subtable in (x for x in subtables if x.Format == 1):  # glyph-pair kerning
+        for pair_set, glyph1 in zip(subtable.PairSet, subtable.Coverage.glyphs):
+            for pair_value in pair_set.PairValueRecord:
+                glyph2 = pair_value.SecondGlyph
+                value1 = pair_value.Value1
+                xadv = getattr(value1, "XAdvance", None)
+                xpla = getattr(value1, "XPlacement", None)
+                value = xadv or xpla or 0
+                if value != 0:  # only record non-zero kerning values
+                    kern_table[(glyph1, glyph2)] = value
+
+    for subtable in (x for x in subtables if x.Format == 2):  # class-based kerning
+        defs1 = subtable.ClassDef1.classDefs
+        defs2 = subtable.ClassDef2.classDefs
+        record1 = subtable.Class1Record
+        defs1 = {k: v for k, v in defs1.items() if v < len(record1)}
+        for (glyph1, class1), (glyph2, class2) in it.product(
+            defs1.items(), defs2.items()
+        ):
+            class1_record = record1[class1]
+            if class2 < len(class1_record.Class2Record):
+                value1 = class1_record.Class2Record[class2].Value1
+                xadv = getattr(value1, "XAdvance", None)
+                xpla = getattr(value1, "XPlacement", None)
+                value = xadv or xpla or 0
+                if value != 0:
+                    kern_table[(glyph1, glyph2)] = value
+
+    return kern_table
+
+
+_XYTuple = tuple[float, float]
+
+
+def _split_into_quadratic(*pts: _XYTuple) -> Iterator[tuple[_XYTuple, _XYTuple]]:
     """Connect a series of points with quadratic bezier segments.
 
     :param points: a series of at least two (x, y) coordinates.
@@ -183,9 +238,16 @@ class PathPen(BasePen):
 
     def curveTo(self, *pts: tuple[float, float]) -> None:
         """Add a series of cubic bezier segments to the path."""
-        msg = "Cubic Bezier curves not implemented for getting svg path data."
-        raise NotImplementedError(msg)
-        self._cmds.extend(("Q", *map(str, it.chain(*pts))))
+        if len(pts) > 3:
+            msg = par(
+                """I'm uncertain how to decompose these points into cubics (if the
+                goal is to match font rendering in Inkscape and elsewhere. There is
+                function, decomposeSuperBezierSegment, in fontTools, but I cannot
+                find a reference for the algorithm. I'm hoping to run into one in a
+                font file so I have a test case."""
+            )
+            raise NotImplementedError(msg)
+        self._cmds.extend(("C", *map(str, it.chain(*pts))))
 
     def qCurveTo(self, *pts: tuple[float, float]) -> None:
         """Add a series of quadratic bezier segments to the path."""
@@ -252,13 +314,18 @@ class FTFontInfo:
         method would give precedence to the first occurrence. That behavior is copied
         from examples found online.
         """
-        with suppress(KeyError, AttributeError):
+        try:
             kern_tables = cast(
                 "list[dict[tuple[str, str], int]]",
                 [x.kernTable for x in self.font["kern"].kernTables],
             )
-            return dict(x for d in reversed(kern_tables) for x in d.items())
-        return {}
+            kern = dict(x for d in reversed(kern_tables) for x in d.items())
+        except (KeyError, AttributeError):
+            kern = {}
+        with suppress(Exception):
+            kern.update(get_gpos_kerning(self.font))
+
+        return kern
 
     @ft.cached_property
     def hhea(self) -> Any:

{svg_ultralight-0.43.1.dist-info → svg_ultralight-0.44.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.43.1
+Version: 0.44.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT

{svg_ultralight-0.43.1.dist-info → svg_ultralight-0.44.0.dist-info}/RECORD

@@ -23,12 +23,12 @@ svg_ultralight/bounding_boxes/type_padded_text.py,sha256=WNIoqC9pfB8g_00P6RHcBdN
 svg_ultralight/constructors/__init__.py,sha256=XLOInLhzMERWNnFAs-itMs-OZrBOpvQthZJ2T5duqBE,327
 svg_ultralight/constructors/new_element.py,sha256=hRUW2hR_BTkthEqPClYV7-IeFe9iv2zwb6ehp1k1xDk,3475
 svg_ultralight/font_tools/__init__.py,sha256=NX3C0vvoB-G4S-h1f0NLWePjYAMMR37D1cl_G4WBjHc,83
-svg_ultralight/font_tools/comp_results.py,sha256=iEDbExO3D7ffo0NZxrqf-WjtzUCJZbdHmqwjjac4laY,10444
-svg_ultralight/font_tools/font_info.py,sha256=CDAA5hJOkVS8yyRzAk0uVb0WMTL3fY6Jhxk9I6SEFi8,26375
+svg_ultralight/font_tools/comp_results.py,sha256=ypqIqt7pe4tCCRGMJl7hVJtmQyUAYlQj1HZHmTcVThE,10697
+svg_ultralight/font_tools/font_info.py,sha256=QztVHygo-qkp0IOe5bRnvjiR1rehEVxUyvsMZDJm5A0,29343
 svg_ultralight/font_tools/globs.py,sha256=JdrrGMqDtD4WcY7YGUWV43DUW63RVev-x9vWqsQUhxU,119
 svg_ultralight/strings/__init__.py,sha256=BMGhF1pulscIgkiYvZLr6kPRR0L4lW0jUNFxkul4_EM,295
 svg_ultralight/strings/svg_strings.py,sha256=FQNxNmMkR2M-gCFo_woQKXLgCHi3ncUlRMiaRR_a9nQ,1978
-svg_ultralight-0.43.1.dist-info/METADATA,sha256=0lV1rScmuaMl3tHmBxIBwD2I-shfrGe__RAX7Sx2bmc,9052
-svg_ultralight-0.43.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-svg_ultralight-0.43.1.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
-svg_ultralight-0.43.1.dist-info/RECORD,,
+svg_ultralight-0.44.0.dist-info/METADATA,sha256=mHPgja-zNjke16M_4iZCj5gAS3orif2qnJTgkogwHvc,9052
+svg_ultralight-0.44.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+svg_ultralight-0.44.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
+svg_ultralight-0.44.0.dist-info/RECORD,,