svg-ultralight 0.32.2__tar.gz → 0.34.0__tar.gz

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/.pre-commit-config.yaml

@@ -6,7 +6,7 @@ exclude: "tests"
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
     - id: check-added-large-files
     - id: check-ast
@@ -42,7 +42,7 @@ repos:
         # files: .pre-commit-config.yaml
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.0
+  rev: v1.13.0
   hooks:
   - id: mypy
     name: mypy
@@ -64,14 +64,14 @@ repos:
     args: ["--profile", "black", "--filter-files", "--combine-as"]
 
 - repo: https://github.com/psf/black
-  rev: 24.4.2
+  rev: 24.10.0
   hooks:
   - id: black
     language_version: python3.9
     args: ["--skip-magic-trailing-comma"]
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.2
+  rev: v3.19.0
   hooks:
   - args:
     - --py39-plus
@@ -82,33 +82,6 @@ repos:
   hooks:
   - id: remove-tabs
 
-# - repo: https://github.com/commitizen-tools/commitizen
-#   rev: v2.40.0
-#   hooks:
-#   - id: commitizen
-
-# Pylint is still broken in Python 3.12
-# - repo: https://github.com/pre-commit/mirrors-pylint
-#   rev: v3.0.0a5
-#   hooks:
-#   - id: pylint
-#     exclude: "tests"
-#     name: pylint
-#     args:
-#     - --good-names=i,j,_,f,x,y,x2,y2,cx,cy,x_,y_,r,g,b,e,get_viewBox_str
-#     - --disable=protected-access
-#     - --disable=no-member
-#     - --disable=import-error
-#     - --disable=no-name-in-module
-#     - --disable=too-many-arguments
-#     - --disable=too-many-instance-attributes
-#     - --disable=unnecessary-ellipsis
-#     - --load-plugins=pylint.extensions.docparams
-#     - --accept-no-param-doc=n
-#     - --accept-no-raise-doc=n
-#     - --accept-no-return-doc=n
-#     - --accept-no-yields-doc=n
-
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # ignores
   # ANN101 Missing type annotation for self in method
@@ -134,18 +107,21 @@ repos:
   # D407 [*] Missing dashed underline after section ("Attributes")
   # D406 [*] Section name should end with a newline ("Attributes")
   # S320 Using `lxml` to parse untrusted data is known to be vulnerable to XML attacks
-  rev: 'v0.4.6'
+  # S301 don't use pickle
+  # B028 wants explicit stacklevel on warn
+  # BLE001 Use of `except Exception:` detected
+  rev: 'v0.7.4'
   hooks:
     - id: ruff
       exclude: "tests"
       args:
       - --target-version=py39
       - --select=ALL
-      - --ignore=ANN101,ANN102,ANN201,ANN202,B905,COM812,D203,D213,I001,ISC003,N802,N806,PGH003,PLR0913,PTH108,S101,S603,PLR2004,D413,D407,D406,S320
+      - --ignore=ANN101,ANN102,ANN201,ANN202,B905,COM812,D203,D213,I001,ISC003,N802,N806,PGH003,PLR0913,PTH108,S101,S603,PLR2004,D413,D407,D406,S320,S301,B028,BLE001
       # - --fix
 
 # reads pyproject.toml for additional config
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.365
+  rev: v1.1.389
   hooks:
     - id: pyright

{svg_ultralight-0.32.2/src/svg_ultralight.egg-info → svg_ultralight-0.34.0}/PKG-INFO

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

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "svg-ultralight"
-version = "0.32.2"
+version = "0.34.0"
 description = "a sensible way to create svg files with Python"
 authors = [{ name = "Shay Hill", email = "shay_public@hotmail.com" }]
 license = { text = "MIT" }
@@ -37,7 +37,7 @@ legacy_tox_ini = """
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.32.2"
+version = "0.34.0"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/__init__.py

@@ -8,6 +8,10 @@ from svg_ultralight.bounding_boxes.bound_helpers import (
     new_bbox_union,
     new_bound_union,
     new_element_union,
+    cut_bbox,
+    pad_bbox,
+    bbox_dict,
+    new_bbox_rect,
 )
 from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
 from svg_ultralight.bounding_boxes.type_bound_collection import BoundCollection
@@ -20,7 +24,6 @@ from svg_ultralight.constructors.new_element import (
     new_sub_element,
     update_element,
 )
-from svg_ultralight.import_svg import import_svg
 from svg_ultralight.inkscape import (
     write_pdf,
     write_pdf_from_svg,
@@ -31,7 +34,12 @@ from svg_ultralight.inkscape import (
 from svg_ultralight.main import new_svg_root, write_svg
 from svg_ultralight.metadata import new_metadata
 from svg_ultralight.nsmap import NSMAP, new_qname
-from svg_ultralight.query import pad_text
+from svg_ultralight.query import (
+    get_bounding_box,
+    get_bounding_boxes,
+    pad_text,
+    clear_svg_ultralight_cache,
+)
 from svg_ultralight.root_elements import new_svg_root_around_bounds
 from svg_ultralight.string_conversion import (
     format_attr_dict,
@@ -53,15 +61,20 @@ __all__ = [
     "NSMAP",
     "PaddedText",
     "SupportsBounds",
+    "bbox_dict",
+    "clear_svg_ultralight_cache",
+    "cut_bbox",
     "deepcopy_element",
     "format_attr_dict",
     "format_number",
     "format_numbers",
     "format_numbers_in_string",
-    "import_svg",
+    "get_bounding_box",
+    "get_bounding_boxes",
     "mat_apply",
     "mat_dot",
     "mat_invert",
+    "new_bbox_rect",
     "new_bbox_union",
     "new_bound_union",
     "new_element",
@@ -71,6 +84,7 @@ __all__ = [
     "new_sub_element",
     "new_svg_root",
     "new_svg_root_around_bounds",
+    "pad_bbox",
     "pad_text",
     "transform_element",
     "update_element",

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/animate.py

@@ -34,7 +34,7 @@ def write_gif(
     :param loop: how many times to loop gif. 0 -> forever
     :effects: write file to gif
     """
-    images = [Image.open(x) for x in pngs]  # type: ignore
-    images[0].save(  # type: ignore
+    images = [Image.open(x) for x in pngs]
+    images[0].save(
         gif, save_all=True, append_images=images[1:], duration=duration, loop=loop
     )

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/bounding_boxes/bound_helpers.py

@@ -95,3 +95,77 @@ def new_bound_union(*blems: SupportsBounds | EtreeElement) -> BoundElement:
     group = new_element_union(*blems)
     bbox = new_bbox_union(*blems)
     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,
+    *,
+    x: float | None = None,
+    y: float | None = None,
+    x2: float | None = None,
+    y2: float | None = None,
+) -> BoundingBox:
+    """Return a new bounding box with updated limits.
+
+    :param bbox: the original bounding box or bounded element.
+    :param x: the new x-coordinate.
+    :param y: the new y-coordinate.
+    :param x2: the new x2-coordinate.
+    :param y2: the new y2-coordinate.
+    :return: a new bounding box with the updated limits.
+    """
+    x = bbox.x if x is None else x
+    y = bbox.y if y is None else y
+    x2 = bbox.x2 if x2 is None else x2
+    y2 = bbox.y2 if y2 is None else y2
+    width = x2 - x
+    height = y2 - y
+    return BoundingBox(x, y, width, height)
+
+
+def pad_bbox(bbox: SupportsBounds, pad: float | tuple[float, ...]) -> BoundingBox:
+    """Return a new bounding box with padding.
+
+    :param bbox: the original bounding box or bounded element.
+    :param pad: the padding to apply.
+        If a single number, the same padding will be applied to all sides.
+        If a tuple, will be applied per css rules.
+        len = 1 : 0, 0, 0, 0
+        len = 2 : 0, 1, 0, 1
+        len = 3 : 0, 1, 2, 1
+        len = 4 : 0, 1, 2, 3
+    :return: a new bounding box with padding applied.
+    """
+    t, r, b, l = _expand_pad(pad)
+    return cut_bbox(bbox, x=bbox.x - l, y=bbox.y - t, x2=bbox.x2 + r, y2=bbox.y2 + b)
+
+
+def bbox_dict(bbox: SupportsBounds) -> dict[str, float]:
+    """Return a dictionary representation of a bounding box.
+
+    :param bbox: the bounding box or bound element from which to extract dimensions.
+    :return: a dictionary with keys x, y, width, and height.
+    """
+    return {"x": bbox.x, "y": bbox.y, "width": bbox.width, "height": bbox.height}
+
+
+def new_bbox_rect(bbox: BoundingBox, **kwargs: float | str) -> EtreeElement:
+    """Return a new rect element with the same dimensions as the bounding box.
+
+    :param bbox: the bounding box or bound element from which to extract dimensions.
+    :param kwargs: additional attributes for the rect element.
+    """
+    return new_element("rect", **bbox_dict(bbox), **kwargs)

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/layout.py

@@ -43,7 +43,10 @@ def expand_pad_arg(pad: PadArg) -> tuple[float, float, float, float]:
         return expand_pad_arg([pad])
     as_ms = [m if isinstance(m, Measurement) else Measurement(m) for m in pad]
     as_units = [m.value for m in as_ms]
-    as_units = [as_units[i % len(as_units)] for i in range(4)]
+    if len(as_units) == 3:
+        as_units = [*as_units, as_units[1]]
+    else:
+        as_units = [as_units[i % len(as_units)] for i in range(4)]
     return as_units[0], as_units[1], as_units[2], as_units[3]
 
 
@@ -99,7 +102,7 @@ def _infer_scale(
     * print_h == 0 / viewbox_h > 0
 
     The print area is invalid, but there is special handling for this. Interpret
-    viewbox units as print_w.native_unit and determine print area from viewbox area 1
+    viewbox units as print_w.native_unit and determe print area from viewbox area 1
     to 1.
 
         >>> _infer_scale(Measurement("in"), Measurement("in"), 1, 2)

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/metadata.py

@@ -65,8 +65,8 @@ def _wrap_bag(title: str) -> EtreeElement:
     """
     items = title.split(",")
     agent = new_element(new_qname("rdf", "Bag"))
-    for title in items:
-        _ = new_sub_element(agent, new_qname("rdf", "li"), text=title)
+    for title_item in items:
+        _ = new_sub_element(agent, new_qname("rdf", "li"), text=title_item)
     return agent
 
 

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/query.py

@@ -11,24 +11,36 @@ business card). Getting bounding boxes from Inkscape is not exceptionally fast.
 
 from __future__ import annotations
 
+import hashlib
 import os
+import pickle
 import re
 import uuid
+from contextlib import suppress
 from copy import deepcopy
+from pathlib import Path
 from subprocess import PIPE, Popen
-from tempfile import NamedTemporaryFile
+from tempfile import NamedTemporaryFile, TemporaryFile
 from typing import TYPE_CHECKING
+from warnings import warn
+
+from lxml import etree
 
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.main import new_svg_root, write_svg
 
 if TYPE_CHECKING:
-    from pathlib import Path
 
     from lxml.etree import _Element as EtreeElement  # type: ignore
 
 
+with TemporaryFile() as f:
+    _CACHE_DIR = Path(f.name).parent / "svg_ultralight_cache"
+
+_CACHE_DIR.mkdir(exist_ok=True)
+
+
 def _fill_ids(*elem_args: EtreeElement) -> None:
     """Set the id attribute of an element and all its children. Keep existing ids.
 
@@ -66,8 +78,8 @@ def _envelop_copies(*elem_args: EtreeElement) -> EtreeElement:
     :param elem_args: one or more etree elements
     :return: an etree element enveloping copies of elem_args with all views normalized
     """
-    envelope = new_svg_root(0, 0, 1, 1, id_=f"envelope_{uuid.uuid4()}")
-    envelope.extend(deepcopy(e) for e in elem_args)
+    envelope = new_svg_root(0, 0, 1, 1)
+    envelope.extend([deepcopy(e) for e in elem_args])
     _normalize_views(envelope)
     return envelope
 
@@ -106,6 +118,8 @@ def map_ids_to_bounding_boxes(
     a (0, 0, 1, 1) root. This will put the boxes where you'd expect them to be, no
     matter what root you use.
     """
+    if not elem_args:
+        return {}
     _fill_ids(*elem_args)
     envelope = _envelop_copies(*elem_args)
 
@@ -123,40 +137,82 @@ def map_ids_to_bounding_boxes(
     return id2bbox
 
 
-def get_bounding_box(
+def _hash_elem(elem: EtreeElement) -> str:
+    """Hash an EtreeElement.
+
+    Will match identical (excepting id) elements.
+    """
+    elem_copy = deepcopy(elem)
+    with suppress(KeyError):
+        _ = elem_copy.attrib.pop("id")
+    hash_object = hashlib.sha256(etree.tostring(elem_copy))
+    return hash_object.hexdigest()
+
+
+def _try_bbox_cache(elem_hash: str) -> BoundingBox | None:
+    """Try to load a cached bounding box."""
+    cache_path = _CACHE_DIR / elem_hash
+    if not cache_path.exists():
+        return None
+    try:
+        with cache_path.open("rb") as f:
+            return pickle.load(f)
+    except (EOFError, pickle.UnpicklingError) as e:
+        msg = f"Error loading cache file {cache_path}: {e}"
+        warn(msg)
+    except Exception as e:
+        msg = f"Unexpected error loading cache file {cache_path}: {e}"
+        warn(msg)
+    return None
+
+
+def get_bounding_boxes(
     inkscape: str | Path, *elem_args: EtreeElement
-) -> BoundingBox | tuple[BoundingBox, ...]:
+) -> tuple[BoundingBox, ...]:
     r"""Get bounding box around a single element (or multiple elements).
 
     :param inkscape: path to an inkscape executable on your local file system
         IMPORTANT: path cannot end with ``.exe``.
         Use something like ``"C:\\Program Files\\Inkscape\\inkscape"``
     :param elem_args: xml elements
-    :return: a BoundingBox instance around a single elem or a tuple of BoundingBox
-        instances if multiple elem_args are passed.
+    :return: a BoundingBox instance around a each elem_arg
 
     This will work most of the time, but if you're missing an nsmap, you'll need to
     create an entire xml file with a custom nsmap (using
     `svg_ultralight.new_svg_root`) then call `map_ids_to_bounding_boxes` directly.
     """
-    id2bbox = map_ids_to_bounding_boxes(inkscape, *elem_args)
-    bboxes = [id2bbox[x.get("id", "")] for x in elem_args]
-    if len(bboxes) == 1:
-        return bboxes[0]
-    return tuple(bboxes)
+    elem2hash = {elem: _hash_elem(elem) for elem in elem_args}
+    cached = [_try_bbox_cache(h) for h in elem2hash.values()]
+    if None not in cached:
+        return tuple(filter(None, cached))
 
+    hash2bbox = {h: c for h, c in zip(elem2hash.values(), cached) if c is not None}
+    remainder = [e for e, c in zip(elem_args, cached) if c is None]
+    id2bbox = map_ids_to_bounding_boxes(inkscape, *remainder)
+    for elem in remainder:
+        hash_ = elem2hash[elem]
+        hash2bbox[hash_] = id2bbox[elem.attrib["id"]]
+        with (_CACHE_DIR / hash_).open("wb") as f:
+            pickle.dump(hash2bbox[hash_], f)
+    return tuple(hash2bbox[h] for h in elem2hash.values())
 
-def _replace_text(text_elem: EtreeElement, new_text: str) -> None:
-    """Replace the text in a text element.
 
-    :param text_elem: an etree element with a text tag
-    :param new_text: the new text to insert
+def get_bounding_box(inkscape: str | Path, elem: EtreeElement) -> BoundingBox:
+    r"""Get bounding box around a single element.
 
-    If the text element has tspans, replace each tspan.text with new_text.
+    :param inkscape: path to an inkscape executable on your local file system
+        IMPORTANT: path cannot end with ``.exe``.
+        Use something like ``"C:\\Program Files\\Inkscape\\inkscape"``
+    :param elem: xml element
+    :return: a BoundingBox instance around a single elem
     """
-    text_elem.text = new_text
-    for sub_elem in text_elem:
-        sub_elem.text = new_text
+    return get_bounding_boxes(inkscape, elem)[0]
+
+
+def clear_svg_ultralight_cache() -> None:
+    """Clear all cached bounding boxes."""
+    for cache_file in _CACHE_DIR.glob("*"):
+        cache_file.unlink()
 
 
 def pad_text(
@@ -179,12 +235,10 @@ def pad_text(
     _ = rmargin_ref.attrib.pop("id", None)
     _ = capline_ref.attrib.pop("id", None)
     rmargin_ref.attrib["text-anchor"] = "end"
-    _replace_text(capline_ref, capline_reference_char)
-    id2bbox = map_ids_to_bounding_boxes(inkscape, text_elem, rmargin_ref, capline_ref)
+    capline_ref.text = capline_reference_char
 
-    bbox = id2bbox[text_elem.attrib["id"]]
-    rmargin_bbox = id2bbox[rmargin_ref.attrib["id"]]
-    capline_bbox = id2bbox[capline_ref.attrib["id"]]
+    bboxes = get_bounding_boxes(inkscape, text_elem, rmargin_ref, capline_ref)
+    bbox, rmargin_bbox, capline_bbox = bboxes
 
     tpad = bbox.y - capline_bbox.y
     rpad = -rmargin_bbox.x2

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight/transformations.py

@@ -63,6 +63,9 @@ def mat_invert(tmat: _Matrix) -> _Matrix:
     """Invert a 2D transformation matrix in svg format."""
     a, b, c, d, e, f = tmat
     det = a * d - b * c
+    if det == 0:
+        msg = "Matrix is not invertible"
+        raise ValueError(msg)
     return (
         d / det,
         -b / det,

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0/src/svg_ultralight.egg-info}/PKG-INFO

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

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/src/svg_ultralight.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ pyproject.toml
 tox.ini
 src/svg_ultralight/__init__.py
 src/svg_ultralight/animate.py
-src/svg_ultralight/import_svg.py
 src/svg_ultralight/inkscape.py
 src/svg_ultralight/layout.py
 src/svg_ultralight/main.py
@@ -36,7 +35,6 @@ src/svg_ultralight/strings/svg_strings.py
 tests/__init__.py
 tests/conftest.py
 tests/test_bounding.py
-tests/test_import_svg.py
 tests/test_inkscape.py
 tests/test_layout.py
 tests/test_matrices.py
@@ -45,5 +43,4 @@ tests/test_new_element.py
 tests/test_queries.py
 tests/test_root_elements.py
 tests/test_string_conversion.py
-tests/test_svg_ultralight.py
-tests/resources/arrow.svg
+tests/test_svg_ultralight.py

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/tests/test_bounding.py

@@ -10,9 +10,16 @@ from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
 from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 from svg_ultralight.bounding_boxes.type_bound_collection import BoundCollection
+from svg_ultralight.bounding_boxes.bound_helpers import (
+    pad_bbox,
+    cut_bbox,
+    bbox_dict,
+    new_bbox_rect,
+)
 import copy
 from svg_ultralight.constructors import new_element
 
+
 class TestBoundElement:
     @pytest.fixture
     def bound_element(self) -> BoundElement:
@@ -84,7 +91,6 @@ class TestBoundElement:
         assert bound_element.y2 == 250.0
 
 
-
 class TestPaddedText:
     @pytest.fixture
     def bound_element(self) -> PaddedText:
@@ -155,6 +161,7 @@ class TestPaddedText:
         assert math.isclose(bound_element.height, 252.76)
         assert bound_element.y2 == 203.0
 
+
 class TestBoundCollection:
 
     @pytest.fixture
@@ -178,3 +185,63 @@ class TestBoundCollection:
         blem_trans = blem.elem.attrib["transform"]
         elem_trans = elem.attrib["transform"]
         assert blem_trans == elem_trans
+
+
+class TestBoundHelpers:
+    def test_pad_bbox(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        padded = pad_bbox(bbox, 1)
+        assert padded.x == -1
+        assert padded.y == -1
+        assert padded.width == 6
+        assert padded.height == 6
+
+    def test_pad_bbox_t1(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        padded = pad_bbox(bbox, (1,))
+        assert padded.x == -1
+        assert padded.y == -1
+        assert padded.width == 6
+        assert padded.height == 6
+
+    def test_pad_bbox_t2(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        padded = pad_bbox(bbox, (1, 2))
+        assert padded.x == -2
+        assert padded.y == -1
+        assert padded.width == 8
+        assert padded.height == 6
+
+    def test_pad_bbox_t3(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        padded = pad_bbox(bbox, (1, 2, 3))
+        assert padded.x == -2
+        assert padded.y == -1
+        assert padded.width == 8
+        assert padded.height == 8
+
+    def test_pad_bbox_t4(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        padded = pad_bbox(bbox, (1, 2, 3, 4))
+        assert padded.x == -4
+        assert padded.y == -1
+        assert padded.width == 10
+        assert padded.height == 8
+
+    def test_cut_bbox(self):
+        bbox = BoundingBox(0, 0, 4, 4)
+        cut = cut_bbox(bbox, x=1)
+        assert cut.x == 1
+        assert cut.y == 0
+        assert cut.width == 3
+        assert cut.height == 4
+
+    def test_bbox_dict(self):
+        bbox = BoundingBox(0, 1, 2, 3)
+        assert bbox_dict(bbox) == {"x": 0, "y": 1, "width": 2, "height": 3}
+
+    def test_new_bbox_rect(self):
+        bbox = BoundingBox(0, 1, 2, 3)
+        elem = new_bbox_rect(bbox)
+        assert elem.attrib == {"x": "0", "y": "1", "width": "2", "height": "3"}
+

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/tests/test_layout.py

@@ -123,6 +123,27 @@ class TestMeasurement:
         assert (Measurement((1, unit)) / 4).value == Measurement((1 / 4, unit)).value
 
 
+class TestExpandPadArg:
+    def test_expand_val(self):
+        """Test that a single value is expanded to a 4-tuple."""
+        assert layout.expand_pad_arg(1) == (1, 1, 1, 1)
+
+    def test_expand_1tuple(self):
+        """Test that a single value is expanded to a 4-tuple."""
+        assert layout.expand_pad_arg(1) == (1, 1, 1, 1)
+
+    def test_expand_2tuple(self):
+        """Test that a single value is expanded to a 4-tuple."""
+        assert layout.expand_pad_arg((1, 2)) == (1, 2, 1, 2)
+
+    def test_expand_3tuple(self):
+        """Test that a single value is expanded to a 4-tuple per css rules."""
+        assert layout.expand_pad_arg((1, 2, 3)) == (1, 2, 3, 2)
+
+    def test_expand_4tuple(self):
+        """Test that a single value is expanded to a 4-tuple per css rules."""
+        assert layout.expand_pad_arg((1, 2, 3, 4)) == (1, 2, 3, 4)
+
 class TestLayout:
     def test_standard(self):
         """No print dimensions give expanded pad argument

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/tests/test_matrices.py

@@ -7,6 +7,7 @@
 from svg_ultralight.transformations import mat_dot, mat_apply, mat_invert
 import random
 import math
+from contextlib import suppress
 
 
 class TestMat:
@@ -29,6 +30,7 @@ class TestMat:
                 random.randint(-10, 10),
                 random.randint(-10, 10),
             )
-            result = mat_dot(tmat, mat_invert(tmat))
-            for x, y in zip(result, identity):
-                assert math.isclose(x, y, abs_tol=0.0001)
+            with suppress(ValueError):
+                result = mat_dot(tmat, mat_invert(tmat))
+                for x, y in zip(result, identity):
+                    assert math.isclose(x, y, abs_tol=0.0001)

{svg_ultralight-0.32.2 → svg_ultralight-0.34.0}/tests/test_queries.py

@@ -13,8 +13,8 @@ from pathlib import Path
 import pytest
 
 from svg_ultralight import BoundingBox, new_svg_root
-from svg_ultralight.constructors import new_element, new_sub_element
-from svg_ultralight.query import map_ids_to_bounding_boxes, pad_text
+from svg_ultralight.constructors import new_sub_element
+from svg_ultralight.query import map_ids_to_bounding_boxes, get_bounding_boxes, get_bounding_box
 
 INKSCAPE = Path(r"C:\Program Files\Inkscape\bin\inkscape")
 
@@ -171,6 +171,53 @@ class TestMapIdsToBoundingBoxes:
         assert rect2.get("id") in result
         assert rect3.get("id") in result
 
+    def test_get_bboxes_explicit(self) -> None:
+        """Returns a dict with an entry for each element plus an envelope entry."""
+        xml = new_svg_root(10, 20, 160, 19, id="svg1")
+        rect1 = new_sub_element(xml, "rect", x=0, y=0, width=16, height=9)
+        rect2 = new_sub_element(xml, "rect", x=0, y=0, width=8, height=32)
+        rect3 = new_sub_element(xml, "rect", x=0, y=0, width=12, height=18)
+        rect4 = new_sub_element(xml, "rect", x=0, y=0, width=12, height=18)
+
+        result = get_bounding_boxes(INKSCAPE, xml, rect1, rect2, rect3, rect4)
+        assert result[0] == BoundingBox(
+            _x=0.0,
+            _y=0.0,
+            _width=16.0,
+            _height=32.0,
+            _transformation=(1, 0, 0, 1, 0, 0),
+        )
+        assert result[1] == BoundingBox(
+            _x=0.0, _y=0.0, _width=16.0, _height=9.0, _transformation=(1, 0, 0, 1, 0, 0)
+        )
+        assert result[2] == BoundingBox(
+            _x=0.0, _y=0.0, _width=8.0, _height=32.0, _transformation=(1, 0, 0, 1, 0, 0)
+        )
+        assert result[3] == BoundingBox(
+            _x=0.0,
+            _y=0.0,
+            _width=12.0,
+            _height=18.0,
+            _transformation=(1, 0, 0, 1, 0, 0),
+        )
+        assert result[4] == BoundingBox(
+            _x=0.0,
+            _y=0.0,
+            _width=12.0,
+            _height=18.0,
+            _transformation=(1, 0, 0, 1, 0, 0),
+        )
+
+    def test_get_bbox_vs_boxes(self) -> None:
+        """Multiple calls to get_bounding_box are equivalent to a single call."""
+        xml = new_svg_root(10, 20, 160, 19, id="svg1")
+        rect1 = new_sub_element(xml, "rect", x=0, y=0, width=16, height=9)
+        rect2 = new_sub_element(xml, "rect", x=0, y=0, width=8, height=32)
+        rect3 = new_sub_element(xml, "rect", x=0, y=0, width=12, height=18)
+        rect4 = new_sub_element(xml, "rect", x=0, y=0, width=12, height=18)
+        elems = (xml, rect1, rect2, rect3, rect4)
+        result = get_bounding_boxes(INKSCAPE, *elems)
+        assert result == tuple(get_bounding_box(INKSCAPE, e) for e in elems)
 
 class TestAlterBoundingBox:
     def test_reverse_width(self) -> None:
@@ -181,15 +228,3 @@ class TestAlterBoundingBox:
         bbox.height = 200
         bbox.height = 40
         assert bbox.transformation == (1, 0, 0, 1, 90, 180)
-
-
-class TestPadText:
-    def test_tspans(self) -> None:
-        """Text in tspan are padded the same as text in text."""
-        no_tspan = new_element("text", font_size=100, text="typography")
-        in_tspan = new_element("text")
-        _ = new_sub_element(in_tspan, "tspan", font_size=100, text="typography")
-        padded_with = pad_text(INKSCAPE, no_tspan)
-        padded_without = pad_text(INKSCAPE, in_tspan)
-        assert padded_with.bbox == padded_without.bbox
-        assert padded_with.padded_bbox == padded_without.padded_bbox

svg_ultralight-0.32.2/src/svg_ultralight/import_svg.py

@@ -1,50 +0,0 @@
-"""Import an svg file as a BoundElement.
-
-:author: Shay Hill
-:created: 2024-05-28
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from lxml import etree
-
-from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
-from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
-from svg_ultralight.constructors import new_element
-
-if TYPE_CHECKING:
-    import os
-
-    from lxml.etree import _Element as EtreeElement  # type: ignore
-
-
-def _get_bounds_from_viewbox(root: EtreeElement) -> BoundingBox:
-    """Get the BoundingBox from the viewbox attribute of the root element.
-
-    :param root: The root element of the svg.
-    :return: The BoundingBox of the svg.
-    """
-    viewbox = root.attrib.get("viewBox")
-    if viewbox is None:
-        msg = "SVG file has no viewBox attribute. Failed to create BoundingBox."
-        raise ValueError(msg)
-    x, y, width, height = map(float, viewbox.split())
-    return BoundingBox(x, y, width, height)
-
-
-def import_svg(svg: str | os.PathLike[str]) -> BoundElement:
-    """Import an svg file as a BoundElement.
-
-    :param svg: The path to the svg file.
-    :return: The BoundElement representation of the svg.
-
-    The viewbox of the svg is used to create the BoundingBox of the BoundElement.
-    """
-    tree = etree.parse(svg)
-    root = tree.getroot()
-    bbox = _get_bounds_from_viewbox(root)
-    root_as_elem = new_element("g")
-    root_as_elem.extend(root)
-    return BoundElement(root_as_elem, bbox)

svg_ultralight-0.32.2/tests/resources/arrow.svg

@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="-3 -3 128 128">
-  <defs>
-    <clipPath id="clip">
-      <path d="M0,122L0,103.7L40.666667,73.2L81.333333,79.3L99.556877,49.231152L122,12.2L122,122Z"/>
-    </clipPath>
-    <mask id="mask">
-      <g>
-        <rect x="0" y="0" width="122" height="122" fill="#FFFFFF"/>
-        <path d="M0,91.45Q0,91.2 0.2,91.05L37.845867,62.8156Q38.013194,62.690105 38.220037,62.721131L75.903051,68.373583Q76.232274,68.422967 76.40482,68.138266L90.745748,44.475734Q91.004899,44.048135 90.5773,43.788984L78.917555,36.722472Q78.176932,36.273609 78.935969,35.856642L121.240962,12.616967Q122,12.2 121.981585,13.06583L120.955238,61.322866Q120.936823,62.188695 120.1962,61.739833L108.536455,54.67332Q108.108856,54.41417 107.849705,54.841768L86.606939,89.892332Q86.434393,90.177033 86.10517,90.12765L43.526984,83.740922Q43.32014,83.709895 43.152813,83.83539L0.8,115.6Q0,116.2 0,115.2Z" fill="#000000" stroke="#000000" stroke-width="3.1"/>
-      </g>
-    </mask>
-  </defs>
-  <g clip-path="url(#clip)" mask="url(#mask)">
-    <rect x="0" y="0" width="23.6" height="122" fill="orange"/>
-    <rect x="24.6" y="0" width="23.6" height="122" fill="orange"/>
-    <rect x="49.2" y="0" width="23.6" height="122" fill="orange"/>
-    <rect x="73.8" y="0" width="23.6" height="122" fill="orange"/>
-    <rect x="98.4" y="0" width="23.6" height="122" fill="orange"/>
-  </g>
-  <path d="M0,91.45Q0,91.2 0.2,91.05L37.845867,62.8156Q38.013194,62.690105 38.220037,62.721131L75.903051,68.373583Q76.232274,68.422967 76.40482,68.138266L90.745748,44.475734Q91.004899,44.048135 90.5773,43.788984L78.917555,36.722472Q78.176932,36.273609 78.935969,35.856642L121.240962,12.616967Q122,12.2 121.981585,13.06583L120.955238,61.322866Q120.936823,62.188695 120.1962,61.739833L108.536455,54.67332Q108.108856,54.41417 107.849705,54.841768L86.606939,89.892332Q86.434393,90.177033 86.10517,90.12765L43.526984,83.740922Q43.32014,83.709895 43.152813,83.83539L0.8,115.6Q0,116.2 0,115.2Z" fill="#00bfff" stroke="none"/>
-</svg>

svg_ultralight-0.32.2/tests/test_import_svg.py

@@ -1,32 +0,0 @@
-"""Test importing an SVG file.
-
-:author: Shay Hill
-:created: 2024-05-28
-"""
-
-from pathlib import Path
-from svg_ultralight.import_svg import import_svg
-from lxml import etree
-
-_TEST_RESOURCES = Path(__file__).parent / "resources"
-_TEST_FILE = _TEST_RESOURCES / "arrow.svg"
-
-
-
-class TestImportSvg:
-    def test_get_bbox(self):
-        """Import an svg file as a BoundElement instance."""
-        blem = import_svg(_TEST_FILE)
-        assert blem.bbox.x == -3
-        assert blem.bbox.y == -3
-        assert blem.bbox.width == 128
-        assert blem.bbox.height == 128
-
-    def test_get_geometry(self):
-        tree = etree.parse(_TEST_FILE)
-        root = tree.getroot()
-        blem = import_svg(_TEST_FILE)
-        assert [x.tag for x in blem.elem] == [x.tag for x in root]
-
-
-