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

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

@@ -6,7 +6,7 @@ exclude: "tests"
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.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.8.0
+  rev: v1.10.0
   hooks:
   - id: mypy
     name: mypy
@@ -64,21 +64,21 @@ repos:
     args: ["--profile", "black", "--filter-files", "--combine-as"]
 
 - repo: https://github.com/psf/black
-  rev: 24.1.1
+  rev: 24.4.2
   hooks:
   - id: black
     language_version: python3.9
     args: ["--skip-magic-trailing-comma"]
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.0
+  rev: v3.15.2
   hooks:
   - args:
     - --py39-plus
     id: pyupgrade
 
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.5.4
+  rev: v1.5.5
   hooks:
   - id: remove-tabs
 
@@ -134,7 +134,7 @@ 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.1.15'
+  rev: 'v0.4.6'
   hooks:
     - id: ruff
       exclude: "tests"
@@ -146,6 +146,6 @@ repos:
 
 # reads pyproject.toml for additional config
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.349
+  rev: v1.1.365
   hooks:
     - id: pyright

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "svg-ultralight"
-version = "0.32.0"
+version = "0.32.2"
 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.0"
+version = "0.32.2"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

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

@@ -20,6 +20,7 @@ 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,
@@ -57,6 +58,7 @@ __all__ = [
     "format_number",
     "format_numbers",
     "format_numbers_in_string",
+    "import_svg",
     "mat_apply",
     "mat_dot",
     "mat_invert",

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

@@ -146,6 +146,19 @@ def get_bounding_box(
     return tuple(bboxes)
 
 
+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
+
+    If the text element has tspans, replace each tspan.text with new_text.
+    """
+    text_elem.text = new_text
+    for sub_elem in text_elem:
+        sub_elem.text = new_text
+
+
 def pad_text(
     inkscape: str | Path, text_elem: EtreeElement, capline_reference_char: str = "M"
 ) -> PaddedText:
@@ -166,7 +179,7 @@ def pad_text(
     _ = rmargin_ref.attrib.pop("id", None)
     _ = capline_ref.attrib.pop("id", None)
     rmargin_ref.attrib["text-anchor"] = "end"
-    capline_ref.text = capline_reference_char
+    _replace_text(capline_ref, capline_reference_char)
     id2bbox = map_ids_to_bounding_boxes(inkscape, text_elem, rmargin_ref, capline_ref)
 
     bbox = id2bbox[text_elem.attrib["id"]]

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

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

{svg_ultralight-0.32.0 → svg_ultralight-0.32.2}/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_sub_element
-from svg_ultralight.query import map_ids_to_bounding_boxes
+from svg_ultralight.constructors import new_element, new_sub_element
+from svg_ultralight.query import map_ids_to_bounding_boxes, pad_text
 
 INKSCAPE = Path(r"C:\Program Files\Inkscape\bin\inkscape")
 
@@ -181,3 +181,15 @@ 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