svg-ultralight 0.51.0__py3-none-any.whl → 0.52.1__py3-none-any.whl

svg_ultralight/bounding_boxes/supports_bounds.py

@@ -52,6 +52,7 @@ class SupportsBounds(Protocol):
         scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
+        reverse: bool = False,
     ) -> None:
         """Apply a transformation to the object."""
         ...

svg_ultralight/bounding_boxes/type_bound_collection.py

@@ -47,6 +47,7 @@ class BoundCollection(HasBoundingBox):
         scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
+        reverse: bool = False,
     ) -> None:
         """Transform each bound element in self.blems.
 
@@ -54,9 +55,11 @@ class BoundCollection(HasBoundingBox):
         :param scale: optional scale factor
         :param dx: optional x translation
         :param dy: optional y translation
+        :param reverse: Transform the element as if it were in a <g> element
+            transformed by tmat.
 
         Keep track of all compounding transformations in order to have a value for
-        self.scale (required for membersh and to provide access to cumulative
+        self.scale (required for members and to provide access to cumulative
         transforms should this be useful for any reason. This means all
         transformations must be applied to two bounding boxes: a persistant bbox to
         keep track of the scale property and a temporary bbox to isolate each
@@ -66,6 +69,6 @@ class BoundCollection(HasBoundingBox):
         self.bbox.transform(tmat)
         for blem in self.blems:
             if isinstance(blem, EtreeElement):
-                _ = transform_element(blem, tmat)
+                _ = transform_element(blem, tmat, reverse=reverse)
             else:
-                blem.transform(tmat)
+                blem.transform(tmat, reverse=reverse)

svg_ultralight/bounding_boxes/type_bound_element.py

@@ -52,6 +52,7 @@ class BoundElement(HasBoundingBox):
         scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
+        reverse: bool = False,
     ) -> None:
         """Transform the element and bounding box.
 
@@ -59,7 +60,9 @@ class BoundElement(HasBoundingBox):
         :param scale: a scaling factor
         :param dx: the x translation
         :param dy: the y translation
+        :param reverse: Transform the element as if it were in a <g> element
+            transformed by tmat.
         """
         tmat = new_transformation_matrix(transformation, scale=scale, dx=dx, dy=dy)
-        self.bbox.transform(tmat)
-        _ = transform_element(self.elem, tmat)
+        self.bbox.transform(tmat, reverse=reverse)
+        _ = transform_element(self.elem, tmat, reverse=reverse)

svg_ultralight/bounding_boxes/type_bounding_box.py

@@ -78,6 +78,7 @@ class HasBoundingBox(SupportsBounds):
         scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
+        reverse: bool = False,
     ) -> None:
         """Transform the bounding box by updating the transformation attribute.
 
@@ -85,6 +86,8 @@ class HasBoundingBox(SupportsBounds):
         :param scale: scale factor
         :param dx: x translation
         :param dy: y translation
+        :param reverse: Transform the element as if it were in a <g> element
+            transformed by tmat.
 
         All parameters are optional. Scale, dx, and dy are optional and applied after
         the transformation matrix if both are given. This shouldn't be necessary in
@@ -94,7 +97,10 @@ class HasBoundingBox(SupportsBounds):
         when applying a transformation from another bounding box instance.
         """
         tmat = new_transformation_matrix(transformation, scale=scale, dx=dx, dy=dy)
-        self.bbox.transformation = mat_dot(tmat, self.bbox.transformation)
+        if reverse:
+            self.bbox.transformation = mat_dot(self.bbox.transformation, tmat)
+        else:
+            self.bbox.transformation = mat_dot(tmat, self.bbox.transformation)
 
     @property
     def scale(self) -> tuple[float, float]:

svg_ultralight/bounding_boxes/type_padded_text.py

@@ -64,6 +64,7 @@ enough to lay out text on a business card.
 
 from __future__ import annotations
 
+import copy
 import math
 from typing import TYPE_CHECKING
 
@@ -112,13 +113,23 @@ class PaddedText(BoundElement):
         :param lpad: Left padding.
         """
         self.elem = elem
-        self.unpadded_bbox = bbox
+        self.unpadded_bbox = copy.copy(bbox)
         self.base_tpad = tpad
         self.rpad = rpad
         self.base_bpad = bpad
         self.lpad = lpad
         self._line_gap = line_gap
 
+    @property
+    def tbox(self) -> BoundingBox:
+        """Return the unpadded BoundingBox around the text element.
+
+        Tight bbox or True bbox. An alias for unpadded_bbox.
+
+        :return: The unpadded BoundingBox around the text element.
+        """
+        return self.unpadded_bbox
+
     @property
     def bbox(self) -> BoundingBox:
         """Return a BoundingBox around the margins and cap/baseline.
@@ -154,6 +165,7 @@ class PaddedText(BoundElement):
         scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
+        reverse: bool = False,
     ) -> None:
         """Transform the element and bounding box.
 
@@ -161,10 +173,12 @@ class PaddedText(BoundElement):
         :param scale: a scaling factor
         :param dx: the x translation
         :param dy: the y translation
+        :param reverse: Transform the element as if it were in a <g> element
+            transformed by tmat.
         """
         tmat = new_transformation_matrix(transformation, scale=scale, dx=dx, dy=dy)
-        self.unpadded_bbox.transform(tmat)
-        _ = transform_element(self.elem, tmat)
+        self.unpadded_bbox.transform(tmat, reverse=reverse)
+        _ = transform_element(self.elem, tmat, reverse=reverse)
 
     @property
     def line_gap(self) -> float:

svg_ultralight/font_tools/font_info.py

@@ -425,7 +425,13 @@ class FTFontInfo:
         coordinates (+y is down).
         """
         min_x, min_y, max_x, max_y = self.get_char_bounds(char)
-        return BoundingBox(min_x, -max_y, max_x - min_x, max_y - min_y)
+        return BoundingBox(
+            min_x,
+            min_y,
+            max_x - min_x,
+            max_y - min_y,
+            transformation=(1, 0, 0, -1, 0, 0),
+        )
 
     def get_text_bounds(self, text: str) -> tuple[int, int, int, int]:
         """Return bounds of a string as xmin, ymin, xmax, ymax.
@@ -484,7 +490,13 @@ class FTFontInfo:
         coordinates (+y is down).
         """
         min_x, min_y, max_x, max_y = self.get_text_bounds(text)
-        return BoundingBox(min_x, -max_y, max_x - min_x, max_y - min_y)
+        return BoundingBox(
+            min_x,
+            min_y,
+            max_x - min_x,
+            max_y - min_y,
+            transformation=(1, 0, 0, -1, 0, 0),
+        )
 
     def get_lsb(self, char: str) -> float:
         """Return the left side bearing of a character."""
@@ -567,7 +579,7 @@ class FTTextInfo:
         """
         bbox = self.font.get_text_bbox(self.text)
         bbox.transform(scale=self.scale)
-        return BoundingBox(*bbox.values())
+        return bbox
 
     @property
     def ascent(self) -> float:

svg_ultralight/transformations.py

@@ -129,12 +129,24 @@ def new_transformation_matrix(
     return mat_dot((float(scale_x), 0, 0, float(scale_y), dx, dy), transformation)
 
 
-def transform_element(elem: EtreeElement, matrix: _Matrix) -> EtreeElement:
+def transform_element(
+    elem: EtreeElement, matrix: _Matrix, *, reverse: bool = False
+) -> EtreeElement:
     """Apply a transformation matrix to an svg element.
 
     :param elem: svg element
-    :param matrix: transformation matrix
+    :par m matrix: transformation matrix
+
+    :param reverse: If you have a transformation matrix, A, and wish to apply an
+    additional transform, B, the result is B @ A. This is how an element can be
+    cumulatively transformed in svg.
+
+    If the element is transformed by A and is a part of a GROUP transformed by B,
+    then the result is the reverse: A @ B.
     """
     current = get_transform_matrix(elem)
-    elem.attrib["transform"] = svg_matrix(mat_dot(matrix, current))
+    if reverse:
+        elem.attrib["transform"] = svg_matrix(mat_dot(current, matrix))
+    else:
+        elem.attrib["transform"] = svg_matrix(mat_dot(matrix, current))
     return elem

{svg_ultralight-0.51.0.dist-info → svg_ultralight-0.52.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.51.0
+Version: 0.52.1
 Summary: a sensible way to create svg files with Python
 Author: Shay Hill
 Author-email: Shay Hill <shay_public@hotmail.com>

{svg_ultralight-0.51.0.dist-info → svg_ultralight-0.52.1.dist-info}/RECORD

@@ -4,16 +4,16 @@ svg_ultralight/attrib_hints.py,sha256=_p85b77mcmj15IUnsDtgbYJ3FFd-Q1qM2OERv2UEZ2
 svg_ultralight/bounding_boxes/__init__.py,sha256=YNCwgN-Ja2MFoCxIYxC3KZTCx_gFvPfRQ-8zBR5Q9mk,73
 svg_ultralight/bounding_boxes/bound_helpers.py,sha256=o_NlH3bBU6lvn8KPTvp7hrEDb5OLqwO3t-gc51d44Rk,6583
 svg_ultralight/bounding_boxes/padded_text_initializers.py,sha256=7LD7VzmDSaNA2S9QTW0sNzMwLpjjReWGV0e5f4uglk8,10002
-svg_ultralight/bounding_boxes/supports_bounds.py,sha256=zoJr7goYEbiVsr5Vl2RlqCsbyBe5RHZGrU0B5WMBRbY,4427
-svg_ultralight/bounding_boxes/type_bound_collection.py,sha256=vzZPJoUg4Joaj7nTl4VpDFFHihIoBfBNvu6IaIprYKM,2582
-svg_ultralight/bounding_boxes/type_bound_element.py,sha256=CdbL48NMauCX5qZGlJes3aYFZHyVE3rby99HN-Kr7GI,2147
-svg_ultralight/bounding_boxes/type_bounding_box.py,sha256=81tyPpCHxRH1CXELO_qSCtueCyHYWBeEJO_JIxpl88Q,13101
-svg_ultralight/bounding_boxes/type_padded_text.py,sha256=1IV0DGjxem8celN4GAT8l60fLYhJwsES3O4tkHG7v60,14248
+svg_ultralight/bounding_boxes/supports_bounds.py,sha256=8rIklGICIx-DXELN7FjDwrzOi8iUrlstGrCIuN9ew3o,4458
+svg_ultralight/bounding_boxes/type_bound_collection.py,sha256=ct8BLjqyHSCNhOGG0eYuubdOajI2KVo1nbTP3JxXZ00,2756
+svg_ultralight/bounding_boxes/type_bound_element.py,sha256=gXsHCSJ6lxIGODm1oJ5yYAPzuIi7NkBIIzD_GX-cgo8,2322
+svg_ultralight/bounding_boxes/type_bounding_box.py,sha256=r3XcdW_U8VvRauylw54aMwPsmC6A3HY72rz_sTcd1Uo,13359
+svg_ultralight/bounding_boxes/type_padded_text.py,sha256=LXVsdCU7j_TzVEx652WKQLICFeYn_Zqjw6KCP6p1nzo,14740
 svg_ultralight/constructors/__init__.py,sha256=fb-A50G3YTZNMQXpxcCl_QAcfssS0Us065_kdJRybDQ,313
 svg_ultralight/constructors/new_element.py,sha256=hVQG7WBHQoTUmGiZNtVadGOitdTFBrHOQeVKKVOWGaA,3526
 svg_ultralight/font_tools/__init__.py,sha256=b_VSvk5aODzS2wv48EMU2sey_mxq1o1SL8ecWTdy4kc,78
 svg_ultralight/font_tools/comp_results.py,sha256=KR6RtVGWjGGfHX2d_-XRx_Jr9CQ36kPbQxLVK1yzgTI,10421
-svg_ultralight/font_tools/font_info.py,sha256=9nSj8qjzbT3bEe2Qgr-Rtfzb6RyFFCiXHbvv4Oyfxw0,29332
+svg_ultralight/font_tools/font_info.py,sha256=RkxhxMdhuIDNDn8OUfEOTRPf9Y2PoYdxoBRFp70KQes,29521
 svg_ultralight/image_ops.py,sha256=cwR038ECUuiceIrk-9Peh5Ijp4tzjuaV5Y1cvYOt4TI,5454
 svg_ultralight/inkscape.py,sha256=_aQ42ZQ1JP9TFdHmtxgCRsXvxfZPpdZWTGKEea9BgIU,9336
 svg_ultralight/layout.py,sha256=yiTAYtSsYywdCObIdjkK3A4fiEYLNPqD3BOQKxfj6gQ,12514
@@ -27,8 +27,8 @@ svg_ultralight/root_elements.py,sha256=N4BBO1j2iUDIGbk70FRrtfElZo0AG-3Olqugxz7LD
 svg_ultralight/string_conversion.py,sha256=pzqkbGb-wXdhGd8ojEx4Hy-HBCC8fOfcloaLrNMh8TM,8607
 svg_ultralight/strings/__init__.py,sha256=iaRwr9AF9bPDkG3XvgGRSf8JPAS2GQ8ds9yCNpPN4ng,365
 svg_ultralight/strings/svg_strings.py,sha256=XlXQ5RqueGrROXBI4VzR2cK7e1NdNhYx5S84bgyqFUQ,3132
-svg_ultralight/transformations.py,sha256=fnPMdMQFgT6OEUIDwb_A7tvuILraPFW1jR9I1RaI1cA,4325
+svg_ultralight/transformations.py,sha256=YyhehH0Hlui2U9t7hjwgHgRyHzUR7UCMSSo-G85J-bo,4784
 svg_ultralight/unit_conversion.py,sha256=Y32GZ5TLkvjDHM2kBw52M8ZxDNlpVSlDkSdRa1S_X-A,8985
-svg_ultralight-0.51.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-svg_ultralight-0.51.0.dist-info/METADATA,sha256=qvOlGkyOA8KxGifWkMETlzsu--3Nf8qFCyqhet7VoyM,8691
-svg_ultralight-0.51.0.dist-info/RECORD,,
+svg_ultralight-0.52.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+svg_ultralight-0.52.1.dist-info/METADATA,sha256=HZfZfYDByPXr1IUnuTRSThw4fZdYPQJYrFKrrZvybvg,8691
+svg_ultralight-0.52.1.dist-info/RECORD,,