svg-ultralight 0.40.1__py3-none-any.whl → 0.42.0__py3-none-any.whl

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/string_conversion.py

@@ -27,10 +27,88 @@ if TYPE_CHECKING:
     )
 
 
-def format_number(num: float | str) -> str:
+_MAYBE_NEG = r"(?:(?P<negative>-?))"
+_MAYBE_INT = r"(?:(?P<integer>\d+?))"
+_MAYBE_FRACTION = r"(?:\.(?P<fraction>\d+))?"
+_MAYBE_EXP = r"(?:[eE](?P<exponent>[+-]?\d+))?"
+
+# Split a float (fp or exponential) into its components. All components are optional.
+FLOAT_PATTERN = re.compile(rf"{_MAYBE_NEG}{_MAYBE_INT}{_MAYBE_FRACTION}{_MAYBE_EXP}")
+
+
+def _split_float_str(num: str | float) -> tuple[str, str, str, int]:
+    """Split a float string into its sign, integer part, fractional part, and exponent.
+
+    :param num_str: A string representing the number (e.g., '1.23e+03').
+    :return: A tuple containing the integer part, fractional part, and exponent.
+    """
+    if float(num) == 0:
+        return "", "", "", 0
+    num_str = str(num)
+    groups = FLOAT_PATTERN.fullmatch(num_str)
+    if not groups:
+        msg = "Invalid number string: {num_str}."
+        raise ValueError(msg.format(num_str=num_str))
+
+    sign = groups["negative"] or ""
+    integer = (groups["integer"] or "").lstrip("0")
+    fraction = (groups["fraction"] or "").rstrip("0")
+    exponent = int(groups["exponent"] or 0)
+    return sign, integer, fraction, exponent
+
+
+def _format_as_fixed_point(num: str | float) -> str:
+    """Format a number in fixed-point notation.
+
+    :param exp_str: A string representing the number in exponential notation
+        (e.g., '1.23e+03') or just a number.
+    :return: A string representing the number in fixed-point notation.
+    """
+    sign, integer, fraction, exponent = _split_float_str(num)
+    if exponent > 0:
+        fraction = fraction.ljust(exponent, "0")
+        integer += fraction[:exponent]
+        fraction = fraction[exponent:]
+    elif exponent < 0:
+        integer = integer.rjust(-exponent, "0")
+        fraction = integer[exponent:] + fraction
+        integer = integer[:exponent]
+
+    fraction = "." + fraction if fraction else ""
+    return f"{sign}{integer}{fraction}" or "0"
+
+
+def _format_as_exponential(num: str | float) -> str:
+    """Convert a number in fixed-point notation (as a string) to exponential notation.
+
+    :param num_str: A string representing the number in fixed-point notation
+        (e.g., '123000') or just a number.
+    :return: A string representing the number in exponential notation.
+    """
+    sign, integer, fraction, exponent = _split_float_str(num)
+    if len(integer) > 1:
+        exponent += len(integer) - 1
+        fraction = (integer[1:] + fraction).rstrip("0")
+        integer = integer[0]
+    elif not integer and fraction:
+        leading_zeroes = len(fraction) - len(fraction.lstrip("0"))
+        exponent -= leading_zeroes + 1
+        integer = fraction[leading_zeroes]
+        fraction = fraction[leading_zeroes + 1 :]
+
+    fraction = "." + fraction if fraction else ""
+    exp_str = f"e{exponent}" if exponent else ""
+    return f"{sign}{integer}{fraction}{exp_str}" or "0"
+
+
+def format_number(num: float | str, precision: float | None = 6) -> str:
     """Format strings at limited precision.
 
     :param num: anything that can print as a float.
+    :param precision: number of digits after the decimal point, default 6. You can
+        also pass None for no precision limit. This may produce some long strings,
+        but will retain as much information as possible when converting between
+        floats and strings.
     :return: str
 
     I've read articles that recommend no more than four digits before and two digits
@@ -38,15 +116,20 @@ def format_number(num: float | str) -> str:
     giving six. Mostly to eliminate exponential notation, but I'm "rstripping" the
     strings to reduce filesize and increase readability
 
-    * reduce fp precision to 6 digits
+    * reduce fp precision to (default) 6 digits
     * remove trailing zeros
     * remove trailing decimal point
+    * remove leading 0 in "0.123"
     * convert "-0" to "0"
+    * use shorter of exponential or fixed-point notation
     """
-    as_str = f"{float(num):0.6f}".rstrip("0").rstrip(".")
-    if as_str == "-0":
-        as_str = "0"
-    return as_str
+    if precision is not None:
+        num = f"{float(num):.{precision}f}"
+    exponential_str = _format_as_exponential(num)
+    fixed_point_str = _format_as_fixed_point(num)
+    if len(exponential_str) < len(fixed_point_str):
+        return exponential_str
+    return fixed_point_str
 
 
 def format_numbers(

{svg_ultralight-0.40.1.dist-info → svg_ultralight-0.42.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.40.1
+Version: 0.42.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.1.dist-info → svg_ultralight-0.42.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ svg_ultralight/nsmap.py,sha256=y63upO78Rr-JJT56RWWZuyrsILh6HPoY4GhbYnK1A0g,1244
 svg_ultralight/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svg_ultralight/query.py,sha256=iFFsK78TuUT6h3iv_V8_fwCggIAdYa97K7oOPhhoPuY,9711
 svg_ultralight/root_elements.py,sha256=E_H7HXk0M5F3IyFVOxO8PQmhww1-sHTzJhx8hBJPZvg,2911
-svg_ultralight/string_conversion.py,sha256=ZUehoKh1lzys1jqRDIhHWfpxi4TSUhNFHiQl57OCAr8,10324
+svg_ultralight/string_conversion.py,sha256=U5IBhG05DtfSkJlbQ7BKHHbob78CHG6cF_Yr1EdB20U,13829
 svg_ultralight/transformations.py,sha256=T3vSxcTWOwWnwu3OF610LHMbKScUIVWICUAvru5zLnU,4488
 svg_ultralight/unit_conversion.py,sha256=g07nhzXdjPvGcJmkhLdFbeDLrSmbI8uFoVgPo7G62Bg,9258
 svg_ultralight/bounding_boxes/__init__.py,sha256=qUEn3r4s-1QNHaguhWhhaNfdP4tl_B6YEqxtiTFuzhQ,78
@@ -24,12 +24,11 @@ svg_ultralight/constructors/__init__.py,sha256=XLOInLhzMERWNnFAs-itMs-OZrBOpvQth
 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_css.py,sha256=oKChLEwE18q-rKrt7hEkpBzGQBp8u9VWFxPpIKH67o4,2780
-svg_ultralight/font_tools/font_info.py,sha256=8bXdsbIY2rbZ3Q1UnxR3B4nPf31MZivS40mEOcCsb44,20849
+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.1.dist-info/METADATA,sha256=ApD3fiKFCGDJNCBHNNo5wRrzoh5y_vz124GmnZnkAnQ,9022
-svg_ultralight-0.40.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-svg_ultralight-0.40.1.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
-svg_ultralight-0.40.1.dist-info/RECORD,,
+svg_ultralight-0.42.0.dist-info/METADATA,sha256=Ey-v7B_Us35-JyL8y1p52yjkIZgqNT405c54lDcpGpU,9022
+svg_ultralight-0.42.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+svg_ultralight-0.42.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
+svg_ultralight-0.42.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