svg-ultralight 0.24.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

svg_ultralight/__init__.py

@@ -26,7 +26,11 @@ 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.root_elements import new_svg_root_around_bounds
-from svg_ultralight.string_conversion import format_number, format_numbers
+from svg_ultralight.string_conversion import (
+    format_number,
+    format_numbers,
+    format_numbers_in_string,
+)
 
 __all__ = [
     "BoundElement",
@@ -37,6 +41,7 @@ __all__ = [
     "deepcopy_element",
     "format_number",
     "format_numbers",
+    "format_numbers_in_string",
     "new_element",
     "new_metadata",
     "new_qname",

svg_ultralight/bounding_boxes/type_bounding_box.py

@@ -6,7 +6,6 @@
 
 from __future__ import annotations
 
-import warnings
 from dataclasses import dataclass
 
 from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
@@ -286,12 +285,6 @@ class BoundingBox(SupportsBounds):
         :return: a bounding box around self and other bounding boxes
         :raises DeprecationWarning:
         """
-        warnings.warn(
-            "Method a.merge(b, c) is deprecated. "
-            + "Use classmethod BoundingBox.merged(a, b, c) instead.",
-            category=DeprecationWarning,
-            stacklevel=1,
-        )
         return BoundingBox.merged(self, *others)
 
     @classmethod

svg_ultralight/string_conversion.py

@@ -11,6 +11,7 @@ Rounding some numbers to ensure quality svg rendering:
 from __future__ import annotations
 
 import re
+from contextlib import suppress
 from enum import Enum
 from typing import TYPE_CHECKING, cast
 
@@ -71,15 +72,26 @@ def _is_float_or_float_str(data: float | str) -> bool:
         return True
 
 
-def _format_datastring(data: str) -> str:
+def format_numbers_in_string(data: float | str) -> str:
     """Find and format floats in a string.
 
-    :param data: string with floats
+    :param data: string with floats or a float value
     :return: string with floats formatted to limited precision
 
-    Will correctly handle input floats in exponential notation.
+    Works as a more robust version of format_number. Will correctly handle input
+    floats in exponential notation. This should work for any parameter value in an
+    svg except 'text', 'id' and for any other value except hex color codes. The
+    function will fail with input strings like 'ice3.14bucket', because 'e3.14' will
+    be identified as a float. SVG param values will not have such strings, but the
+    'text' attribute could. This function will not handle that case. Do not attempt
+    to reformat 'text' attribute values.
     """
-    words = re.split(r"([^\d.eE-]+)", data)
+    with suppress(ValueError):
+        # try as a regular number to strip spaces from simple float strings
+        return format_number(data)
+    if str(data).startswith("#"):
+        return str(data)
+    words = re.split(r"([^\d.eE-]+)", str(data))
     words = [format_number(w) if _is_float_or_float_str(w) else w for w in words]
     return "".join(words)
 
@@ -114,15 +126,10 @@ def _fix_key_and_format_val(key: str, val: str | float) -> tuple[str, str]:
     else:
         key_ = key.rstrip("_").replace("_", "-")
 
-    if key_ == "d":
-        if isinstance(val, str):
-            return key_, _format_datastring(val)
-        msg = f"Expected string for 'd' attribute, got {val} of type {type(val)}"
-        raise ValueError(msg)
+    if key_ in {"id", "text"}:
+        return key_, str(val)
 
-    if _is_float_or_float_str(val) and key_ != "text":
-        return key_, format_number(val)
-    return key_, str(val)
+    return key_, format_numbers_in_string(val)
 
 
 def format_attr_dict(**attributes: str | float) -> dict[str, str]:

{svg_ultralight-0.24.0.dist-info → svg_ultralight-0.26.0.dist-info}/METADATA

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

{svg_ultralight-0.24.0.dist-info → svg_ultralight-0.26.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-svg_ultralight/__init__.py,sha256=IH4vRDaqIAU9QlCm8w_C7VkUHmYvhoUf4TT6yLFKWQ0,1547
+svg_ultralight/__init__.py,sha256=5n-7C9idISTR56-AqZ834DpmYGgPUBdtFK7iIekiCqc,1627
 svg_ultralight/animate.py,sha256=JSrBm-59BcNXDF0cGgl4-C89eBunjevZnwZxIWt48TU,1112
 svg_ultralight/inkscape.py,sha256=M8yTxXOu4NlXnhsMycvEJiIDpnDeiZ_bZakJBM38ZoU,9152
 svg_ultralight/layout.py,sha256=TTETT_8WLBXnQxDGXdAeczCFN5pFo5kKY3Q6zv4FPX4,12238
@@ -8,18 +8,18 @@ svg_ultralight/nsmap.py,sha256=y63upO78Rr-JJT56RWWZuyrsILh6HPoY4GhbYnK1A0g,1244
 svg_ultralight/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 svg_ultralight/query.py,sha256=PFyhR9v60JkuksRb0LVkml67nmOxfZW9eCtL-JoH52Y,7270
 svg_ultralight/root_elements.py,sha256=rUc26ec-FLAUgO5iOF3aOeKZC7CjiTw7TGyGAj33yNU,3219
-svg_ultralight/string_conversion.py,sha256=UTeWM77NVxbrQVe9ByGVl2FWqG3Dx86X_yerOTMBBmM,6831
+svg_ultralight/string_conversion.py,sha256=WEmpf75RJmJ2lfJluagAz2wPsz6wM8XvTEwkq4U0vEc,7353
 svg_ultralight/unit_conversion.py,sha256=g07nhzXdjPvGcJmkhLdFbeDLrSmbI8uFoVgPo7G62Bg,9258
 svg_ultralight/bounding_boxes/__init__.py,sha256=qUEn3r4s-1QNHaguhWhhaNfdP4tl_B6YEqxtiTFuzhQ,78
 svg_ultralight/bounding_boxes/supports_bounds.py,sha256=1yqmZ7PH1bBH-LTIUDzSvKFXkPLXfJM7jJNz0bXurZ4,3926
 svg_ultralight/bounding_boxes/type_bound_element.py,sha256=VKiN4UnC2XlPKapWRHxgtqhO4BuVoe6YkLrirlEP09w,5714
-svg_ultralight/bounding_boxes/type_bounding_box.py,sha256=9qhbhVCjwBXTeo7f7nNKJH5LXliQBJb80r8mXtVuUgc,10622
+svg_ultralight/bounding_boxes/type_bounding_box.py,sha256=OqvS6LhfMwnoE4PUwAmHlY0tjY-2YQZQiLY6O2U3vfs,10378
 svg_ultralight/bounding_boxes/type_padded_text.py,sha256=FnwHD54qPMlyOB0yhRgZShQWA_riaaTS9GwD9HnbPm4,14119
 svg_ultralight/constructors/__init__.py,sha256=YcnO0iBQc19aL8Iemw0Y452MBMBIT2AN5nZCnoGxpn0,327
 svg_ultralight/constructors/new_element.py,sha256=VtMz9sPn9rMk6rui5Poysy3vezlOaS-tGIcGbu-SXmY,3406
 svg_ultralight/strings/__init__.py,sha256=Zalrf-ThFz7b7xKELx5lb2gOlBgV-6jk_k_EeSdVCVk,295
 svg_ultralight/strings/svg_strings.py,sha256=RYKMxOHq9abbZyGcFqsElBGLrBX-EjjNxln3s_ibi30,1296
-svg_ultralight-0.24.0.dist-info/METADATA,sha256=z9F2rpUxu_As_WthtvPK_8kXC9zoxUy0ipI5r8uo8ng,8871
-svg_ultralight-0.24.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-svg_ultralight-0.24.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
-svg_ultralight-0.24.0.dist-info/RECORD,,
+svg_ultralight-0.26.0.dist-info/METADATA,sha256=5SIJniz8QdUQVaARRpewHQv6lkmLnetygXSSnVCNmUg,8871
+svg_ultralight-0.26.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+svg_ultralight-0.26.0.dist-info/top_level.txt,sha256=se-6yqM_0Yg5orJKvKWdjQZ4iR4G_EjhL7oRgju-fdY,15
+svg_ultralight-0.26.0.dist-info/RECORD,,