svg-ultralight 0.46.0__tar.gz → 0.48.0__tar.gz

{svg_ultralight-0.46.0/src/svg_ultralight.egg-info → svg_ultralight-0.48.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.46.0
+Version: 0.48.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
-License: MIT
+License-Expression: MIT
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: cssutils

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "svg-ultralight"
-version = "0.46.0"
+version = "0.48.0"
 description = "a sensible way to create svg files with Python"
 authors = [{ name = "Shay Hill", email = "shay_public@hotmail.com" }]
-license = { text = "MIT" }
+license = "MIT"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
@@ -53,7 +53,7 @@ convention = "pep257"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.46.0"
+version = "0.48.0"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0}/src/svg_ultralight/bounding_boxes/bound_helpers.py

@@ -16,6 +16,7 @@ from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox, HasBoundingBox
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.constructors import new_element
+from svg_ultralight.layout import PadArg, expand_pad_arg
 
 if TYPE_CHECKING:
     import os
@@ -94,19 +95,6 @@ def new_bound_union(*blems: SupportsBounds | EtreeElement) -> BoundElement:
     return BoundElement(group, bbox)
 
 
-def _expand_pad(pad: float | tuple[float, ...]) -> tuple[float, float, float, float]:
-    """Expand a float pad argument into a 4-tuple."""
-    if isinstance(pad, (int, float)):
-        return pad, pad, pad, pad
-    if len(pad) == 1:
-        return pad[0], pad[0], pad[0], pad[0]
-    if len(pad) == 2:
-        return pad[0], pad[1], pad[0], pad[1]
-    if len(pad) == 3:
-        return pad[0], pad[1], pad[2], pad[1]
-    return pad[0], pad[1], pad[2], pad[3]
-
-
 def cut_bbox(
     bbox: SupportsBounds,
     *,
@@ -133,7 +121,7 @@ def cut_bbox(
     return BoundingBox(x, y, width, height)
 
 
-def pad_bbox(bbox: SupportsBounds, pad: float | tuple[float, ...]) -> BoundingBox:
+def pad_bbox(bbox: SupportsBounds, pad: PadArg) -> BoundingBox:
     """Return a new bounding box with padding.
 
     :param bbox: the original bounding box or bounded element.
@@ -146,7 +134,7 @@ def pad_bbox(bbox: SupportsBounds, pad: float | tuple[float, ...]) -> BoundingBo
         len = 4 : 0, 1, 2, 3
     :return: a new bounding box with padding applied.
     """
-    top, right, bottom, left = _expand_pad(pad)
+    top, right, bottom, left = expand_pad_arg(pad)
     return cut_bbox(
         bbox, x=bbox.x - left, y=bbox.y - top, x2=bbox.x2 + right, y2=bbox.y2 + bottom
     )

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0}/src/svg_ultralight/bounding_boxes/padded_text_initializers.py

@@ -10,6 +10,12 @@ Three variants:
   line_gap while correcting some of the layout differences between fontTools and
   Inkscape.
 
+There is a default font size for pad_text if an element is passed. There is also a
+default for the other pad_text_ functions, but it taken from the font file and is
+usually 1024, so it won't be easy to miss. The default for standard pad_text is to
+prevent surprises if Inksape defaults to font-size 12pt while your browser defaults
+to 16px.
+
 :author: Shay Hill
 :created: 2025-06-09
 """
@@ -25,7 +31,6 @@ from svg_ultralight.font_tools.font_info import (
     get_padded_text_info,
     get_svg_font_attributes,
 )
-from svg_ultralight.font_tools.globs import DEFAULT_FONT_SIZE
 from svg_ultralight.query import get_bounding_boxes
 from svg_ultralight.string_conversion import format_attr_dict, format_number
 
@@ -40,6 +45,10 @@ if TYPE_CHECKING:
 
 DEFAULT_Y_BOUNDS_REFERENCE = "{[|gjpqyf"
 
+# A default font size for pad_text if font-size is not specified in the reference
+# element.
+DEFAULT_FONT_SIZE_FOR_PAD_TEXT = 12.0  # Default font size for pad_text if not specified
+
 
 def pad_text(
     inkscape: str | os.PathLike[str],
@@ -72,7 +81,7 @@ def pad_text(
     if font is not None:
         _ = update_element(text_elem, **get_svg_font_attributes(font))
     if "font-size" not in text_elem.attrib:
-        text_elem.attrib["font-size"] = format_number(DEFAULT_FONT_SIZE)
+        text_elem.attrib["font-size"] = format_number(DEFAULT_FONT_SIZE_FOR_PAD_TEXT)
     rmargin_ref = deepcopy(text_elem)
     capline_ref = deepcopy(text_elem)
     _ = rmargin_ref.attrib.pop("id", None)
@@ -93,7 +102,7 @@ def pad_text(
 def pad_text_ft(
     font: str | os.PathLike[str],
     text: str,
-    font_size: float = DEFAULT_FONT_SIZE,
+    font_size: float | None = None,
     ascent: float | None = None,
     descent: float | None = None,
     *,
@@ -144,7 +153,7 @@ def pad_text_mix(
     inkscape: str | os.PathLike[str],
     font: str | os.PathLike[str],
     text: str,
-    font_size: float = DEFAULT_FONT_SIZE,
+    font_size: float | None = None,
     ascent: float | None = None,
     descent: float | None = None,
     *,

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0}/src/svg_ultralight/font_tools/font_info.py

@@ -110,7 +110,6 @@ from svg_path_data import format_svgd_shortest, get_cpts_from_svgd, get_svgd_fro
 
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 from svg_ultralight.constructors.new_element import new_element
-from svg_ultralight.font_tools.globs import DEFAULT_FONT_SIZE
 from svg_ultralight.string_conversion import format_numbers
 
 if TYPE_CHECKING:
@@ -124,7 +123,15 @@ if TYPE_CHECKING:
 logging.getLogger("fontTools").setLevel(logging.ERROR)
 
 
-_ESCAPE_CHARS = {"&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&apos;"}
+_ESCAPE_CHARS = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&apos;",
+    "{": "&#123",  # valid, but stops MS File Explorer from thumbnailing an svg
+    "}": "&#125",  # valid, but stops MS File Explorer from thumbnailing an svg
+}
 
 
 def _sanitize_svg_data_text(text: str) -> str:
@@ -377,8 +384,8 @@ class FTFontInfo:
         :param dx: An optional x translation to apply to the glyph.
         :return: The svg path data for the character.
         """
+        glyph_name = self.get_glyph_name(char)
         glyph_set = self.font.getGlyphSet()
-        glyph_name = self.font.getBestCmap().get(ord(char))
         path_pen = PathPen(glyph_set)
         _ = glyph_set[glyph_name].draw(path_pen)
         svgd = path_pen.svgd
@@ -398,8 +405,8 @@ class FTFontInfo:
         same, but when they disagree, this method is more accurate. Additionally,
         some fonts do not have a glyf table, so this method is more robust.
         """
+        glyph_name = self.get_glyph_name(char)
         glyph_set = self.font.getGlyphSet()
-        glyph_name = self.font.getBestCmap().get(ord(char))
         bounds_pen = BoundsPen(glyph_set)
         _ = glyph_set[glyph_name].draw(bounds_pen)
         pen_bounds = cast("None | tuple[int, int, int, int]", bounds_pen.bounds)
@@ -499,7 +506,7 @@ class FTTextInfo:
         self,
         font: str | os.PathLike[str] | FTFontInfo,
         text: str,
-        font_size: float,
+        font_size: float | None = None,
         ascent: float | None = None,
         descent: float | None = None,
     ) -> None:
@@ -509,7 +516,7 @@ class FTTextInfo:
         else:
             self._font = FTFontInfo(font)
         self._text = text.rstrip(" ")
-        self._font_size = font_size
+        self._font_size = font_size or self._font.units_per_em
         self._ascent = ascent
         self._descent = descent
 
@@ -638,7 +645,7 @@ def get_font_size_given_height(font: str | os.PathLike[str], height: float) -> f
 def get_padded_text_info(
     font: str | os.PathLike[str],
     text: str,
-    font_size: float = DEFAULT_FONT_SIZE,
+    font_size: float | None = None,
     ascent: float | None = None,
     descent: float | None = None,
     *,

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0/src/svg_ultralight.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.46.0
+Version: 0.48.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
-License: MIT
+License-Expression: MIT
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: cssutils

{svg_ultralight-0.46.0 → svg_ultralight-0.48.0}/src/svg_ultralight.egg-info/SOURCES.txt

@@ -39,7 +39,6 @@ src/svg_ultralight/constructors/new_element.py
 src/svg_ultralight/font_tools/__init__.py
 src/svg_ultralight/font_tools/comp_results.py
 src/svg_ultralight/font_tools/font_info.py
-src/svg_ultralight/font_tools/globs.py
 src/svg_ultralight/strings/__init__.py
 src/svg_ultralight/strings/svg_strings.py
 tests/__init__.py

svg_ultralight-0.46.0/src/svg_ultralight/font_tools/globs.py

@@ -1,7 +0,0 @@
-"""Global values for working with fonts.
-
-:author: Shay Hill
-:created: 2025-06-09
-"""
-
-DEFAULT_FONT_SIZE = 12.0