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(pptx-roundtrip): polish review findings on promotion and importer

hugohe3763b990e9aa6
diff --git a/skills/ppt-master/scripts/pptx_to_svg/chart_to_svg.py b/skills/ppt-master/scripts/pptx_to_svg/chart_to_svg.py
index d90cf19e..5f75add3 100644
--- a/skills/ppt-master/scripts/pptx_to_svg/chart_to_svg.py
+++ b/skills/ppt-master/scripts/pptx_to_svg/chart_to_svg.py
@@ -14,7 +14,10 @@ from typing import Any
from xml.etree import ElementTree as ET
from svg_to_pptx.drawingml.utils import parse_font_family
-from svg_to_pptx.native_objects.chart_data import _chart_data, _data_label_position
+from svg_to_pptx.native_objects.chart_data import (
+ validate_chart_payload,
+ validate_data_label_position,
+)
from .emu_units import NS, Xfrm, ooxml_bool
from .ooxml_loader import OoxmlPackage, PartRef
@@ -80,7 +83,7 @@ def extract_native_chart_payload(
try:
payload = _payload_from_chart_xml(chart_part.xml, xfrm)
- _chart_data(payload)
+ validate_chart_payload(payload)
except _UnsupportedChart as exc:
return ChartResult(native_status=exc.status)
except RuntimeError:
@@ -477,7 +480,7 @@ def _apply_chart_metadata(
if payload["type"] not in {"area", "bar", "column", "line"}:
raise _UnsupportedChart("unsupported-chart-data-labels")
try:
- _data_label_position(
+ validate_data_label_position(
data_labels.get("position"),
payload["type"],
payload.get("grouping"),
diff --git a/skills/ppt-master/scripts/pptx_to_svg/slide_to_svg.py b/skills/ppt-master/scripts/pptx_to_svg/slide_to_svg.py
index 6168d022..ac56ea67 100644
--- a/skills/ppt-master/scripts/pptx_to_svg/slide_to_svg.py
+++ b/skills/ppt-master/scripts/pptx_to_svg/slide_to_svg.py
@@ -603,15 +603,16 @@ def _convert_graphic_fallback(node: ShapeNode, ctx: AssemblyContext,
extra_attrs=native_attrs,
)
+ chart_native_attrs: list[str] = []
if uri in {CHART_URI, CHARTEX_URI}:
- rendered, native_attrs = _render_graphic_chart(node, ctx, graphic_data)
+ rendered, chart_native_attrs = _render_graphic_chart(node, ctx, graphic_data)
if rendered:
return _wrap_shape_group(
rendered,
node,
ctx,
top_level=top_level,
- extra_attrs=native_attrs,
+ extra_attrs=chart_native_attrs,
)
if uri == "http://schemas.openxmlformats.org/presentationml/2006/ole" and ctx.render_graphic_previews:
@@ -636,10 +637,9 @@ def _convert_graphic_fallback(node: ShapeNode, ctx: AssemblyContext,
f'text-anchor="middle" font-size="14" fill="#999999">'
f"[{_xml_escape(label)}]</text>"
)
- extra_attrs = []
- if uri in {CHART_URI, CHARTEX_URI}:
- _rendered, extra_attrs = _render_graphic_chart(node, ctx, graphic_data)
- return _wrap_shape_group(placeholder, node, ctx, top_level=top_level, extra_attrs=extra_attrs)
+ return _wrap_shape_group(
+ placeholder, node, ctx, top_level=top_level, extra_attrs=chart_native_attrs,
+ )
def _graphic_preview_label(node: ShapeNode, label: str) -> str:
diff --git a/skills/ppt-master/scripts/svg_to_pptx/native_objects/chart_data.py b/skills/ppt-master/scripts/svg_to_pptx/native_objects/chart_data.py
index 5451bc8e..71443167 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/native_objects/chart_data.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/native_objects/chart_data.py
@@ -991,3 +991,25 @@ def _chart_data(payload: dict[str, Any]) -> dict[str, Any]:
if chart_type in _XY_CHART_TYPES:
return _xy_chart_data(payload, chart_type, alias_style)
return _category_chart_data(payload, chart_type, alias_grouping, alias_style)
+
+
+def validate_chart_payload(payload: dict[str, Any]) -> None:
+ """Check a native chart payload against the export schema.
+
+ Public contract for the pptx_to_svg importer: raises RuntimeError on any
+ payload the native chart exporter cannot represent.
+ """
+ _chart_data(payload)
+
+
+def validate_data_label_position(
+ value: Any,
+ chart_type: str,
+ grouping: str | None,
+) -> None:
+ """Check a data-label position against the export schema.
+
+ Public contract for the pptx_to_svg importer: raises RuntimeError when the
+ position is not representable for the given plot.
+ """
+ _data_label_position(value, chart_type, grouping)
diff --git a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
index b09575c1..d7362b1a 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/pptx_package/builder.py
@@ -81,8 +81,9 @@ SLIDE_MASTER_REL_TYPE = (
PML_NS = "http://schemas.openxmlformats.org/presentationml/2006/main"
DML_NS = "http://schemas.openxmlformats.org/drawingml/2006/main"
REL_NS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+P14_NS = "http://schemas.microsoft.com/office/powerpoint/2010/main"
-for _prefix, _uri in (("p", PML_NS), ("a", DML_NS), ("r", REL_NS)):
+for _prefix, _uri in (("p", PML_NS), ("a", DML_NS), ("r", REL_NS), ("p14", P14_NS)):
try:
ET.register_namespace(_prefix, _uri)
except (ValueError, AttributeError):
@@ -219,8 +220,12 @@ def _remove_slide_background_xml(slide_xml: str) -> str:
return _SLIDE_BACKGROUND_RE.sub(r"\g<prefix>\g<suffix>", slide_xml, count=1)
-def _put_background_on_master(master_xml: str, background_xml: str) -> str:
- """Replace or insert the master-level p:bg before the master spTree."""
+def _put_background_on_master(master_xml: str, background_xml: str) -> str | None:
+ """Replace or insert the master-level p:bg before the master spTree.
+
+ Returns None when the master carries a p:bg the canonical pattern cannot
+ replace; inserting there would leave two p:bg children under p:cSld.
+ """
match = _SLIDE_BACKGROUND_RE.search(master_xml)
if match:
return (
@@ -228,6 +233,8 @@ def _put_background_on_master(master_xml: str, background_xml: str) -> str:
+ background_xml
+ master_xml[match.end("bg"):]
)
+ if "<p:bg" in master_xml:
+ return None
cslide_match = re.search(r"(<p:cSld\b[^>]*>)", master_xml)
if not cslide_match:
@@ -273,10 +280,10 @@ def _promote_common_slide_backgrounds_to_masters(
background_xml = next(iter(unique_backgrounds))
master_path = extract_dir / master_part
master_xml = master_path.read_text(encoding="utf-8")
- master_path.write_text(
- _put_background_on_master(master_xml, background_xml),
- encoding="utf-8",
- )
+ promoted_master_xml = _put_background_on_master(master_xml, background_xml)
+ if promoted_master_xml is None:
+ continue
+ master_path.write_text(promoted_master_xml, encoding="utf-8")
for slide_num in slide_nums:
slide_path = extract_dir / "ppt" / "slides" / f"slide{slide_num}.xml"