svg-ultralight 0.40.0__py3-none-any.whl → 0.41.0__py3-none-any.whl

svg_ultralight/__init__.py

@@ -30,6 +30,7 @@ from svg_ultralight.constructors.new_element import (
     new_sub_element,
     update_element,
 )
+from svg_ultralight.font_tools.comp_results import check_font_tools_alignment
 from svg_ultralight.inkscape import (
     write_pdf,
     write_pdf_from_svg,
@@ -67,6 +68,7 @@ __all__ = [
     "PaddedText",
     "SupportsBounds",
     "bbox_dict",
+    "check_font_tools_alignment",
     "clear_svg_ultralight_cache",
     "cut_bbox",
     "deepcopy_element",

svg_ultralight/bounding_boxes/padded_text_initializers.py

@@ -17,7 +17,6 @@ Three variants:
 from __future__ import annotations
 
 from copy import deepcopy
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
@@ -29,7 +28,6 @@ from svg_ultralight.font_tools.font_info import (
 from svg_ultralight.font_tools.globs import DEFAULT_FONT_SIZE
 from svg_ultralight.query import get_bounding_boxes
 from svg_ultralight.string_conversion import (
-    encode_to_css_class_name,
     format_attr_dict,
     format_number,
 )
@@ -123,8 +121,8 @@ def pad_text_ft(
     :return: a PaddedText instance with a line_gap defined.
     """
     attributes_ = format_attr_dict(**attributes)
+    attributes_.update(get_svg_font_attributes(font))
     attributes_["font-size"] = attributes_.get("font-size", format_number(font_size))
-    attributes_["class"] = encode_to_css_class_name(Path(font).name)
 
     elem = new_element("text", text=text, **attributes_)
     info = get_padded_text_info(

svg_ultralight/font_tools/comp_results.py

@@ -24,16 +24,16 @@ import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from svg_ultralight import new_bbox_rect, new_svg_root_around_bounds, pad_bbox
+from svg_ultralight.bounding_boxes.bound_helpers import new_bbox_rect, pad_bbox
 from svg_ultralight.bounding_boxes.padded_text_initializers import (
     DEFAULT_Y_BOUNDS_REFERENCE,
     pad_text,
     pad_text_ft,
 )
 from svg_ultralight.constructors import new_element
-from svg_ultralight.font_tools.font_css import add_svg_font_class
 from svg_ultralight.font_tools.font_info import get_svg_font_attributes
 from svg_ultralight.main import write_svg
+from svg_ultralight.root_elements import new_svg_root_around_bounds
 
 if TYPE_CHECKING:
     import os
@@ -214,7 +214,6 @@ def draw_comparison(
     )
 
     root = new_svg_root_around_bounds(pad_bbox(padded_pt.bbox, 10))
-    _ = add_svg_font_class(root, font)
     root.append(
         new_bbox_rect(
             padded_pt.unpadded_bbox, fill="none", stroke_width=0.07, stroke="red"

svg_ultralight/font_tools/font_info.py

@@ -383,7 +383,7 @@ class FTTextInfo:
     @property
     def bpad(self) -> float:
         """Return the bottom padding for the text."""
-        return self.descent - self.bbox.y2
+        return -self.descent - self.bbox.y2
 
     @property
     def lpad(self) -> float:
@@ -433,8 +433,8 @@ def get_padded_text_info(
     :param font_size: the font size to use.
     :param ascent: the ascent of the font. If not provided, it will be calculated
         from the font file.
-    :param descent: the descent of the font. If not provided, it will be calculated
-        from the font file.
+    :param descent: the descent of the font, usually a negative number. If not
+        provided, it will be calculated from the font file.
     :param y_bounds_reference: optional character or string to use as a reference
         for the ascent and descent. If provided, the ascent and descent will be the y
         extents of the capline reference. This argument is provided to mimic the
@@ -447,7 +447,7 @@ def get_padded_text_info(
     if y_bounds_reference:
         capline_info = FTTextInfo(font_info, y_bounds_reference, font_size)
         ascent = -capline_info.bbox.y
-        descent = capline_info.bbox.y2
+        descent = -capline_info.bbox.y2
 
     return FTTextInfo(font_info, text, font_size, ascent, descent)
 

{svg_ultralight-0.40.0.dist-info → svg_ultralight-0.41.0.dist-info}/METADATA

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

{svg_ultralight-0.40.0.dist-info → svg_ultralight-0.41.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-svg_ultralight/__init__.py,sha256=vINKVO2LVeGHBpD18mSWGC4qh-eS4ULk9JoGZSBuYoU,2705
+svg_ultralight/__init__.py,sha256=A398qxoBmywPj3WR2sLgxhctsQZGgk_Dwd8jUIB87dU,2819
 svg_ultralight/animate.py,sha256=SMcQkeWAP9dD08Iyzy9qGG8Qk1p-14WfrB7WSN8Pj_4,1133
 svg_ultralight/image_ops.py,sha256=6V9YkxnhZCBw_hbVyY0uxDj0pZgiEWBSGRuPuOYKY4w,4694
 svg_ultralight/inkscape.py,sha256=ySCxWnQwEt1sosa1b4mEkR-ugpfoAeg9gs1OLPS69iI,9597
@@ -14,7 +14,7 @@ svg_ultralight/transformations.py,sha256=T3vSxcTWOwWnwu3OF610LHMbKScUIVWICUAvru5
 svg_ultralight/unit_conversion.py,sha256=g07nhzXdjPvGcJmkhLdFbeDLrSmbI8uFoVgPo7G62Bg,9258
 svg_ultralight/bounding_boxes/__init__.py,sha256=qUEn3r4s-1QNHaguhWhhaNfdP4tl_B6YEqxtiTFuzhQ,78
 svg_ultralight/bounding_boxes/bound_helpers.py,sha256=LFkVsdYFKYCnEL6vLvEa_5cfu8D44ZGYeEEb7_0MnC0,7146
-svg_ultralight/bounding_boxes/padded_text_initializers.py,sha256=ZR5IsRKuH8beU0Qe2aVldmWXwH4aji003uxU353ulFg,7611
+svg_ultralight/bounding_boxes/padded_text_initializers.py,sha256=fce6gLBAX7Q0L5t8ECwyfvnelTqZRVCPex8TnV7mIv8,7539
 svg_ultralight/bounding_boxes/supports_bounds.py,sha256=T7LGse58fDBgmlzupSC63C1ZMXjFbyzBTsTUaqD_4Sw,4513
 svg_ultralight/bounding_boxes/type_bound_collection.py,sha256=NAEpqo9H9ewhuLcOmBnMWUE0zQ1t4bvckovgvWy6hIo,2645
 svg_ultralight/bounding_boxes/type_bound_element.py,sha256=Sc-R0uXkb0aS8-OcyM5pDukKhFUka0G6KCp6LcYDcIU,2204
@@ -23,13 +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=gB1RHIHcltbOqWZ0s4xCRKEIMob7MWgPWjKv5hA7B8Q,10481
-svg_ultralight/font_tools/font_css.py,sha256=oKChLEwE18q-rKrt7hEkpBzGQBp8u9VWFxPpIKH67o4,2780
-svg_ultralight/font_tools/font_info.py,sha256=8bXdsbIY2rbZ3Q1UnxR3B4nPf31MZivS40mEOcCsb44,20849
+svg_ultralight/font_tools/comp_results.py,sha256=iEDbExO3D7ffo0NZxrqf-WjtzUCJZbdHmqwjjac4laY,10444
+svg_ultralight/font_tools/font_info.py,sha256=00iNrJwWH2-de9CbaG1TqulRFmp_3aOyjRAlqOpT0II,20878
 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.40.0.dist-info/METADATA,sha256=hUDb0ZUHgfMWRmLELiaw9XW55FtZlFV0CF5f36S4Ms8,9022
-svg_ultralight-0.40.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-svg_ultralight-0.40.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
-svg_ultralight-0.40.0.dist-info/RECORD,,
+svg_ultralight-0.41.0.dist-info/METADATA,sha256=jJ9sHbqg4zJ3WcCuAMbiGb69FEtUcpZappC5LeZYl3Y,9022
+svg_ultralight-0.41.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+svg_ultralight-0.41.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
+svg_ultralight-0.41.0.dist-info/RECORD,,

svg_ultralight/font_tools/font_css.py

@@ -1,82 +0,0 @@
-"""Link local fonts as css in an svg file.
-
-:author: Shay Hill
-:created: 2025-06-04
-"""
-
-# pyright: reportUnknownMemberType = false
-# pyright: reportAttributeAccessIssue = false
-# pyright: reportUnknownArgumentType = false
-# pyright: reportUnknownVariableType = false
-# pyright: reportUnknownParameterType = false
-# pyright: reportMissingTypeStubs = false
-
-from __future__ import annotations
-
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-import cssutils
-
-from svg_ultralight.constructors import new_element
-from svg_ultralight.string_conversion import encode_to_css_class_name
-
-if TYPE_CHECKING:
-    import os
-
-    from lxml.etree import (
-        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
-    )
-
-
-def _get_class_names_from_stylesheet(
-    stylesheet: cssutils.css.CSSStyleSheet,
-) -> list[str]:
-    """Extract all class names from a given CSS stylesheet.
-
-    :param stylesheet: A cssutils.css.CSSStyleSheet object.
-    :return: A list of class names (without the leading dot).
-    """
-    class_names: list[str] = []
-    for rule in stylesheet.cssRules:
-        if rule.type == rule.STYLE_RULE:
-            selectors = (s.strip() for s in rule.selectorText.split(","))
-            class_names.extend(s[1:] for s in selectors if s.startswith("."))
-    return class_names
-
-
-def add_svg_font_class(root: EtreeElement, font: str | os.PathLike[str]) -> str:
-    """Add a css class for the font to the root element.
-
-    :param root: The root element of the SVG document.
-    :param font: Path to the font file.
-    :return: The class name for the font, e.g., "bahnschrift_2e_ttf"
-    """
-    assert Path(font).exists()
-    family_name = encode_to_css_class_name(Path(font).stem)
-    class_name = encode_to_css_class_name(Path(font).name)
-    style = root.find("style")
-    if style is None:
-        style = new_element("style", type="text/css")
-        root.insert(0, style)
-    css = style.text or ""
-
-    stylesheet = cssutils.parseString(css)
-    existing_class_names = _get_class_names_from_stylesheet(stylesheet)
-    if class_name in existing_class_names:
-        return class_name
-
-    font_face_rule = cssutils.css.CSSFontFaceRule()
-    font_face_rule.style = cssutils.css.CSSStyleDeclaration()
-    font_face_rule.style["font-family"] = f'"{family_name}"'
-    font_face_rule.style["src"] = rf"url('{Path(font).as_posix()}')"
-    stylesheet.add(font_face_rule)
-
-    style_rule = cssutils.css.CSSStyleRule(selectorText=f".{class_name}")
-    style_rule.style = cssutils.css.CSSStyleDeclaration()
-    style_rule.style["font-family"] = f'"{family_name}"'
-    stylesheet.add(style_rule)
-
-    style.text = stylesheet.cssText.decode("utf-8")
-
-    return class_name