svg-ultralight 0.39.0__tar.gz → 0.39.1__tar.gz

{svg_ultralight-0.39.0/src/svg_ultralight.egg-info → svg_ultralight-0.39.1}/PKG-INFO

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

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/pyproject.toml

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

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/bounding_boxes/supports_bounds.py

@@ -49,7 +49,7 @@ class SupportsBounds(Protocol):
         self,
         transformation: _Matrix | None = None,
         *,
-        scale: tuple[float, float] | None = None,
+        scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
     ):

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/bounding_boxes/type_bound_collection.py

@@ -44,7 +44,7 @@ class BoundCollection(HasBoundingBox):
         self,
         transformation: _Matrix | None = None,
         *,
-        scale: tuple[float, float] | None = None,
+        scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
     ):

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/bounding_boxes/type_bound_element.py

@@ -49,7 +49,7 @@ class BoundElement(HasBoundingBox):
         self,
         transformation: _Matrix | None = None,
         *,
-        scale: tuple[float, float] | None = None,
+        scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
     ):

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/bounding_boxes/type_bounding_box.py

@@ -59,21 +59,11 @@ class HasBoundingBox(SupportsBounds):
         )
         return c0, c1, c2, c3
 
-    def _scale_scale_by_uniform_scalar(self, scalar: float) -> None:
-        """Scale the bounding box uniformly by a factor.
-
-        :param scale: scale factor
-        Unlike self.scale, this does not set the scale, but scales the scale. So if
-        the current scale is (2, 6), and you call this with a scalar of 2, the new
-        scale will be (4, 12).
-        """
-        self.transform(scale=(scalar, scalar))
-
     def transform(
         self,
         transformation: _Matrix | None = None,
         *,
-        scale: tuple[float, float] | None = None,
+        scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
     ):
@@ -241,7 +231,7 @@ class HasBoundingBox(SupportsBounds):
         """
         current_x = self.x
         current_y = self.y
-        self._scale_scale_by_uniform_scalar(value / self.width)
+        self.transform(scale=value / self.width)
         self.x = current_x
         self.y = current_y
 

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/bounding_boxes/type_padded_text.py

@@ -122,7 +122,6 @@ class PaddedText(BoundElement):
             self.y,
             self.width,
             self.height,
-            self.unpadded_bbox.transformation,
         )
 
     @bbox.setter
@@ -139,7 +138,7 @@ class PaddedText(BoundElement):
         self,
         transformation: _Matrix | None = None,
         *,
-        scale: tuple[float, float] | None = None,
+        scale: tuple[float, float] | float | None = None,
         dx: float | None = None,
         dy: float | None = None,
     ):
@@ -208,7 +207,12 @@ class PaddedText(BoundElement):
         *and* y2) when scaling.
         """
         y2 = self.y2
-        self.unpadded_bbox.width = value - self.lpad - self.rpad
+
+        no_margins_old = self.unpadded_bbox.width
+        no_margins_new = value - self.lpad - self.rpad
+        scale = no_margins_new / no_margins_old
+        self.transform(scale=(scale, scale))
+
         self.y2 = y2
 
     @property
@@ -226,7 +230,10 @@ class PaddedText(BoundElement):
         :param height: The new height of this line of text.
         :effects: the text_element bounding box is scaled to height - tpad - bpad.
         """
-        self.width *= value / self.height
+        y2 = self.y2
+        scale = value / self.height
+        self.transform(scale=(scale, scale))
+        self.y2 = y2
 
     @property
     def x(self) -> float:
@@ -244,6 +251,22 @@ class PaddedText(BoundElement):
         """
         self.transform(dx=value + self.lpad - self.unpadded_bbox.x)
 
+    @property
+    def cx(self) -> float:
+        """The horizontal center of this line of text.
+
+        :return: The horizontal center of this line of text.
+        """
+        return self.x + self.width / 2
+
+    @cx.setter
+    def cx(self, value: float) -> None:
+        """Set the horizontal center of this line of text.
+
+        :param value: The horizontal center of this line of text.
+        """
+        self.x += value - self.cx
+
     @property
     def x2(self) -> float:
         """The right margin of this line of text.
@@ -276,6 +299,22 @@ class PaddedText(BoundElement):
         """
         self.transform(dy=value + self.tpad - self.unpadded_bbox.y)
 
+    @property
+    def cy(self) -> float:
+        """The horizontal center of this line of text.
+
+        :return: The horizontal center of this line of text.
+        """
+        return self.y + self.height / 2
+
+    @cy.setter
+    def cy(self, value: float) -> None:
+        """Set the horizontal center of this line of text.
+
+        :param value: The horizontal center of this line of text.
+        """
+        self.y += value - self.cy
+
     @property
     def y2(self) -> float:
         """The bottom of this line of text.

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/src/svg_ultralight/transformations.py

@@ -105,7 +105,7 @@ def get_transform_matrix(elem: EtreeElement) -> _Matrix:
 def new_transformation_matrix(
     transformation: _Matrix | None = None,
     *,
-    scale: tuple[float, float] | None = None,
+    scale: tuple[float, float] | float | None = None,
     dx: float | None = None,
     dy: float | None = None,
 ) -> _Matrix:
@@ -115,10 +115,17 @@ def new_transformation_matrix(
     svg-style transformation matrix.
     """
     transformation = transformation or (1, 0, 0, 1, 0, 0)
-    scale = scale or (1, 1)
+
+    if isinstance(scale, float):
+        scale_x, scale_y = (scale, scale)
+    elif scale is None:
+        scale_x, scale_y = (1, 1)
+    else:
+        scale_x, scale_y = cast("tuple[float, float]", scale)
+
     dx = dx or 0
     dy = dy or 0
-    return mat_dot((scale[0], 0, 0, scale[1], dx, dy), transformation)
+    return mat_dot((scale_x, 0, 0, scale_y, dx, dy), transformation)
 
 
 def transform_element(elem: EtreeElement, matrix: _Matrix) -> EtreeElement:

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1/src/svg_ultralight.egg-info}/PKG-INFO

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

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/tests/test_bounding.py

@@ -150,10 +150,11 @@ class TestPaddedText:
         assert bound_element.x2 == 146.0
 
     def test_height(self, bound_element: PaddedText):
+        y2 = bound_element.y2
         assert bound_element.height == 204.0
         bound_element.height = 250.0
-        assert math.isclose(bound_element.height, 252.76)
-        assert bound_element.y2 == 203.0
+        assert math.isclose(bound_element.height, 250)
+        assert math.isclose(bound_element.y2, y2)
 
     def test_aliases(self, bound_element: PaddedText):
         assert bound_element.lmargin == bound_element.x

{svg_ultralight-0.39.0 → svg_ultralight-0.39.1}/tests/test_queries.py

@@ -63,7 +63,7 @@ class TestBoundingBox:
         bbox = BoundingBox(100, 200, 300, 400)
         assert bbox.scale == (1.0, 1.0)
         bbox.scale = (3.0, 3.0)
-        bbox._scale_scale_by_uniform_scalar(10.0)
+        bbox.transform(scale=(10.0, 10.0))
         assert bbox.scale == (30.0, 30.0)
         assert bbox.x == 3000
         assert bbox.y == 6000