update

chalk/backend/svg.py

@@ -51,24 +51,25 @@ def write_style(d: Dict[str, Any]) -> str:
     return out
 
 
-def render_svg_patches(patches: List[Patch], dwg: str) -> None:
+def render_svg_patches(patches: List[Patch]) -> str:
+    out = ""
     for ind, patch, style_new in chalk.backend.patch.order_patches(patches):
         inner = to_svg(patch, ind)
 
-        dwg += f"""
+        out += f"""
 <g style="{write_style(style_new)}">
     {inner}
 </g>
     """
+    return out
 
 def patches_to_file(
     patches: List[Patch], path: str, height: tx.IntLike, width: tx.IntLike
 ) -> None:
-    dwg = f"""
-    <?xml version="1.0" encoding="utf-8" ?>
-    <svg baseProfile="full" height="{int(height)}" version="1.1" width="{int(width)}" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    dwg = f"""<?xml version="1.0" encoding="utf-8" ?>
+<svg baseProfile="full" height="{int(height)}" version="1.1" width="{int(width)}" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
     """
-    render_svg_patches(patches, dwg)
+    dwg += render_svg_patches(patches)
     dwg += "</svg>"
     with open(path, "w") as f:
         f.write(dwg)

chalk/transform.py

@@ -30,6 +30,7 @@
     tree_map,
     vectorize,
     vmap,
+    onp
 )
 from jaxtyping import Float
 from typing_extensions import Self
@@ -549,4 +550,5 @@ def arc_to_bezier(theta1: Array, theta2: Array, n: int = 5) -> Array:
     "prefix_broadcast",
     "BoolLike",
     "JAX_MODE",
+    "onp"
 ]

examples/bigben.py

@@ -273,7 +273,7 @@ def fit_in(b: Diagram, s: Diagram, frame=0.1) -> Diagram:
     # Find the inner radius
     trace = b.get_trace()
     p, m = trace(tx.origin, unit_x)
-    m = min([x for x, m1 in zip(p[0], m[0]) if m1 and x > 0])
+    m = min([x for x, m1 in zip(p, m) if m1 and x > 0])
 
     # Scale the inner diagram to that size
     return b + s.scale_uniform_to_x(2 * m - frame)

requirements.txt

@@ -3,5 +3,6 @@ imageio
 jaxtyping
 numpy
 jax
+chex
 typing-extensions
 importlib-metadata