Skip to content

AI turns documents or topics into real, native PowerPoint decks—with native shapes, transitions and animations, data-backed charts and tables on demand, audio narration from speaker notes, and support for your own .pptx templates. · by Hugo He

fix(svg-to-pptx): align secondary geometry consumers

hugohe3628feb80ad3b
diff --git a/skills/ppt-master/scripts/svg_to_pptx/native_objects/marker_common.py b/skills/ppt-master/scripts/svg_to_pptx/native_objects/marker_common.py
index 27d246fc..add4d5d6 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/native_objects/marker_common.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/native_objects/marker_common.py
@@ -18,6 +18,7 @@ from ..drawingml.utils import (
ctx_y,
font_px_to_hpt,
matrix_multiply,
+ parse_project_geometry_length,
parse_transform_matrix,
transform_point,
)
@@ -201,6 +202,26 @@ def _maybe_number(value: Any) -> float | None:
return number if math.isfinite(number) else None
+def _project_geometry_number(
+ elem: ET.Element,
+ attribute: str,
+ default: float = 0.0,
+) -> float:
+ """Read one fallback geometry value through the project length contract."""
+ raw = elem.get(attribute)
+ if raw is None:
+ return default
+ try:
+ return parse_project_geometry_length(raw, attribute)
+ except ValueError as exc:
+ tag = _local_tag(elem)
+ elem_id = elem.get("id")
+ label = f"<{tag} id={elem_id!r}>" if elem_id else f"<{tag}>"
+ raise RuntimeError(
+ f"Native PPTX fallback {label} {attribute}={raw!r}: {exc}"
+ ) from exc
+
+
def _powerpoint_emu_value(
emu: int,
field_name: str,
@@ -474,35 +495,41 @@ def _element_local_bbox(elem: ET.Element) -> tuple[float, float, float, float] |
return bbox
if tag in {"rect", "image", "use"}:
- x = _maybe_number(elem.get("x")) or 0.0
- y = _maybe_number(elem.get("y")) or 0.0
- width = _maybe_number(elem.get("width")) or 0.0
- height = _maybe_number(elem.get("height")) or 0.0
+ x = _project_geometry_number(elem, "x")
+ y = _project_geometry_number(elem, "y")
+ width = _project_geometry_number(elem, "width")
+ height = _project_geometry_number(elem, "height")
if width <= 0 or height <= 0:
return None
return x, y, x + width, y + height
if tag == "circle":
- cx = _maybe_number(elem.get("cx")) or 0.0
- cy = _maybe_number(elem.get("cy")) or 0.0
- r = _maybe_number(elem.get("r")) or 0.0
+ cx = _project_geometry_number(elem, "cx")
+ cy = _project_geometry_number(elem, "cy")
+ r = _project_geometry_number(elem, "r")
if r <= 0:
return None
return cx - r, cy - r, cx + r, cy + r
if tag == "ellipse":
- cx = _maybe_number(elem.get("cx")) or 0.0
- cy = _maybe_number(elem.get("cy")) or 0.0
- rx = _maybe_number(elem.get("rx")) or 0.0
- ry = _maybe_number(elem.get("ry")) or 0.0
+ cx = _project_geometry_number(elem, "cx")
+ cy = _project_geometry_number(elem, "cy")
+ rx = _project_geometry_number(elem, "rx")
+ ry = _project_geometry_number(elem, "ry")
if rx <= 0 or ry <= 0:
return None
return cx - rx, cy - ry, cx + rx, cy + ry
if tag == "line":
points = [
- (_maybe_number(elem.get("x1")) or 0.0, _maybe_number(elem.get("y1")) or 0.0),
- (_maybe_number(elem.get("x2")) or 0.0, _maybe_number(elem.get("y2")) or 0.0),
+ (
+ _project_geometry_number(elem, "x1"),
+ _project_geometry_number(elem, "y1"),
+ ),
+ (
+ _project_geometry_number(elem, "x2"),
+ _project_geometry_number(elem, "y2"),
+ ),
]
return _bbox_from_points(points)
@@ -515,8 +542,8 @@ def _element_local_bbox(elem: ET.Element) -> tuple[float, float, float, float] |
return _path_bbox(elem.get("d"))
if tag == "text":
- x = _maybe_number(elem.get("x")) or 0.0
- y = _maybe_number(elem.get("y")) or 0.0
+ x = _project_geometry_number(elem, "x")
+ y = _project_geometry_number(elem, "y")
font_size = _maybe_number(elem.get("font-size")) or 16.0
text = "".join(elem.itertext())
width = max(len(text), 1) * font_size * 0.55
diff --git a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/template_structure.py b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/template_structure.py
index cc7ed8bf..33bb4db5 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/template_structure.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/template_structure.py
@@ -26,6 +26,10 @@ from pathlib import Path
from typing import Any
from xml.etree import ElementTree as ET
+from ..drawingml.utils import (
+ parse_project_geometry_length,
+ project_geometry_length_errors,
+)
from ..geometry_properties import (
GeometryStyleError,
materialize_inline_geometry_properties,
@@ -404,14 +408,14 @@ def _is_full_canvas_solid_rect(
return False
try:
geometry = (
- float(elem.get("x", "0")),
- float(elem.get("y", "0")),
- float(elem.get("width", "0")),
- float(elem.get("height", "0")),
+ parse_project_geometry_length(elem.get("x", "0"), "x"),
+ parse_project_geometry_length(elem.get("y", "0"), "y"),
+ parse_project_geometry_length(elem.get("width", "0"), "width"),
+ parse_project_geometry_length(elem.get("height", "0"), "height"),
)
corner_radius = (
- float(elem.get("rx", "0")),
- float(elem.get("ry", "0")),
+ parse_project_geometry_length(elem.get("rx", "0"), "rx"),
+ parse_project_geometry_length(elem.get("ry", "0"), "ry"),
)
except ValueError:
return False
@@ -1192,6 +1196,18 @@ def parse_template_slide(
if _local_tag(root) != "svg":
raise TemplateStructureError(f"{svg_path.name}: root element must be <svg>")
+ geometry_errors = project_geometry_length_errors(root)
+ if geometry_errors:
+ preview = "; ".join(geometry_errors[:8])
+ suffix = (
+ "" if len(geometry_errors) <= 8
+ else f"; +{len(geometry_errors) - 8} more"
+ )
+ raise TemplateStructureError(
+ f"{svg_path.name}: invalid project geometry length(s): "
+ f"{preview}{suffix}"
+ )
+
master_key = (root.get("data-pptx-master") or "").strip()
master_name = (root.get("data-pptx-master-name") or "").strip()
if structured and not master_key: