svg-ultralight 0.47.0__py3-none-any.whl → 0.48.0__py3-none-any.whl

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/bounding_boxes/padded_text_initializers.py

@@ -49,6 +49,7 @@ DEFAULT_Y_BOUNDS_REFERENCE = "{[|gjpqyf"
 # 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],
     text_elem: EtreeElement,
@@ -80,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)

svg_ultralight/font_tools/font_info.py

@@ -123,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:
@@ -376,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
@@ -397,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)

{svg_ultralight-0.47.0.dist-info → svg_ultralight-0.48.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.47.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.47.0.dist-info → svg_ultralight-0.48.0.dist-info}/RECORD

@@ -14,8 +14,8 @@ svg_ultralight/string_conversion.py,sha256=NWguHAmuKWON7Fh2EkVDfMIwp-jk6k7SW8hAU
 svg_ultralight/transformations.py,sha256=q-9GC01fh8vXyddjpDlal9BfebMuMWGl46ubg-0FalU,4510
 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=iCinp_kFsxi29gJEMnDZpKs13Fj1fj8SWqbbWO94UTI,7203
-svg_ultralight/bounding_boxes/padded_text_initializers.py,sha256=7vH9eKFrH2d1EkLpealxW2v9Bp5_Juib4X82zpe3faY,8786
+svg_ultralight/bounding_boxes/bound_helpers.py,sha256=fu1_AluqnILYgbfzde_tBEqEpFTNRBmWBo_5qz_hUIs,6772
+svg_ultralight/bounding_boxes/padded_text_initializers.py,sha256=Bk0xyOXcClMVXZee_1YFiza_aVL9KZax7BIPNBsQqfw,8801
 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
@@ -25,10 +25,10 @@ svg_ultralight/constructors/__init__.py,sha256=XLOInLhzMERWNnFAs-itMs-OZrBOpvQth
 svg_ultralight/constructors/new_element.py,sha256=kGRaVsT1yugADUCKz3NjFW_14Ts1M8UQeLPTarTXtBY,3529
 svg_ultralight/font_tools/__init__.py,sha256=NX3C0vvoB-G4S-h1f0NLWePjYAMMR37D1cl_G4WBjHc,83
 svg_ultralight/font_tools/comp_results.py,sha256=gFxdqY1D5z8MGt1UyWOK8O_t50AHgg-B846uWdzoLco,10687
-svg_ultralight/font_tools/font_info.py,sha256=iH63Ey9zT5MXWmokcq51FPBCwF8cig9dMSIN7G76Qpg,29858
+svg_ultralight/font_tools/font_info.py,sha256=rDaKT9FTZr6OgWntoObQxAxM23n4Gz6vRJLc0yZ90u8,30023
 svg_ultralight/strings/__init__.py,sha256=BMGhF1pulscIgkiYvZLr6kPRR0L4lW0jUNFxkul4_EM,295
 svg_ultralight/strings/svg_strings.py,sha256=FQNxNmMkR2M-gCFo_woQKXLgCHi3ncUlRMiaRR_a9nQ,1978
-svg_ultralight-0.47.0.dist-info/METADATA,sha256=Un6DiA1noLMt3jcL_nYZEfzoMXC5P9K9F8TsdTHGzxI,9052
-svg_ultralight-0.47.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-svg_ultralight-0.47.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
-svg_ultralight-0.47.0.dist-info/RECORD,,
+svg_ultralight-0.48.0.dist-info/METADATA,sha256=XtJST6sTXMexQOq57fILqtfJoc1G_4zbgLQiLoQNKQs,9063
+svg_ultralight-0.48.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+svg_ultralight-0.48.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
+svg_ultralight-0.48.0.dist-info/RECORD,,