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-to-pptx): classify all native line-end shapes

hugohe335ff6f7b2a6b
diff --git a/skills/ppt-master/scripts/svg_to_pptx/drawingml/styles.py b/skills/ppt-master/scripts/svg_to_pptx/drawingml/styles.py
index 71f968db..16f34984 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/drawingml/styles.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/drawingml/styles.py
@@ -3,7 +3,6 @@
from __future__ import annotations
import math
-import re
from xml.etree import ElementTree as ET
from pptx_shapes import validate_ooxml_line_width
@@ -14,6 +13,7 @@ from .utils import (
SVG_NS, ANGLE_UNIT,
px_to_emu, _f, _get_attr, parse_svg_length,
combine_opacity, parse_inline_style, parse_opacity, parse_stop_style,
+ classify_project_marker_shape,
matrix_multiply, parse_svg_color, parse_transform_matrix, resolve_url_id,
parse_project_filter_params, project_filter_drawingml_coordinates,
parse_project_stroke_dasharray, parse_project_stroke_enum,
@@ -303,15 +303,6 @@ def build_pattern_fill(
# Marker (arrow-head) support
# ---------------------------------------------------------------------------
-# Matches an (x, y) pair in a path "d" attribute: "M 10, 20" / "L -5 7.5" / etc.
-_MARKER_POINT_RE = re.compile(
- r'[MLml]\s*(-?\d+(?:\.\d+)?)\s*[,\s]\s*(-?\d+(?:\.\d+)?)'
-)
-_MARKER_POLY_POINT_RE = re.compile(
- r'(-?\d+(?:\.\d+)?)\s*[,\s]\s*(-?\d+(?:\.\d+)?)'
-)
-
-
def _marker_size_buckets(w_attr: float, h_attr: float) -> tuple[str, str]:
"""Map SVG markerWidth / markerHeight to DrawingML (w, len) buckets.
@@ -338,44 +329,17 @@ def _classify_marker(marker_elem: ET.Element) -> tuple[str, str, str] | None:
w, len in {'sm', 'med', 'lg'}
or None if the marker cannot be classified.
- Current coverage (80/20): triangles (3-vertex closed paths or polygons),
- diamonds (4-vertex symmetric), and circles / ellipses. Anything else
- returns None so the caller can warn and skip.
+ Current coverage is the five DrawingML line-end shapes: triangle, stealth,
+ arrow, diamond, and oval. Anything else returns ``None``.
"""
mw = _f(marker_elem.get('markerWidth'), 3.0)
mh = _f(marker_elem.get('markerHeight'), 3.0)
w_bucket, len_bucket = _marker_size_buckets(mw, mh)
- for child in marker_elem:
- tag = child.tag.replace(f'{{{SVG_NS}}}', '')
-
- if tag in ('circle', 'ellipse'):
- return ('oval', w_bucket, len_bucket)
-
- if tag == 'path':
- d = child.get('d', '')
- if not d:
- continue
- points = _MARKER_POINT_RE.findall(d)
- n = len(points)
- closed = bool(re.search(r'[Zz]\s*$', d.strip()))
- if n == 3 and closed:
- return ('triangle', w_bucket, len_bucket)
- if n == 4 and closed:
- return ('diamond', w_bucket, len_bucket)
- continue
-
- if tag in ('polygon', 'polyline'):
- pts_attr = child.get('points', '')
- pts = _MARKER_POLY_POINT_RE.findall(pts_attr)
- n = len(pts)
- if n == 3:
- return ('triangle', w_bucket, len_bucket)
- if n == 4:
- return ('diamond', w_bucket, len_bucket)
- continue
-
- return None
+ marker_type = classify_project_marker_shape(marker_elem)
+ if marker_type is None:
+ return None
+ return marker_type, w_bucket, len_bucket
def _emit_line_end(
@@ -409,7 +373,7 @@ def _emit_line_end(
if cls is None:
print(
f' Warning: marker "{marker_id}" shape cannot be classified; '
- f'skipping (supported: triangle, diamond, oval)'
+ 'skipping (supported: triangle, stealth, arrow, diamond, oval)'
)
return ''
diff --git a/skills/ppt-master/scripts/svg_to_pptx/drawingml/utils.py b/skills/ppt-master/scripts/svg_to_pptx/drawingml/utils.py
index b7343c55..a96bc24b 100644
--- a/skills/ppt-master/scripts/svg_to_pptx/drawingml/utils.py
+++ b/skills/ppt-master/scripts/svg_to_pptx/drawingml/utils.py
@@ -230,6 +230,16 @@ _PROJECT_MARKER_DIAMOND_PATH_RE = re.compile(
rf'(?:\s*L\s*{_PROJECT_MARKER_POINT_TOKEN}){{3}}\s*Z\s*$',
re.IGNORECASE,
)
+_PROJECT_MARKER_ARROW_PATH_RE = re.compile(
+ rf'^\s*M\s*{_PROJECT_MARKER_POINT_TOKEN}'
+ rf'(?:\s*L\s*{_PROJECT_MARKER_POINT_TOKEN}){{2}}\s*$',
+ re.IGNORECASE,
+)
+_PROJECT_MARKER_COMMAND_POINT_RE = re.compile(
+ rf'[ML]\s*({_PROJECT_MARKER_NUMBER_TOKEN})'
+ rf'(?:\s*,\s*|\s+)({_PROJECT_MARKER_NUMBER_TOKEN})',
+ re.IGNORECASE,
+)
PROJECT_NON_VISUAL_DEFINITION_CHILD_TAGS = frozenset({
'defs',
'desc',
@@ -1764,6 +1774,122 @@ def _project_marker_polygon_vertex_count(raw: str) -> int | None:
return len(values) // 2
+def _project_marker_polygon_points(
+ raw: str,
+) -> list[tuple[float, float]] | None:
+ """Parse finite marker polygon points from the closed project grammar."""
+ tokens = [token for token in re.split(r'[\s,]+', raw.strip()) if token]
+ if not tokens or len(tokens) % 2:
+ return None
+ try:
+ values = [float(token) for token in tokens]
+ except ValueError:
+ return None
+ if not all(math.isfinite(value) for value in values):
+ return None
+ return list(zip(values[::2], values[1::2]))
+
+
+def _project_marker_path_points(raw: str) -> list[tuple[float, float]]:
+ """Return the explicit M/L points from an already-validated marker path."""
+ points = [
+ (float(x), float(y))
+ for x, y in _PROJECT_MARKER_COMMAND_POINT_RE.findall(raw)
+ ]
+ return [
+ point
+ for point in points
+ if all(math.isfinite(coordinate) for coordinate in point)
+ ]
+
+
+def _project_marker_cross(
+ first: tuple[float, float],
+ second: tuple[float, float],
+ third: tuple[float, float],
+) -> float:
+ """Return the signed turn for three marker vertices."""
+ return (
+ (second[0] - first[0]) * (third[1] - second[1])
+ - (second[1] - first[1]) * (third[0] - second[0])
+ )
+
+
+def _project_marker_segments_cross(
+ first_start: tuple[float, float],
+ first_end: tuple[float, float],
+ second_start: tuple[float, float],
+ second_end: tuple[float, float],
+) -> bool:
+ """Return whether two non-adjacent marker edges strictly intersect."""
+ first_a = _project_marker_cross(first_start, first_end, second_start)
+ first_b = _project_marker_cross(first_start, first_end, second_end)
+ second_a = _project_marker_cross(second_start, second_end, first_start)
+ second_b = _project_marker_cross(second_start, second_end, first_end)
+ return first_a * first_b < 0 and second_a * second_b < 0
+
+
+def _project_marker_quadrilateral_type(
+ points: list[tuple[float, float]],
+) -> str | None:
+ """Classify one simple four-point marker as diamond or stealth."""
+ if len(points) != 4:
+ return None
+ if (
+ _project_marker_segments_cross(points[0], points[1], points[2], points[3])
+ or _project_marker_segments_cross(
+ points[1], points[2], points[3], points[0]
+ )
+ ):
+ return None
+ turns = [
+ _project_marker_cross(
+ points[index],
+ points[(index + 1) % 4],
+ points[(index + 2) % 4],
+ )
+ for index in range(4)
+ ]
+ if any(abs(turn) <= 1e-12 for turn in turns):
+ return None
+ signs = {turn > 0 for turn in turns}
+ return 'diamond' if len(signs) == 1 else 'stealth'
+
+
+def classify_project_marker_shape(marker_elem: ET.Element) -> str | None:
+ """Classify one marker into a DrawingML line-end shape, if representable."""
+ visual_children = [
+ child
+ for child in list(marker_elem)
+ if _svg_element_tag(child)
+ not in PROJECT_NON_VISUAL_DEFINITION_CHILD_TAGS
+ ]
+ if len(visual_children) != 1:
+ return None
+ shape = visual_children[0]
+ tag = (_svg_element_tag(shape) or '').lower()
+ if tag in {'circle', 'ellipse'}:
+ return 'oval'
+ if tag == 'path':
+ path_data = shape.get('d', '')
+ if _PROJECT_MARKER_TRIANGLE_PATH_RE.fullmatch(path_data):
+ return 'triangle'
+ if _PROJECT_MARKER_ARROW_PATH_RE.fullmatch(path_data):
+ return 'arrow'
+ if _PROJECT_MARKER_DIAMOND_PATH_RE.fullmatch(path_data):
+ points = _project_marker_path_points(path_data)
+ return _project_marker_quadrilateral_type(points)
+ return None
+ if tag == 'polygon':
+ points = _project_marker_polygon_points(shape.get('points', ''))
+ if points is None:
+ return None
+ if len(points) == 3:
+ return 'triangle'
+ return _project_marker_quadrilateral_type(points)
+ return None
+
+
def _project_effective_presentation_value(
elem: ET.Element,
name: str,
diff --git a/skills/ppt-master/scripts/test_svg_quality_checker.py b/skills/ppt-master/scripts/test_svg_quality_checker.py
index 862d3436..058ccc40 100644
--- a/skills/ppt-master/scripts/test_svg_quality_checker.py
+++ b/skills/ppt-master/scripts/test_svg_quality_checker.py
@@ -2536,6 +2536,45 @@ class SVGQualityCheckerCompatibilityTests(unittest.TestCase):
stroke_xml,
)
+ def test_native_line_end_shape_types_round_trip_in_mapper(self):
+ drawingml_ns = (
+ 'http://schemas.openxmlformats.org/drawingml/2006/main'
+ )
+ for marker_type in (
+ 'triangle',
+ 'stealth',
+ 'arrow',
+ 'diamond',
+ 'oval',
+ ):
+ with self.subTest(marker_type=marker_type):
+ end = ET.Element(
+ f'{{{drawingml_ns}}}tailEnd',
+ {'type': marker_type, 'w': 'med', 'len': 'med'},
+ )
+ marker_id, marker_markup = _build_arrow_marker(
+ end,
+ '#112233',
+ id_prefix='roundtrip-',
+ seq=[0],
+ reversed_=False,
+ )
+ marker = ET.fromstring(marker_markup)
+ line = ET.fromstring(
+ '<line xmlns="http://www.w3.org/2000/svg" '
+ 'stroke="#112233" '
+ f'marker-end="url(#{marker_id})"/>'
+ )
+ stroke_xml = build_stroke_xml(
+ line,
+ ConvertContext(defs={marker_id: marker}),
+ )
+ self.assertIn(
+ f'<a:tailEnd type="{marker_type}" '
+ 'w="med" len="med"/>',
+ stroke_xml,
+ )
+
def test_imported_head_end_uses_supported_reversible_orientation(self):
drawingml_ns = (
'http://schemas.openxmlformats.org/drawingml/2006/main'