predictygraph 0.2.2__tar.gz → 0.2.3__tar.gz

{predictygraph-0.2.2 → predictygraph-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: predictygraph
-Version: 0.2.2
+Version: 0.2.3
 Summary: Predictable graphs: a readable, CSS-styled diagram DSL with per-group layouts, rendered to SVG/APNG
 Author-Email: Reza Jelveh <git@jelveh.me>
 License: GPL-3.0-or-later

{predictygraph-0.2.2 → predictygraph-0.2.3}/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "0.2.2"
+version = "0.2.3"
 
 [project.license]
 text = "GPL-3.0-or-later"

{predictygraph-0.2.2 → predictygraph-0.2.3}/src/predictygraph/layout.py

@@ -555,6 +555,37 @@ def absolutize(g: Group, ox: float, oy: float) -> None:
             absolutize(c, c.ax, c.ay)
 
 
+def shift(item: Item, dx: float) -> None:
+    """Move an item sideways by dx after absolutize: its own x (relative to its parent)
+    and the absolute position of it and everything inside it."""
+    item.x += dx
+
+    def move(i: Item) -> None:
+        i.ax += dx
+        if isinstance(i, Group):
+            for c in i.children:
+                move(c)
+    move(item)
+
+
+def align_x(doc: Document) -> None:
+    """`align-x=ID`: centre an item horizontally on another item, e.g. line up a box with
+    the one it calls in the panel below. It only moves within its parent's content box and
+    never past a sibling, so nothing overlaps and no group is resized."""
+    for item in list(doc.walk()):
+        ref = doc.items.get(item.attrs.get("align-x", ""))
+        p = item.parent
+        if ref is None or ref is item or p is None:
+            continue
+        pr = box4(p.style.get("padding"), 14)[1]
+        sibs = [s for s in p.children if s is not item]
+        lo = max([s.ax + s.w + 8 for s in sibs if s.ax + s.w <= item.ax + 1e-6], default=p.ax + p.ox)
+        hi = min([s.ax - 8 for s in sibs if s.ax >= item.ax + item.w - 1e-6], default=p.ax + p.w - pr)
+        new = min(max(ref.cx - item.w / 2, lo), hi - item.w)
+        if abs(new - item.ax) > 0.01:
+            shift(item, new - item.ax)
+
+
 def layout(doc: Document) -> None:
     root = doc.root
     for e in doc.edges:  # layout may run again after the router widens gaps
@@ -562,6 +593,7 @@ def layout(doc: Document) -> None:
             e.waypoints, e.wp_owner = [], None
     layout_group(root, doc)
     absolutize(root, 0, 0)
+    align_x(doc)
     # translate virtual waypoints into absolute coords and attach to edges
     for g in [root] + [i for i in doc.walk() if isinstance(i, Group)]:
         lay = getattr(g, "layout_obj", None)

{predictygraph-0.2.2 → predictygraph-0.2.3}/src/predictygraph/scene.py

@@ -38,6 +38,43 @@ def point_along(poly: list[tuple[float, float]], frac: float) -> tuple[float, fl
     return poly[-1]
 
 
+def corner_radius(st: dict, shape: str, w: float, h: float) -> float:
+    """The corner radius a box shape is drawn with (shared by the box and its accent bar)."""
+    if shape == "pill":
+        return h / 2
+    r = px(st.get("border-radius"), 0)
+    return max(r, 10) if shape == "round" else r
+
+
+def accent_segs(x: float, y: float, w: float, h: float, bw: float, r: float, side: str) -> list:
+    """Path for a `bw`-wide strip down one side of an (x, y, w, h) box with corner radius r.
+    The outer edge follows the box's corner arcs and the inner edge is straight, so the
+    strip stays inside the rounded outline. Drawn for the left side, mirrored for right."""
+    bw, r = min(bw, w / 2), min(r, h / 2)
+    if r <= 0:
+        pts = [(0, 0), (bw, 0), (bw, h), (0, h)]
+        segs = [("M", *pts[0])] + [("L", *p) for p in pts[1:]]
+    elif bw < r:  # inner edge cuts the corner arc at height dy below the top
+        dy = r - math.sqrt(r * r - (r - bw) ** 2)
+        segs = [("M", 0, r), ("A", r, r, 0, 0, 1, bw, dy), ("L", bw, h - dy),
+                ("A", r, r, 0, 0, 1, 0, h - r)]
+    else:  # strip wider than the radius: full corner arc, then straight along top/bottom
+        segs = [("M", 0, r), ("A", r, r, 0, 0, 1, r, 0), ("L", bw, 0), ("L", bw, h), ("L", r, h),
+                ("A", r, r, 0, 0, 1, 0, h - r)]
+    segs.append(("Z",))
+    flip = side != "left"
+
+    def place(s):
+        if s[0] == "A":  # (A, rx, ry, rot, large, sweep, px, py): mirroring flips the sweep
+            _, rx, ry, rot, large, sweep, px_, py_ = s
+            return ("A", rx, ry, rot, large, 1 - sweep if flip else sweep,
+                    x + (w - px_ if flip else px_), y + py_)
+        if s[0] == "Z":
+            return s
+        return (s[0], x + (w - s[1] if flip else s[1]), y + s[2])
+    return [place(s) for s in segs]
+
+
 class SceneBuilder:
     def __init__(self, doc: Document, router: Router):
         self.doc, self.router = doc, router
@@ -177,11 +214,7 @@ class SceneBuilder:
             paint["opacity"] = st["opacity"]
         if st.get("shadow") == "soft":
             paint["filter"] = "shadow"
-        r = px(st.get("border-radius"), 0)
-        if shape == "round":
-            r = max(r, 10)
-        if shape == "pill":
-            r = h / 2
+        r = corner_radius(st, shape, w, h)
         if shape in ("box", "round", "pill", "note", "square"):
             el = Elem("rect", geom={"x": x, "y": y, "w": w, "h": h, "rx": r}, paint=paint)
         elif shape in ("circle", "ellipse"):
@@ -249,14 +282,14 @@ class SceneBuilder:
         return out
 
     def accent(self, it, st) -> list[Elem]:
-        """`accent-bar: 4px #22c55e` draws a strip inside the box edge (`accent-side`)."""
+        """`accent-bar: 4px #22c55e`: a strip along one side (`accent-side`), clipped to the
+        box's own rounded corners so it never pokes outside them."""
         a = accent(st)
         if not a:
             return []
         bw, color, side = a
-        x = it.ax if side == "left" else it.ax + it.w - bw
-        r = min(px(st.get("border-radius"), 6), bw)
-        return [Elem("rect", cls="pdg-accent", geom={"x": x, "y": it.ay, "w": bw, "h": it.h, "rx": r},
+        r = min(corner_radius(st, it.attrs.get("shape", "box"), it.w, it.h), it.h / 2)
+        return [Elem("path", cls="pdg-accent", geom={"segs": accent_segs(it.ax, it.ay, it.w, it.h, bw, r, side)},
                      paint={"fill": color or st.get("stroke", "#22c55e")})]
 
     def group(self, g: Group) -> Elem:
@@ -278,7 +311,7 @@ class SceneBuilder:
     def _title_band(self, g: Group, st: dict) -> Elem:
         """`title-fill`: a band behind the title, rounded like the group's top corners."""
         bh = box4(st.get("padding"), 14)[0] + g.label_h - 3
-        r = px(st.get("border-radius"), 8)
+        r = min(corner_radius(st, g.attrs.get("shape", "box"), g.w, g.h), bh)
         return Elem("path", cls="pdg-title-band", paint={"fill": st["title-fill"]}, geom={"segs": [
             ("M", g.ax, g.ay + bh), ("L", g.ax, g.ay + r), ("A", r, r, 0, 0, 1, g.ax + r, g.ay),
             ("L", g.ax + g.w - r, g.ay), ("A", r, r, 0, 0, 1, g.ax + g.w, g.ay + r),

predictygraph-0.2.3/tests/test_stack.py

@@ -0,0 +1,84 @@
+# SPDX-FileCopyrightText: 2026 The predictygraph Authors
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""align=stretch tiers, same-side C-shaped edges, theme css."""
+from predictygraph import build_scene
+from predictygraph.parser import parse
+from predictygraph.theme import theme_css
+
+
+def test_stretch_makes_tiers_equal_width():
+    doc = parse("graph layout=column align=stretch\ngroup a {\n x\n}\ngroup b {\n p\n q\n r\n}\n")
+    build_scene(doc)
+    assert doc.items["a"].w == doc.items["b"].w
+
+
+def test_same_side_edge_goes_around_boxes_between():
+    src = ("graph layout=column\nlong \"a fairly wide box\"\nmid \"an even wider box in the middle\"\n"
+           "low \"low\"\nlong -> low exit=left enter=left route=ortho\n")
+    doc = parse(src)
+    build_scene(doc)
+    from predictygraph.route import Router
+    pts, _ = Router(doc).geometry(doc.edges[0])
+    assert min(x for x, _ in pts) < doc.items["mid"].ax
+
+
+def test_hami_theme_has_extra_css():
+    css = theme_css("hami")
+    assert "accent-bar" in css and "title-fill" in css
+
+
+def test_png_width_colors_and_single_frame(tmp_path):
+    import pytest
+    pytest.importorskip("cairosvg")  # optional extra: predictygraph[apng]
+    pytest.importorskip("PIL")
+    from PIL import Image
+    from predictygraph.render.apng import write_apng
+    sc = build_scene(parse('a "x"\nb "y"\na -> b\n'))
+    out = write_apng(sc, tmp_path / "d.png", width=300, colors=16)
+    im = Image.open(out)
+    assert im.size[0] == 300 and getattr(im, "n_frames", 1) == 1 and im.mode == "P"
+
+
+def test_align_x_lines_up_across_panels():
+    src = ('graph layout=column align=stretch\n'
+           'group top layout=row gap=20 {\n a "left box"\n b "short"\n}\n'
+           'group bottom layout=row gap=200 {\n c "c"\n d "a much wider box here"\n}\n')
+    plain = parse(src)
+    build_scene(plain)
+    doc = parse(src.replace('b "short"', 'b "short" align-x=d'))
+    build_scene(doc)
+    assert abs(doc.items["b"].cx - doc.items["d"].cx) < 0.5
+    assert abs(plain.items["b"].cx - plain.items["d"].cx) > 1  # it really moved
+
+
+def test_align_x_stays_inside_its_panel():
+    src = ('graph layout=column\n'
+           'group top layout=row gap=20 {\n a "left box"\n b "short" align-x=d\n}\n'
+           'group bottom layout=row gap=400 {\n c "c"\n d "far right"\n}\n')
+    doc = parse(src)
+    build_scene(doc)
+    b, top = doc.items["b"], doc.items["top"]
+    assert b.ax + b.w <= top.ax + top.w
+
+
+def test_align_x_never_overlaps_a_sibling():
+    src = ('graph layout=column\n'
+           'group top layout=row gap=10 {\n a "aaaaaaaa" align-x=z\n b "bbbbbbbb"\n}\n'
+           'group bottom layout=row {\n y "y"\n z "z"\n}\n')
+    doc = parse(src)
+    build_scene(doc)
+    a, b = doc.items["a"], doc.items["b"]
+    assert a.ax + a.w <= b.ax
+
+
+def test_accent_bar_stays_inside_rounded_corners():
+    from predictygraph.scene import accent_segs
+    segs = accent_segs(0, 0, 100, 40, 4, 10, "left")
+    xs = [s[-2] for s in segs if s[0] != "Z"]
+    ys = [s[-1] for s in segs if s[0] != "Z"]
+    assert min(xs) >= 0 and max(xs) <= 4
+    assert min(ys) > 0 and max(ys) < 40  # starts below the top edge: it follows the arc
+    right = accent_segs(0, 0, 100, 40, 4, 10, "right")
+    assert min(s[-2] for s in right if s[0] != "Z") >= 96

predictygraph-0.2.2/tests/test_stack.py

@@ -1,41 +0,0 @@
-# SPDX-FileCopyrightText: 2026 The predictygraph Authors
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""align=stretch tiers, same-side C-shaped edges, theme css."""
-from predictygraph import build_scene
-from predictygraph.parser import parse
-from predictygraph.theme import theme_css
-
-
-def test_stretch_makes_tiers_equal_width():
-    doc = parse("graph layout=column align=stretch\ngroup a {\n x\n}\ngroup b {\n p\n q\n r\n}\n")
-    build_scene(doc)
-    assert doc.items["a"].w == doc.items["b"].w
-
-
-def test_same_side_edge_goes_around_boxes_between():
-    src = ("graph layout=column\nlong \"a fairly wide box\"\nmid \"an even wider box in the middle\"\n"
-           "low \"low\"\nlong -> low exit=left enter=left route=ortho\n")
-    doc = parse(src)
-    build_scene(doc)
-    from predictygraph.route import Router
-    pts, _ = Router(doc).geometry(doc.edges[0])
-    assert min(x for x, _ in pts) < doc.items["mid"].ax
-
-
-def test_hami_theme_has_extra_css():
-    css = theme_css("hami")
-    assert "accent-bar" in css and "title-fill" in css
-
-
-def test_png_width_colors_and_single_frame(tmp_path):
-    import pytest
-    pytest.importorskip("cairosvg")  # optional extra: predictygraph[apng]
-    pytest.importorskip("PIL")
-    from PIL import Image
-    from predictygraph.render.apng import write_apng
-    sc = build_scene(parse('a "x"\nb "y"\na -> b\n'))
-    out = write_apng(sc, tmp_path / "d.png", width=300, colors=16)
-    im = Image.open(out)
-    assert im.size[0] == 300 and getattr(im, "n_frames", 1) == 1 and im.mode == "P"