markdocx 5.0.0__tar.gz → 7.0.0__tar.gz

{markdocx-5.0.0 → markdocx-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdocx
-Version: 5.0.0
+Version: 7.0.0
 Summary: Convert AI-generated Markdown textbooks to polished DOCX with native math equations and syntax-highlighted code
 License-Expression: MIT
 License-File: LICENSE

{markdocx-5.0.0 → markdocx-7.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "markdocx"
-version = "5.0.0"
+version = "7.0.0"
 description = "Convert AI-generated Markdown textbooks to polished DOCX with native math equations and syntax-highlighted code"
 readme = "README.md"
 license = "MIT"

{markdocx-5.0.0 → markdocx-7.0.0}/src/markdocx/__init__.py

@@ -7,5 +7,5 @@ with native math equations and syntax-highlighted code.
 
 from markdocx.core import convert_file, convert_directory
 
-__version__ = "5.0.0"
+__version__ = "7.0.0"
 __all__ = ["convert_file", "convert_directory"]

{markdocx-5.0.0 → markdocx-7.0.0}/src/markdocx/diagram_renderer.py

@@ -766,31 +766,46 @@ def _render_workflow(code: str):
         fig_w = max(6, box_w + 3.0)
         fig_h = max(4, n * spacing_y + 2.0)
     else:
-        # Horizontal: wider boxes, bigger font, wrap early for readability
-        max_chars_per_line = 10
-        box_w = max(2.8, min(4.0, max_text_len * 0.18 + 1.2))
-        box_h = 1.2
-        fontsize_normal = 13
-        fontsize_decision = 12
-        spacing_x = box_w + 1.2  # center-to-center horizontal distance
-
-        fig_w = max(8, n * spacing_x + 2.5)
-        fig_h = max(4.0, 5.0)
+        # Horizontal with multi-row zigzag layout
+        # Determine how many steps per row (max 4 per row for readability)
+        cols_per_row = min(4, n)  # at most 4 boxes per row
+        if n > 4:
+            cols_per_row = (n + 1) // 2  # split roughly in half
+            cols_per_row = min(cols_per_row, 4)  # cap at 4
+
+        max_chars_per_line = 16
+        box_w = max(3.2, min(5.0, max_text_len * 0.18 + 1.5))
+        box_h = 1.4
+        fontsize_normal = 16
+        fontsize_decision = 15
+        spacing_x = box_w + 1.5   # horizontal gap between boxes
+        spacing_y = 3.0           # vertical gap between rows
+
+        num_rows = (n + cols_per_row - 1) // cols_per_row
+        fig_w = max(10, cols_per_row * spacing_x + 2.5)
+        fig_h = max(5, num_rows * spacing_y + 3.0)
 
     fig, ax = plt.subplots(figsize=(fig_w, fig_h))
-    # Do NOT use set_aspect("equal") — it distorts boxes
     ax.axis("off")
 
     # ── Calculate positions ─────────────────────────────────────
     positions = []
-    for i in range(n):
-        if is_vertical:
+    if is_vertical:
+        for i in range(n):
             x = fig_w / 2
             y = fig_h - 1.5 - i * spacing_y
-        else:
-            x = 1.5 + i * spacing_x
-            y = fig_h / 2
-        positions.append((x, y))
+            positions.append((x, y))
+    else:
+        # Zigzag: row 0 left→right, row 1 right→left, row 2 left→right, ...
+        for i in range(n):
+            row = i // cols_per_row
+            col = i % cols_per_row
+            # Reverse direction on odd rows
+            if row % 2 == 1:
+                col = cols_per_row - 1 - col
+            x = 1.5 + col * spacing_x
+            y = fig_h - 1.8 - row * spacing_y
+            positions.append((x, y))
 
     # Adjust axes limits
     all_x = [p[0] for p in positions]
@@ -881,12 +896,13 @@ def _render_workflow(code: str):
         cur_type = steps[i].get("type", "process")
         next_type = steps[i + 1].get("type", "process")
 
-        # Recompute effective heights for arrow endpoints
         cur_text = _wrap_text(steps[i].get("text", ""), max_chars_per_line)
         next_text = _wrap_text(steps[i + 1].get("text", ""), max_chars_per_line)
         cur_h = max(box_h, box_h + (cur_text.count("\n")) * 0.3)
         next_h = max(box_h, box_h + (next_text.count("\n")) * 0.3)
 
+        same_row = abs(y1 - y2) < 0.1  # same horizontal row
+
         if is_vertical:
             if cur_type == "decision":
                 start_y = y1 - cur_h * 0.9 - 0.08
@@ -900,18 +916,38 @@ def _render_workflow(code: str):
                         arrowprops=dict(arrowstyle="-|>", color="#555555",
                                         lw=2, mutation_scale=15),
                         zorder=2)
+        elif same_row:
+            # Horizontal arrow on same row
+            if x2 > x1:
+                # Left to right
+                start_x = x1 + box_w / 2 + 0.08
+                end_x = x2 - box_w / 2 - 0.08
+            else:
+                # Right to left
+                start_x = x1 - box_w / 2 - 0.08
+                end_x = x2 + box_w / 2 + 0.08
+            if cur_type == "decision":
+                start_x = x1 + (box_w * 0.55 + 0.08) * (1 if x2 > x1 else -1)
+            if next_type == "decision":
+                end_x = x2 - (box_w * 0.55 + 0.08) * (1 if x2 > x1 else -1)
+            ax.annotate("", xy=(end_x, y2), xytext=(start_x, y1),
+                        arrowprops=dict(arrowstyle="-|>", color="#555555",
+                                        lw=2, mutation_scale=15),
+                        zorder=2)
         else:
+            # Vertical arrow between rows (row transition)
             if cur_type == "decision":
-                start_x = x1 + box_w * 0.55 + 0.08
+                start_y = y1 - cur_h * 0.9 - 0.08
             else:
-                start_x = x1 + box_w / 2 + 0.08
+                start_y = y1 - cur_h / 2 - 0.08
             if next_type == "decision":
-                end_x = x2 - box_w * 0.55 - 0.08
+                end_y = y2 + next_h * 0.9 + 0.08
             else:
-                end_x = x2 - box_w / 2 - 0.08
-            ax.annotate("", xy=(end_x, y2), xytext=(start_x, y1),
+                end_y = y2 + next_h / 2 + 0.08
+            ax.annotate("", xy=(x2, end_y), xytext=(x1, start_y),
                         arrowprops=dict(arrowstyle="-|>", color="#555555",
-                                        lw=2, mutation_scale=15),
+                                        lw=2, mutation_scale=15,
+                                        connectionstyle="arc3,rad=0"),
                         zorder=2)
 
     if title: