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

feat(svg-authoring): add compact native preset groups

hugohe31813509afb09
diff --git a/skills/ppt-master/scripts/pptx_to_svg/preset_authoring.py b/skills/ppt-master/scripts/pptx_to_svg/preset_authoring.py
index e47a8953..b3c19d72 100644
--- a/skills/ppt-master/scripts/pptx_to_svg/preset_authoring.py
+++ b/skills/ppt-master/scripts/pptx_to_svg/preset_authoring.py
@@ -2,14 +2,19 @@
"""
PPT Master - Authored Preset Shape Contract
-Build and validate canonical SVG fragments for newly authored PowerPoint
-preset shapes.
+Build and validate compact canonical SVG groups for newly authored PowerPoint
+preset shapes while retaining expanded authored input compatibility.
Usage:
Import render_preset_shape_fragment or validate_authored_preset_group.
Examples:
- fragment = render_preset_shape_fragment("rightArrow", (80, 120, 240, 96))
+ fragment = render_preset_shape_fragment(
+ "rightArrow",
+ (80, 120, 240, 96),
+ element_id="next-step",
+ style={"fill": "#2563EB", "stroke": "none"},
+ )
Dependencies:
None (only uses standard library and local PPT Master modules)
@@ -36,11 +41,16 @@ from pptx_shapes import (
from .emu_units import EMU_PER_PX, Xfrm, fmt_num
from .preset_registry_to_svg import render_preset_geometry
-from .preset_svg_markup import attrs_to_xml, serialize_preset_layers
+from .preset_svg_markup import (
+ attrs_to_xml,
+ serialize_compact_preset_layers,
+ serialize_preset_layers,
+)
AUTHORING_ATTR = "data-pptx-authoring"
AUTHORING_VALUE = "preset"
+_SVG_NAMESPACE = "http://www.w3.org/2000/svg"
_ID_RE = re.compile(r"[A-Za-z_][A-Za-z0-9_.:-]*")
_PAINT_RE = re.compile(r"(?:none|#[0-9A-Fa-f]{6})")
_INTEGER_RE = re.compile(r"[+-]?\d+")
@@ -60,6 +70,12 @@ _SEMANTIC_ATTRS = (
"data-pptx-prst",
"data-pptx-frame",
)
+_TEMPLATE_ATOM_ATTRS = (
+ "data-pptx-layer",
+ "data-pptx-editable",
+ "data-pptx-placeholder-carrier",
+ "data-pptx-role",
+)
def render_preset_shape_fragment(
@@ -72,7 +88,7 @@ def render_preset_shape_fragment(
name: str | None = None,
style: Mapping[str, str] | None = None,
) -> str:
- """Render one complete authored preset fragment for manual SVG insertion."""
+ """Render one compact authored preset fragment for SVG insertion."""
registry = get_preset_registry()
if preset not in registry:
raise ValueError(f"Unknown DrawingML preset shape: {preset!r}")
@@ -120,35 +136,215 @@ def render_preset_shape_fragment(
for guide_name, formula in adjustment_values.items():
semantic_attrs[f"{_ADJUSTMENT_PREFIX}{guide_name}"] = str(formula)
- style_attrs = _validate_style(style or {})
+ raw_style = dict(style or {})
+ if "fill" not in raw_style or "stroke" not in raw_style:
+ raise ValueError(
+ "Compact authored preset requires explicit local fill and stroke"
+ )
+ style_attrs = _validate_style(raw_style)
+ if (
+ style_attrs.get("stroke", "none") != "none"
+ and "stroke-width" not in style_attrs
+ ):
+ style_attrs["stroke-width"] = "1"
if object_kind == "connector":
if style_attrs.get("fill", "none") != "none":
raise ValueError("Authored connector fill must be none")
if not _has_visible_stroke(style_attrs):
raise ValueError("Authored connector requires a visible stroke")
- markup = serialize_preset_layers(
- rendered.paths,
- semantic_attrs,
- style_attrs,
- )
group_attrs = {
"id": element_id,
**semantic_attrs,
- "data-pptx-preview-sha256": markup.preview_hash,
+ **style_attrs,
}
return (
f'<g{attrs_to_xml(group_attrs)}>\n'
- f"{markup.markup}\n"
+ f"{serialize_compact_preset_layers(rendered.paths, style_attrs)}\n"
"</g>"
)
+def authored_preset_encoding(group: ET.Element) -> str | None:
+ """Return ``compact`` / ``expanded`` for an authored preset group."""
+ if (
+ _local_name(group.tag) != "g"
+ or group.get(AUTHORING_ATTR) != AUTHORING_VALUE
+ ):
+ return None
+ parts = {
+ child.get("data-pptx-part")
+ for child in group
+ if child.get("data-pptx-part") is not None
+ }
+ if parts:
+ return "expanded"
+ return "compact"
+
+
def validate_authored_preset_group(group: ET.Element) -> list[str]:
- """Return canonical authored-preset contract errors for one logical group."""
+ """Return authored-preset contract errors for one logical group."""
+ encoding = authored_preset_encoding(group)
+ if encoding is None:
+ return []
+ if encoding == "compact":
+ return _validate_compact_authored_preset_group(group)
+ return _validate_expanded_authored_preset_group(group)
+
+
+def _validate_compact_authored_preset_group(group: ET.Element) -> list[str]:
+ """Validate the project-canonical compact authored-preset form."""
+ errors: list[str] = []
+ if not _is_svg_element(group, "g"):
+ return [f'{AUTHORING_ATTR}="{AUTHORING_VALUE}" requires an SVG <g>']
+ element_id = group.get("id")
+ if element_id is None:
+ errors.append("Authored preset logical group requires a stable id")
+ elif _ID_RE.fullmatch(element_id) is None:
+ errors.append(f"Authored preset logical group has invalid id {element_id!r}")
+
+ unexpected_group_attrs = sorted(
+ name for name in group.attrib
+ if _is_unexpected_group_attr(name, compact=True)
+ )
+ if unexpected_group_attrs:
+ errors.append(
+ "Authored preset logical group has unsupported attributes: "
+ + ", ".join(unexpected_group_attrs)
+ )
+ if group.get("data-pptx-preview-sha256") is not None:
+ errors.append(
+ "Compact authored preset derives preview integrity from the registry; "
+ "remove data-pptx-preview-sha256"
+ )
+ if (group.text or "").strip():
+ errors.append("Compact authored preset cannot contain text content")
+
+ direct_children = list(group)
+ if not direct_children:
+ errors.append("Compact authored preset requires visible direct path layers")
+ return errors
+ if any(child.get("data-pptx-part") is not None for child in direct_children):
+ errors.append(
+ "Compact authored preset cannot mix transport carrier/preview markers"
+ )
+ return errors
+ if any(
+ not _is_svg_element(child, "path")
+ for child in direct_children
+ ):
+ errors.append(
+ "Compact authored preset is atomic and may contain only direct SVG paths"
+ )
+ return errors
+ if any(list(child) for child in direct_children):
+ errors.append("Compact authored preset paths cannot contain child elements")
+ if any(
+ (child.text or "").strip() or (child.tail or "").strip()
+ for child in direct_children
+ ):
+ errors.append(
+ "Compact authored preset paths may contain only whitespace around markup"
+ )
+
+ preset = group.get("data-pptx-prst") or ""
+ object_kind = group.get("data-pptx-object") or ""
+ if object_kind not in {"shape", "connector"}:
+ errors.append(
+ "Authored preset data-pptx-object must be 'shape' or 'connector'"
+ )
+ if preset in CONNECTOR_PRESET_TYPES and object_kind != "connector":
+ errors.append(
+ f"Connector preset {preset!r} requires data-pptx-object='connector'"
+ )
+ if object_kind == "connector" and preset not in CONNECTOR_PRESET_TYPES:
+ errors.append(
+ f"Authored connector requires a connector preset, got {preset!r}"
+ )
+
+ try:
+ frame = _parse_frame(group.get("data-pptx-frame"), object_kind)
+ canonical_frame = " ".join(fmt_num(value, 8) for value in frame)
+ if group.get("data-pptx-frame") != canonical_frame:
+ raise ValueError(
+ "Compact authored preset data-pptx-frame must use the helper's "
+ f"canonical spelling {canonical_frame!r}"
+ )
+ adjustments = {
+ name[len(_ADJUSTMENT_PREFIX):]: value
+ for name, value in group.attrib.items()
+ if name.startswith(_ADJUSTMENT_PREFIX)
+ }
+ _validate_adjustments(preset, adjustments)
+ rendered = render_preset_geometry(
+ preset,
+ Xfrm(x=frame[0], y=frame[1], w=frame[2], h=frame[3]),
+ adjustments,
+ )
+ raw_style = {
+ name: group.attrib[name]
+ for name in _STYLE_ATTRS
+ if name in group.attrib
+ }
+ if "fill" not in raw_style or "stroke" not in raw_style:
+ raise ValueError(
+ "Compact authored preset requires explicit local fill and stroke"
+ )
+ style_attrs = _validate_style(raw_style)
+ noncanonical_style = sorted(
+ name for name, value in style_attrs.items()
+ if raw_style.get(name) != value
+ )
+ if noncanonical_style:
+ raise ValueError(
+ "Compact authored preset style uses non-canonical values: "
+ + ", ".join(noncanonical_style)
+ )
+ if style_attrs.get("stroke", "none") != "none" and (
+ "stroke-width" not in style_attrs
+ ):
+ raise ValueError(
+ "Compact authored preset with a visible stroke requires stroke-width"
+ )
+ if object_kind == "connector":
+ if style_attrs.get("fill", "none") != "none":
+ raise ValueError("Authored connector fill must be none")
+ if not _has_visible_stroke(style_attrs):
+ raise ValueError("Authored connector requires a visible stroke")
+ expected_markup = serialize_compact_preset_layers(
+ rendered.paths,
+ style_attrs,
+ )
+ expected_root = ET.fromstring(
+ f'<g xmlns="http://www.w3.org/2000/svg">{expected_markup}</g>'
+ )
+ except (ET.ParseError, ValueError) as exc:
+ errors.append(f"Cannot regenerate compact authored preset: {exc}")
+ return errors
+
+ expected_children = list(expected_root)
+ if len(direct_children) != len(expected_children):
+ errors.append(
+ "Compact authored preset path count differs from registry output: "
+ f"expected {len(expected_children)}, found {len(direct_children)}"
+ )
+ return errors
+ for index, (actual, expected) in enumerate(
+ zip(direct_children, expected_children),
+ start=1,
+ ):
+ if actual.attrib != expected.attrib:
+ errors.append(
+ f"Compact authored preset path {index} differs from registry output"
+ )
+ return errors
+
+
+def _validate_expanded_authored_preset_group(group: ET.Element) -> list[str]:
+ """Validate the legacy expanded authored-preset compatibility form."""
if group.get(AUTHORING_ATTR) != AUTHORING_VALUE:
return []
errors: list[str] = []
- if _local_name(group.tag) != "g":
+ if not _is_svg_element(group, "g"):
return [f'{AUTHORING_ATTR}="{AUTHORING_VALUE}" requires an SVG <g>']
element_id = group.get("id")
if element_id is None:
@@ -158,7 +354,7 @@ def validate_authored_preset_group(group: ET.Element) -> list[str]:
unexpected_group_attrs = sorted(
name for name in group.attrib
- if _is_unexpected_group_attr(name)
+ if _is_unexpected_group_attr(name, compact=False)
)
if unexpected_group_attrs:
errors.append(
@@ -202,9 +398,9 @@ def validate_authored_preset_group(group: ET.Element) -> list[str]:
carrier = carriers[0]
preview = previews[0]
- if _local_name(carrier.tag) != "path":
+ if not _is_svg_element(carrier, "path"):
errors.append("Authored preset geometry carrier must be an SVG <path>")
- if _local_name(preview.tag) != "g":
+ if not _is_svg_element(preview, "g"):
errors.append("Authored preset geometry preview must be an SVG <g>")
if carrier.get("visibility") != "hidden":
errors.append('Authored preset carrier requires visibility="hidden"')
@@ -353,7 +549,7 @@ def validate_authored_preset_tree(root: ET.Element) -> list[str]:
parent = parents.get(element)
if (
parent is None
- or _local_name(parent.tag) != "g"
+ or not _is_svg_element(parent, "g")
or parent.get(AUTHORING_ATTR) != AUTHORING_VALUE
):
errors.append(
@@ -363,6 +559,69 @@ def validate_authored_preset_tree(root: ET.Element) -> list[str]:
return errors
+def materialize_compact_authored_preset_tree(root: ET.Element) -> int:
+ """Expand validated compact authored presets in memory for conversion.
+
+ Source SVG stays compact. The converter reuses the established lossless
+ carrier/preview path internally, so compact and expanded inputs share one
+ DrawingML implementation.
+ """
+ materialized = 0
+ for group in list(root.iter()):
+ if authored_preset_encoding(group) != "compact":
+ continue
+ errors = _validate_compact_authored_preset_group(group)
+ if errors:
+ raise ValueError("; ".join(errors))
+
+ preset = group.get("data-pptx-prst") or ""
+ object_kind = group.get("data-pptx-object") or ""
+ frame = _parse_frame(group.get("data-pptx-frame"), object_kind)
+ adjustments = {
+ name[len(_ADJUSTMENT_PREFIX):]: value
+ for name, value in group.attrib.items()
+ if name.startswith(_ADJUSTMENT_PREFIX)
+ }
+ rendered = render_preset_geometry(
+ preset,
+ Xfrm(x=frame[0], y=frame[1], w=frame[2], h=frame[3]),
+ adjustments,
+ )
+ style_attrs = _validate_style({
+ name: group.attrib[name]
+ for name in _STYLE_ATTRS
+ if name in group.attrib
+ })
+ semantic_attrs = {
+ name: value
+ for name, value in group.attrib.items()
+ if name in _SEMANTIC_ATTRS
+ or name.startswith(_ADJUSTMENT_PREFIX)
+ or name == "data-pptx-shape-name"
+ }
+ markup = serialize_preset_layers(
+ rendered.paths,
+ semantic_attrs,
+ style_attrs,
+ )
+
+ for name in _STYLE_ATTRS:
+ group.attrib.pop(name, None)
+ group.set("data-pptx-preview-sha256", markup.preview_hash)
+ for child in list(group):
+ group.remove(child)
+ wrapper = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg">'
+ f"{markup.markup}"
+ "</svg>"
+ )
+ for child in list(wrapper):
+ wrapper.remove(child)
+ group.append(child)
+ materialized += 1
+ return materialized
+
+
def _validate_frame(
frame: tuple[float, float, float, float],
object_kind: str,
@@ -549,14 +808,18 @@ def _is_unexpected_carrier_attr(name: str) -> bool:
return not name.startswith(_ADJUSTMENT_PREFIX)
-def _is_unexpected_group_attr(name: str) -> bool:
- if name in {
+def _is_unexpected_group_attr(name: str, *, compact: bool) -> bool:
+ allowed = {
"id",
"transform",
"data-pptx-preview-sha256",
"data-pptx-shape-name",
*_SEMANTIC_ATTRS,
- }:
+ }
+ if compact:
+ allowed.update(_STYLE_ATTRS)
+ allowed.update(_TEMPLATE_ATOM_ATTRS)
+ if name in allowed:
return False
if name.startswith(_ADJUSTMENT_PREFIX):
return False
@@ -573,6 +836,13 @@ def _local_name(tag: str) -> str:
return tag.rsplit("}", 1)[-1]
+def _is_svg_element(element: ET.Element, local_name: str) -> bool:
+ return element.tag in {
+ local_name,
+ f"{{{_SVG_NAMESPACE}}}{local_name}",
+ }
+
+
def _element_label(element: ET.Element) -> str:
tag = _local_name(element.tag)
element_id = element.get("id")
diff --git a/skills/ppt-master/scripts/pptx_to_svg/preset_svg_markup.py b/skills/ppt-master/scripts/pptx_to_svg/preset_svg_markup.py
index 25658376..d6453237 100644
--- a/skills/ppt-master/scripts/pptx_to_svg/preset_svg_markup.py
+++ b/skills/ppt-master/scripts/pptx_to_svg/preset_svg_markup.py
@@ -2,8 +2,8 @@
"""
PPT Master - Preset Shape SVG Markup
-Serialize evaluated DrawingML preset layers into one native carrier and one
-browser-visible SVG preview.
+Serialize evaluated DrawingML preset layers for lossless transport or compact
+project authoring.
Usage:
Import serialize_preset_layers from pptx_to_svg.preset_svg_markup.
@@ -28,7 +28,7 @@ from .preset_registry_to_svg import SvgPresetPath
@dataclass(frozen=True)
class PresetSvgMarkup:
- """Canonical hidden-carrier and visible-preview markup for one preset."""
+ """Lossless hidden-carrier and visible-preview markup for one preset."""
carrier: str
preview: str
@@ -94,6 +94,38 @@ def serialize_preset_layers(
)
+def serialize_compact_preset_layers(
+ layers: Sequence[SvgPresetPath],
+ style_attrs: Mapping[str, str],
+) -> str:
+ """Serialize visible preset layers without transport-only duplication.
+
+ Base paint lives once on the logical authored group and is inherited by
+ each path. A path writes only the fill/stroke override required by its
+ DrawingML layer. The authored-preset validator regenerates this exact
+ markup from the registry, so no serialized fingerprint is needed.
+ """
+ base_fill = style_attrs.get("fill", "none")
+ base_stroke = style_attrs.get("stroke", "none")
+ detail_layers: list[str] = []
+ for layer in layers:
+ attrs: dict[str, str] = {}
+ if layer.fill == "none":
+ if base_fill != "none":
+ attrs["fill"] = "none"
+ elif layer.fill != "norm":
+ derived_fill = {"fill": base_fill}
+ apply_preset_path_fill(derived_fill, layer.fill)
+ if derived_fill.get("fill") != base_fill:
+ attrs["fill"] = derived_fill["fill"]
+ if not layer.stroke and base_stroke != "none":
+ attrs["stroke"] = "none"
+ detail_layers.append(
+ f'<path d="{_xml_escape(layer.d)}"{attrs_to_xml(attrs)}/>'
+ )
+ return "\n".join(detail_layers)
+
+
def apply_preset_path_fill(attrs: dict[str, str], mode: str) -> None:
"""Apply one DrawingML path fill mode to SVG presentation attributes."""
if mode == "none":
diff --git a/skills/ppt-master/scripts/preset_shape_svg.py b/skills/ppt-master/scripts/preset_shape_svg.py
index 9969d154..24b8a0ab 100644
--- a/skills/ppt-master/scripts/preset_shape_svg.py
+++ b/skills/ppt-master/scripts/preset_shape_svg.py
@@ -2,8 +2,8 @@
"""
PPT Master - Preset Shape SVG Fragment Tool
-List DrawingML presets or print one canonical native-preset SVG fragment to
-stdout for manual insertion into a hand-authored slide.
+List DrawingML presets or print one compact canonical native-preset SVG group to
+stdout for manual insertion into a hand-authored page or template.
Usage:
python3 scripts/preset_shape_svg.py list [--search QUERY]
@@ -38,7 +38,7 @@ configure_utf8_stdio()
def build_parser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser(
description=(
- "Print one canonical DrawingML preset SVG fragment. "
+ "Print one compact canonical DrawingML preset SVG group. "
"This tool never writes SVG files or page layouts."
),
formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -78,7 +78,7 @@ def build_parser() -> argparse.ArgumentParser:
nargs=4,
type=float,
metavar=("X", "Y", "WIDTH", "HEIGHT"),
- help="Absolute SVG frame in page coordinates.",
+ help="SVG frame in the fragment's insertion coordinate space.",
)
render_parser.add_argument(
"--object-kind",
@@ -93,7 +93,7 @@ def build_parser() -> argparse.ArgumentParser:
render_parser.add_argument(
"--fill",
default="none",
- help="Solid SVG fill from spec_lock, or none.",
+ help="Solid SVG fill, or none.",
)
render_parser.add_argument(
"--fill-opacity",
@@ -103,7 +103,7 @@ def build_parser() -> argparse.ArgumentParser:
render_parser.add_argument(
"--stroke",
default="none",
- help="Solid SVG stroke from spec_lock, or none.",
+ help="Solid SVG stroke, or none.",
)
render_parser.add_argument(
"--stroke-width",
diff --git a/skills/ppt-master/scripts/svg_quality_checker.py b/skills/ppt-master/scripts/svg_quality_checker.py
index 87dbfbf5..6cb347e0 100644
--- a/skills/ppt-master/scripts/svg_quality_checker.py
+++ b/skills/ppt-master/scripts/svg_quality_checker.py
@@ -175,10 +175,14 @@ except ImportError:
try:
from pptx_to_svg.preset_authoring import (
AUTHORING_ATTR as _AUTHORING_ATTR,
+ authored_preset_encoding as _authored_preset_encoding,
+ validate_authored_preset_group as _validate_authored_preset_group,
validate_authored_preset_tree as _validate_authored_preset_tree,
)
except ImportError:
_AUTHORING_ATTR = 'data-pptx-authoring'
+ _authored_preset_encoding = None
+ _validate_authored_preset_group = None
_validate_authored_preset_tree = None
try:
@@ -270,6 +274,7 @@ except ImportError:
try:
from svg_to_pptx.pptx_package.template_structure import (
TemplateStructureError as _TemplateStructureError,
+ _is_authored_preset_atom as _is_authored_preset_atom,
load_pptx_structure_lock as _load_pptx_structure_lock,
parse_template_slide as _parse_template_structure_slide,
parse_template_slides as _parse_template_structure_slides,
@@ -280,6 +285,7 @@ try:
)
except ImportError:
_TemplateStructureError = None
+ _is_authored_preset_atom = None
_load_pptx_structure_lock = None
_parse_template_structure_slide = None
_parse_template_structure_slides = None
@@ -415,6 +421,77 @@ _MARKER_DIAMOND_PATH_RE = re.compile(
)
+def _compact_preset_ancestor_paint(
+ root: ET.Element,
+) -> list[tuple[str, tuple[str, ...]]]:
+ """Return compact presets affected by compatible ancestor paint."""
+ if (
+ _authored_preset_encoding is None
+ or _validate_authored_preset_group is None
+ ):
+ return []
+ parents = {
+ child: parent
+ for parent in root.iter()
+ for child in parent
+ }
+ affected: list[tuple[str, tuple[str, ...]]] = []
+ for group in root.iter():
+ if (
+ _authored_preset_encoding(group) != 'compact'
+ or _validate_authored_preset_group(group)
+ ):
+ continue
+ relevant = {'opacity'}
+ if group.get('fill') != 'none' and group.get('fill-opacity') is None:
+ relevant.add('fill-opacity')
+ if group.get('stroke') != 'none':
+ for name in (
+ 'stroke-opacity',
+ 'stroke-dasharray',
+ 'stroke-linecap',
+ 'stroke-linejoin',
+ ):
+ if group.get(name) is None:
+ relevant.add(name)
+
+ inherited: set[str] = set()
+ ancestor = parents.get(group)
+ while ancestor is not None:
+ declarations = {
+ name: ancestor.get(name) or ''
+ for name in relevant
+ if ancestor.get(name) is not None
+ }
+ for declaration in (ancestor.get('style') or '').split(';'):
+ name, separator, value = declaration.partition(':')
+ name = name.strip().lower()
+ if separator and name in relevant:
+ declarations[name] = value.strip()
+ for name, value in declarations.items():
+ normalized = value.strip().lower()
+ if name in {'opacity', 'fill-opacity', 'stroke-opacity'}:
+ try:
+ if float(normalized) == 1:
+ continue
+ except ValueError:
+ pass
+ elif name == 'stroke-dasharray' and normalized == 'none':
+ continue
+ elif name == 'stroke-linecap' and normalized == 'butt':
+ continue
+ elif name == 'stroke-linejoin' and normalized == 'miter':
+ continue
+ inherited.add(name)
+ ancestor = parents.get(ancestor)
+ if inherited:
+ affected.append((
+ group.get('id') or '(no id)',
+ tuple(sorted(inherited)),
+ ))
+ return affected
+
+
def _declared_pptx_structure_mode(project_path: Path) -> str | None:
"""Return the explicitly locked SVG structure mode without a fallback."""
lock_path = project_path / 'spec_lock.md'
@@ -534,7 +611,10 @@ def _local_pptx_structure_errors(
f"{svg_path.name}: {element_id} data-pptx-layer={layer!r} "
"must be a direct child of the root <svg>"
)
- if tag == 'g':
+ if tag == 'g' and not (
+ _is_authored_preset_atom is not None
+ and _is_authored_preset_atom(elem)
+ ):
errors.append(
f"{svg_path.name}: {element_id} is a <g> marked as {layer}; "
"Master/Layout fixed visuals must be root-level atomic elements"
@@ -1128,7 +1208,12 @@ class SVGQualityChecker:
# Templates do not ship a spec_lock.md, so skip in template
# mode to avoid noise.
if not self.template_mode:
- self._check_spec_lock_drift(content, svg_path, result)
+ self._check_spec_lock_drift(
+ content,
+ svg_path,
+ result,
+ root=root,
+ )
# 10. Check web-sourced image attribution. Templates don't carry
# image_sources.json; skip in template mode.
@@ -2597,6 +2682,43 @@ class SVGQualityChecker:
'update the native carrier or restore the generated detail paths'
)
result['errors'].extend(sorted(issues))
+ if (
+ _authored_preset_encoding is not None
+ and _validate_authored_preset_group is not None
+ ):
+ expanded = [
+ elem.get('id') or '(no id)'
+ for elem in root.iter()
+ if _authored_preset_encoding(elem) == 'expanded'
+ and not _validate_authored_preset_group(elem)
+ ]
+ if expanded:
+ examples = ', '.join(expanded[:3])
+ suffix = '' if len(expanded) <= 3 else f', +{len(expanded) - 3} more'
+ result['warnings'].append(
+ 'Compatible expanded authored-preset fragment(s) detected '
+ f'({len(expanded)}: {examples}{suffix}). New project-authored '
+ 'pages and templates use the compact helper form; the '
+ 'expanded carrier/preview form remains readable for compatibility. '
+ 'No change is required while it remains ordinary Slide-local input.'
+ )
+ inherited_paint = _compact_preset_ancestor_paint(root)
+ if inherited_paint:
+ examples = ', '.join(
+ f'{element_id} ({"/".join(properties)})'
+ for element_id, properties in inherited_paint[:3]
+ )
+ suffix = (
+ ''
+ if len(inherited_paint) <= 3
+ else f', +{len(inherited_paint) - 3} more'
+ )
+ result['warnings'].append(
+ 'Compact authored preset(s) use compatible ancestor paint or '
+ f'opacity ({examples}{suffix}). Canonical page/template authoring '
+ 'keeps preset paint local and reruns the helper with channel alpha; '
+ 'export remains supported.'
+ )
def _check_preset_geometry_transforms(
self,
@@ -3108,7 +3230,14 @@ class SVGQualityChecker:
return data
return None
- def _check_spec_lock_drift(self, content: str, svg_path: Path, result: Dict):
+ def _check_spec_lock_drift(
+ self,
+ content: str,
+ svg_path: Path,
+ result: Dict,
+ *,
+ root: ET.Element,
+ ):
"""Detect values used in the SVG that fall outside spec_lock.md.
Covers colors (fill / stroke / stop-color / flood-color / pattern
@@ -3129,6 +3258,31 @@ class SVGQualityChecker:
color, _alpha = _parse_export_color(v)
if color:
allowed_colors.add(color)
+
+ # A validated compact preset may contain registry-derived darken/lighten
+ # layer colors. Their base paint still comes from spec_lock; the exact
+ # child HEX values are deterministic compiler evidence, not color drift.
+ if (
+ _authored_preset_encoding is not None
+ and _validate_authored_preset_group is not None
+ ):
+ for group in root.iter():
+ if (
+ _authored_preset_encoding(group) != 'compact'
+ or _validate_authored_preset_group(group)
+ ):
+ continue
+ for child in group:
+ for attribute in ('fill', 'stroke'):
+ raw_value = child.get(attribute)
+ if raw_value is None:
+ continue
+ if _parse_export_color is not None:
+ color, _alpha = _parse_export_color(raw_value)
+ else:
+ color = _normalize_hex_rgb(raw_value)
+ if color:
+ allowed_colors.add(color)
else:
color = _normalize_hex_rgb(v)
if color:
diff --git a/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py b/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
index 73009945..cf1fdf6f 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/drawingml/converter.py
@@ -19,9 +19,7 @@ from pptx_shapes import (
validate_ooxml_xfrm,
)
from pptx_to_svg.preset_authoring import (
- AUTHORING_ATTR,
- AUTHORING_VALUE,
- validate_authored_preset_group,
+ materialize_compact_authored_preset_tree,
validate_authored_preset_tree,
)
from resource_paths import icon_search_dirs_for_svg
@@ -601,13 +599,6 @@ def convert_g(elem: ET.Element, ctx: ConvertContext) -> ShapeResult | None:
elem.get('data-pptx-object') in {'shape', 'connector'}
and elem.get('data-pptx-prst') is not None
):
- if elem.get(AUTHORING_ATTR) == AUTHORING_VALUE:
- authoring_errors = validate_authored_preset_group(elem)
- if authoring_errors:
- raise SvgNativeConversionError(
- 'Invalid authored preset shape: '
- + '; '.join(authoring_errors)
- )
_require_unchanged_preset_preview(elem)
txbody_meta = _txbody_metadata(elem)
@@ -1272,6 +1263,15 @@ def convert_svg_to_slide_shapes(
raise SvgNativeConversionError(
'Invalid authored preset structure: ' + '; '.join(authored_errors)
)
+ # Validate the source contract once, then lower compact groups to the
+ # established expanded transport IR. Downstream conversion validates the
+ # generated preview hash, not the source-format allowlist again.
+ try:
+ materialize_compact_authored_preset_tree(root)
+ except ValueError as exc:
+ raise SvgNativeConversionError(
+ f'Invalid compact authored preset: {exc}'
+ ) from exc
_mark_unchanged_txbody_groups(root)
_mark_unchanged_preset_previews(root)
if native_objects:
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 d667a9b1..f5f51d81 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,11 @@ from pathlib import Path
from typing import Any
from xml.etree import ElementTree as ET
+from pptx_to_svg.preset_authoring import (
+ authored_preset_encoding,
+ validate_authored_preset_group,
+)
+
from ..drawingml.utils import (
parse_project_geometry_length,
project_geometry_length_errors,
@@ -382,6 +387,14 @@ def _local_tag(elem: ET.Element) -> str:
return elem.tag.rsplit("}", 1)[-1] if isinstance(elem.tag, str) else ""
+def _is_authored_preset_atom(elem: ET.Element) -> bool:
+ """Return whether one group is a valid compact authored-shape atom."""
+ return (
+ authored_preset_encoding(elem) == "compact"
+ and not validate_authored_preset_group(elem)
+ )
+
+
def _svg_canvas(root: ET.Element) -> tuple[float, float, float, float]:
raw_viewbox = (root.get("viewBox") or "").strip()
values = [part for part in re.split(r"[\s,]+", raw_viewbox) if part]
@@ -1155,10 +1168,14 @@ def _validate_placeholder_carrier(
f"{svg_path.name}: {element_id} media placeholder must be declared "
"with one direct <image> or crop <svg> carrier"
)
- if placeholder == "object" and tag not in _OBJECT_PLACEHOLDER_TAGS:
+ if (
+ placeholder == "object"
+ and tag not in _OBJECT_PLACEHOLDER_TAGS
+ and not _is_authored_preset_atom(carrier)
+ ):
raise TemplateStructureError(
f"{svg_path.name}: {element_id} object placeholder carrier must be "
- "one direct text, image, or basic SVG shape"
+ "one direct text, image, basic SVG shape, or authored preset atom"
)
if placeholder in {"chart", "table"}:
try:
@@ -1351,7 +1368,12 @@ def parse_template_slide(
f"{svg_path.name}: data-pptx-layer='slide' is allowed only on a "
"direct full-canvas solid background rect"
)
- if structured and layer in {"master", "layout"} and tag == "g":
+ if (
+ structured
+ and layer in {"master", "layout"}
+ and tag == "g"
+ and not _is_authored_preset_atom(elem)
+ ):
raise TemplateStructureError(
f"{svg_path.name}: {element_id or tag} is a <g> on the {layer} "
"layer; Master/Layout fixed elements must be root-level atoms"
diff --git a/skills/ppt-master/scripts/svg_to_pptx/use_expander.py b/skills/ppt-master/scripts/svg_to_pptx/use_expander.py
index 505f36b4..e5216ea2 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/use_expander.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/use_expander.py
@@ -47,6 +47,11 @@ _URL_FUNCTION_START_RE = re.compile(r'\burl\s*\(', re.IGNORECASE)
_MAX_LOCAL_USE_DEPTH = 64
_MAX_LOCAL_USE_INSTANCES = 10_000
_NON_REUSABLE_METADATA_PREFIXES = (
+ 'data-pptx-authoring',
+ 'data-pptx-object',
+ 'data-pptx-prst',
+ 'data-pptx-frame',
+ 'data-pptx-av-',
'data-pptx-layer',
'data-pptx-replace-with',
'data-pptx-replacement-',
diff --git a/skills/ppt-master/scripts/test_svg_quality_checker.py b/skills/ppt-master/scripts/test_svg_quality_checker.py
index da6275b1..840c1343 100644
--- a/skills/ppt-master/scripts/test_svg_quality_checker.py
+++ b/skills/ppt-master/scripts/test_svg_quality_checker.py
@@ -5,12 +5,19 @@ import sys
import tempfile
import unittest
from pathlib import Path
+from xml.etree import ElementTree as ET
SCRIPT_DIR = Path(__file__).resolve().parent
if str(SCRIPT_DIR) not in sys.path:
sys.path.insert(0, str(SCRIPT_DIR))
from svg_quality_checker import SVGQualityChecker
+from pptx_shapes import CONNECTOR_PRESET_TYPES, get_preset_registry
+from pptx_to_svg.preset_authoring import (
+ materialize_compact_authored_preset_tree,
+ render_preset_shape_fragment,
+ validate_authored_preset_tree,
+)
from svg_to_pptx.drawingml.converter import (
SvgNativeConversionError,
convert_svg_to_slide_shapes,
@@ -25,6 +32,7 @@ from svg_to_pptx.native_objects import (
from svg_to_pptx.pptx_package.template_structure import (
TemplateStructureError,
_validate_placeholder_carrier,
+ parse_template_slide,
)
from svg_to_pptx.use_expander import UseExpansionError, expand_local_use_references
@@ -596,6 +604,472 @@ class SVGQualityCheckerCompatibilityTests(unittest.TestCase):
self.assertEqual(canonical_result, legacy_result)
+ def test_compact_authored_preset_exports_one_native_shape(self):
+ fragment = render_preset_shape_fragment(
+ 'rightArrow',
+ (10, 20, 100, 40),
+ adjustments={'adj1': 50000, 'adj2': 50000},
+ element_id='next-step',
+ style={'fill': '#2563EB', 'stroke': 'none'},
+ )
+ self.assertNotIn('data-pptx-part', fragment)
+ self.assertNotIn('data-pptx-preview-sha256', fragment)
+ self.assertNotIn('visibility="hidden"', fragment)
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 120">'
+ f'{fragment}</svg>'
+ )
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'compact.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ result = SVGQualityChecker().check_file(str(svg_path))
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertTrue(result['passed'])
+ self.assertEqual(result['errors'], [])
+ self.assertEqual(result['warnings'], [])
+ self.assertEqual(slide_xml.count('<p:sp>'), 1)
+ self.assertEqual(
+ slide_xml.count('<a:prstGeom prst="rightArrow">'),
+ 1,
+ )
+ self.assertNotIn('<p:cxnSp>', slide_xml)
+
+ def test_compact_multi_path_preset_exports_one_native_shape(self):
+ fragment = render_preset_shape_fragment(
+ 'cube',
+ (10, 20, 100, 80),
+ element_id='cube-node',
+ style={'fill': '#2563EB', 'stroke': 'none'},
+ )
+ group = ET.fromstring(fragment)
+ self.assertEqual(len(group), 4)
+ self.assertTrue(all(child.tag == 'path' for child in group))
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 140">'
+ f'{fragment}</svg>'
+ )
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'compact-multi.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertEqual(slide_xml.count('<p:sp>'), 1)
+ self.assertEqual(slide_xml.count('<a:prstGeom prst="cube">'), 1)
+
+ def test_every_registered_preset_supports_compact_authoring(self):
+ registry = get_preset_registry()
+ for index, preset in enumerate(registry.names):
+ connector = preset in CONNECTOR_PRESET_TYPES
+ style = (
+ {
+ 'fill': 'none',
+ 'stroke': '#334155',
+ 'stroke-width': '2',
+ }
+ if connector
+ else {'fill': '#2563EB', 'stroke': 'none'}
+ )
+ with self.subTest(preset=preset):
+ fragment = render_preset_shape_fragment(
+ preset,
+ (10, 20, 100, 60),
+ object_kind='connector' if connector else 'shape',
+ element_id=f'preset-{index}',
+ style=style,
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg">'
+ f'{fragment}</svg>'
+ )
+ self.assertEqual(validate_authored_preset_tree(root), [])
+ self.assertEqual(
+ materialize_compact_authored_preset_tree(root),
+ 1,
+ )
+ self.assertEqual(validate_authored_preset_tree(root), [])
+
+ def test_compact_authored_connector_exports_one_native_connector(self):
+ fragment = render_preset_shape_fragment(
+ 'bentConnector3',
+ (10, 20, 100, 80),
+ object_kind='connector',
+ element_id='relationship',
+ style={
+ 'fill': 'none',
+ 'stroke': '#334155',
+ 'stroke-width': '2',
+ },
+ )
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 140">'
+ f'{fragment}</svg>'
+ )
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'compact-connector.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertEqual(slide_xml.count('<p:cxnSp>'), 1)
+ self.assertEqual(
+ slide_xml.count('<a:prstGeom prst="bentConnector3">'),
+ 1,
+ )
+ self.assertNotIn('<p:sp>', slide_xml)
+
+ def test_compact_authored_preset_rejects_stale_visible_path(self):
+ fragment = render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='decision',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ )
+ stale = fragment.replace('M 20 50', 'M 21 50', 1)
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{stale}</svg>'
+ )
+ self._assert_checker_and_exporter_reject(
+ source,
+ 'Compact authored preset path 1 differs from registry output',
+ 'Invalid authored preset structure',
+ )
+
+ def test_compact_authored_preset_rejects_noncanonical_frame_spelling(self):
+ fragment = render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='decision',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ ).replace(
+ 'data-pptx-frame="20 20 80 60"',
+ 'data-pptx-frame="2e1,20,+80,60.0"',
+ 1,
+ )
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+
+ self._assert_checker_and_exporter_reject(
+ source,
+ 'data-pptx-frame must use the helper',
+ 'Invalid authored preset structure',
+ )
+
+ def test_compact_preset_ancestor_paint_is_compatible_with_warning(self):
+ fragment = render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='decision',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ )
+ result = self._check(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ '<g id="faded" fill-opacity="0.25">'
+ f'{fragment}</g></svg>'
+ )
+
+ self.assertTrue(result['passed'])
+ self.assertIn(
+ 'Compact authored preset(s) use compatible ancestor paint',
+ '\n'.join(result['warnings']),
+ )
+
+ def test_registry_derived_preset_layers_do_not_drift_from_spec_lock(self):
+ fragment = render_preset_shape_fragment(
+ 'cube',
+ (20, 20, 80, 60),
+ element_id='cube',
+ style={'fill': '#2563EB', 'stroke': 'none'},
+ )
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ project = Path(tmp_dir)
+ output_dir = project / 'svg_output'
+ output_dir.mkdir()
+ (project / 'spec_lock.md').write_text(
+ '# Execution Lock\n\n'
+ '## colors\n'
+ '- primary: #2563EB\n',
+ encoding='utf-8',
+ )
+ svg_path = output_dir / '01_cube.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ result = SVGQualityChecker().check_file(str(svg_path))
+
+ self.assertTrue(result['passed'])
+ self.assertNotIn('spec_lock drift', '\n'.join(result['warnings']))
+
+ def test_foreign_namespace_cannot_impersonate_compact_svg_path(self):
+ fragment = render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='decision',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+ group = list(root)[0]
+ list(group)[0].tag = '{urn:foreign}path'
+ source = ET.tostring(root, encoding='unicode')
+
+ self._assert_checker_and_exporter_reject(
+ source,
+ 'may contain only direct SVG paths',
+ 'Invalid authored preset structure',
+ )
+
+ def test_expanded_authored_preset_remains_compatible(self):
+ fragment = render_preset_shape_fragment(
+ 'triangle',
+ (20, 20, 80, 60),
+ element_id='triangle-node',
+ style={'fill': '#7C3AED', 'stroke': 'none'},
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+ self.assertEqual(materialize_compact_authored_preset_tree(root), 1)
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'expanded.svg'
+ ET.ElementTree(root).write(
+ svg_path,
+ encoding='utf-8',
+ xml_declaration=True,
+ )
+ result = SVGQualityChecker().check_file(str(svg_path))
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertTrue(result['passed'])
+ self.assertIn(
+ 'Compatible expanded authored-preset fragment(s) detected',
+ '\n'.join(result['warnings']),
+ )
+ self.assertEqual(slide_xml.count('<a:prstGeom prst="triangle">'), 1)
+
+ def test_malformed_expanded_preset_does_not_receive_migration_warning(self):
+ fragment = render_preset_shape_fragment(
+ 'triangle',
+ (20, 20, 80, 60),
+ element_id='triangle-node',
+ style={'fill': '#7C3AED', 'stroke': 'none'},
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+ self.assertEqual(materialize_compact_authored_preset_tree(root), 1)
+ group = list(root)[0]
+ preview = next(
+ child
+ for child in group
+ if child.get('data-pptx-part') == 'geometry-preview'
+ )
+ group.remove(preview)
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'malformed-expanded.svg'
+ ET.ElementTree(root).write(
+ svg_path,
+ encoding='utf-8',
+ xml_declaration=True,
+ )
+ result = SVGQualityChecker().check_file(str(svg_path))
+
+ self.assertFalse(result['passed'])
+ self.assertNotIn(
+ 'Compatible expanded authored-preset fragment(s) detected',
+ '\n'.join(result['warnings']),
+ )
+
+ def test_expanded_authored_preset_rejects_compact_only_group_style(self):
+ fragment = render_preset_shape_fragment(
+ 'triangle',
+ (20, 20, 80, 60),
+ element_id='triangle-node',
+ style={'fill': '#7C3AED', 'stroke': 'none'},
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{fragment}</svg>'
+ )
+ self.assertEqual(materialize_compact_authored_preset_tree(root), 1)
+ list(root)[0].set('fill-opacity', '0.5')
+ source = ET.tostring(root, encoding='unicode')
+
+ self._assert_checker_and_exporter_reject(
+ source,
+ 'unsupported attributes: fill-opacity',
+ 'Invalid authored preset structure',
+ )
+
+ def test_compact_authored_preset_is_a_structured_fixed_atom(self):
+ fragment = render_preset_shape_fragment(
+ 'rightArrow',
+ (20, 20, 80, 40),
+ element_id='master-arrow',
+ style={'fill': '#2563EB', 'stroke': 'none'},
+ ).replace(
+ ' fill="#2563EB"',
+ ' data-pptx-layer="master" data-pptx-editable="false" '
+ 'fill="#2563EB"',
+ 1,
+ )
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 720" '
+ 'data-pptx-master="master" data-pptx-master-name="Master" '
+ 'data-pptx-layout="layout" data-pptx-layout-name="Layout">'
+ f'{fragment}</svg>'
+ )
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / '01_cover.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ spec = parse_template_slide(svg_path, 1)
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertEqual(len(spec.elements), 1)
+ self.assertEqual(spec.elements[0].element_id, 'master-arrow')
+ self.assertEqual(spec.elements[0].layer, 'master')
+ self.assertEqual(
+ slide_xml.count('<a:prstGeom prst="rightArrow">'),
+ 1,
+ )
+
+ def test_stale_compact_preset_is_not_a_structured_atom_or_carrier(self):
+ fragment = render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='decision',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ ).replace('M 20 50', 'M 21 50', 1)
+ carrier = ET.fromstring(fragment)
+ carrier.set('data-pptx-placeholder-carrier', 'true')
+ with self.assertRaisesRegex(
+ TemplateStructureError,
+ 'object placeholder carrier must be',
+ ):
+ _validate_placeholder_carrier(
+ carrier,
+ 'object',
+ svg_path=Path('template.svg'),
+ element_id='object-slot',
+ )
+
+ carrier.attrib.pop('data-pptx-placeholder-carrier')
+ carrier.set('data-pptx-layer', 'master')
+ carrier.set('data-pptx-editable', 'false')
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 720" '
+ 'data-pptx-master="master" data-pptx-master-name="Master" '
+ 'data-pptx-layout="layout" data-pptx-layout-name="Layout"/>'
+ )
+ root.append(carrier)
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / '01_cover.svg'
+ ET.ElementTree(root).write(
+ svg_path,
+ encoding='utf-8',
+ xml_declaration=True,
+ )
+ with self.assertRaisesRegex(
+ TemplateStructureError,
+ 'is a <g> on the master layer',
+ ):
+ parse_template_slide(svg_path, 1)
+
+ def test_expanded_authored_preset_does_not_gain_structured_atom_status(self):
+ fragment = render_preset_shape_fragment(
+ 'rightArrow',
+ (20, 20, 80, 40),
+ element_id='master-arrow',
+ style={'fill': '#2563EB', 'stroke': 'none'},
+ )
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 720" '
+ 'data-pptx-master="master" data-pptx-master-name="Master" '
+ 'data-pptx-layout="layout" data-pptx-layout-name="Layout">'
+ f'{fragment}</svg>'
+ )
+ self.assertEqual(materialize_compact_authored_preset_tree(root), 1)
+ group = list(root)[0]
+ group.set('data-pptx-layer', 'master')
+ group.set('data-pptx-editable', 'false')
+
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / '01_cover.svg'
+ ET.ElementTree(root).write(
+ svg_path,
+ encoding='utf-8',
+ xml_declaration=True,
+ )
+ with self.assertRaisesRegex(
+ TemplateStructureError,
+ 'is a <g> on the master layer',
+ ):
+ parse_template_slide(svg_path, 1)
+
+ def test_compact_authored_preset_is_an_object_slot_carrier(self):
+ carrier = ET.fromstring(render_preset_shape_fragment(
+ 'diamond',
+ (20, 20, 80, 60),
+ element_id='object-preset',
+ style={'fill': '#F59E0B', 'stroke': 'none'},
+ ))
+ carrier.set('data-pptx-placeholder-carrier', 'true')
+
+ _validate_placeholder_carrier(
+ carrier,
+ 'object',
+ svg_path=Path('template.svg'),
+ element_id='object-slot',
+ )
+
+ source = (
+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 120">'
+ f'{ET.tostring(carrier, encoding="unicode")}</svg>'
+ )
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ svg_path = Path(tmp_dir) / 'object-carrier.svg'
+ svg_path.write_text(source, encoding='utf-8')
+ slide_xml = convert_svg_to_slide_shapes(svg_path)[0]
+
+ self.assertEqual(
+ slide_xml.count('<a:prstGeom prst="diamond">'),
+ 1,
+ )
+
+ def test_local_use_rejects_authored_preset_metadata(self):
+ attributes = (
+ 'data-pptx-authoring="preset"',
+ 'data-pptx-object="shape"',
+ 'data-pptx-prst="diamond"',
+ 'data-pptx-frame="20 20 80 60"',
+ 'data-pptx-av-adj="val 50000"',
+ )
+ for attribute in attributes:
+ root = ET.fromstring(
+ '<svg xmlns="http://www.w3.org/2000/svg">'
+ f'<defs><g id="source" {attribute}>'
+ '<path d="M 0 5 L 5 0 L 10 5 L 5 10 Z"/>'
+ '</g></defs><use href="#source"/></svg>'
+ )
+ with self.subTest(attribute=attribute):
+ with self.assertRaises(UseExpansionError):
+ expand_local_use_references(root)
+
if __name__ == '__main__':
unittest.main()