Improve PAGX SVG export coverage and add shared modifier resolver utilities. by OnionsYu · Pull Request #3427 · Tencent/libpag

OnionsYu · 2026-05-13T03:23:13Z

完善 PAGX 的 SVG 导出能力，并抽取多个导出器共享的辅助模块。

主要变更

SVG 导出器增强：修复垂直文本布局、textAlign End 与 overflow hidden 的换行行为，支持 textLength/lengthAdjust 让非末尾列填满容器；按布局解析的缩放对齐 PAGX 渲染器，正确处理 RTL 段落与字形 run；将 bold/italic 字体样式编码进 font-family，便于浏览器与 CoreText 解析正确字面。
ImagePattern：仅有 filePath 时跳过 bake 路径并内联图像字节，正确处理 Decal 等 scaleMode；修复 fitsToGeometry 坐标空间下的渐变导出。
新增 SVGFeatureProbe，用于检测目标渲染器对 SVG 特性的支持情况。
抽取 ExporterUtils 与 ModifierResolver 作为 SVG/PPT 导出器共享的工具与修饰符求解层，去重原本散落在两个导出器中的逻辑。
TextLayout 调整以配合上述共享工具的接口。
新增 PAGXSVGTest 覆盖上述新增/修复行为。

不影响 PPT 导出的对外行为，PPTWriter.h 的清理仅为同步共享头的迁移。

… PPTExporter.

…rter.

…ile mode instead of stretch mode.

…ect ratio instead of tile mode.

…correct x-y order.

…tch when tileModeX or tileModeY is Repeat or Mirror.

…rnate contours.

…mage is smaller than the shape.

…d JPEG metadata.

…mage pattern and shadow code.

…ents and shadows.

…nding direction.

…r anchor offset.

…itable vector shapes.

…ration across exporters.

…rove resource management.

…ger cancels overlapping skewed letters.

…ks, modifier edges, and text alignment paths.

…rt_ppt2

…kdrop when rasterizeUnsupported is on.

…ort_svg2 # Conflicts: # src/pagx/ppt/PPTExporter.cpp resolved by feature/onionsyu_export_ppt2 version

…oving the duplicated ApplyStrokeBoxInset definition.

…resolved scales RTL paragraphs and glyph runs.

…on that misuses baselineY as a Y coordinate.

… image bytes when only filePath is set.

…d column so wrapping textAlign End and overflow hidden render correctly.

…t spacing so non-last columns stretch to fill the box like the PAGX renderer.

…PowerPoint uses the real bold face.

…ort_svg2

…o browsers and CoreText viewers use the real bold face.

…rt_svg2 # Conflicts: # .codebuddy/skills/pagx/references/cli.md # CMakeLists.txt # include/pagx/PPTExporter.h # include/pagx/SVGExporter.h # src/cli/CommandExport.cpp # src/pagx/TextLayout.cpp # src/pagx/TextLayout.h # src/pagx/ppt/PPTExporter.cpp # src/pagx/ppt/PPTFeatureProbe.h # src/pagx/ppt/PPTStyleEmitter.cpp # src/pagx/ppt/PPTTextWriter.cpp # src/pagx/ppt/PPTWriter.h # src/pagx/svg/SVGExporter.cpp # src/pagx/utils/ExporterUtils.cpp # src/pagx/utils/ExporterUtils.h # test/src/PAGXCliTest.cpp # test/src/PAGXPPTTest.cpp

…tting CSS Compositing Level 2 mix-blend-mode values and guarding feBlend against the unsupported Porter-Duff modes.

…ss SVG and PPT exporters to remove mirrored implementations.

…vendored dependency.

…empty shell layers to match verify.

codecov-commenter · 2026-05-13T07:56:23Z

Codecov Report

❌ Patch coverage is 96.33827% with 84 lines in your changes missing coverage. Please review.
✅ Project coverage is 80.30%. Comparing base (d3454c1) to head (a046ed8).
⚠️ Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
src/pagx/utils/ModifierResolver.cpp	90.35%	18 Missing and 12 partials ⚠️
src/pagx/utils/ExporterUtils.cpp	74.35%	19 Missing and 1 partial ⚠️
src/pagx/utils/ExporterUtils.h	73.52%	9 Missing and 9 partials ⚠️
src/pagx/PAGXOptimizer.cpp	42.10%	4 Missing and 7 partials ⚠️
src/pagx/svg/SVGBlendMode.h	40.00%	1 Missing and 2 partials ⚠️
src/pagx/ppt/PPTTextWriter.cpp	92.59%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3427      +/-   ##
==========================================
+ Coverage   79.69%   80.30%   +0.61%     
==========================================
  Files         580      584       +4     
  Lines       60823    63580    +2757     
  Branches    18920    19304     +384     
==========================================
+ Hits        48470    51057    +2587     
- Misses       8686     8799     +113     
- Partials     3667     3724      +57

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…rt_svg2

…nts filters and image helpers.

…rt_svg2

shlzxjp

对 PR 进行了多维度代码评审（架构、API、实现、健壮性、安全、规范、测试），所有发现均经实际代码交叉验证。整体质量较高（注释充分、严守项目禁用项），主要问题集中在共享重构未真正完成、光栅化兜底路径与公开 API 边界保护几处。具体见行级评论。

shlzxjp · 2026-05-21T14:20:44Z

@@ -0,0 +1,601 @@
+/////////////////////////////////////////////////////////////////////////////////////////////////


[H1] 共享重构未真正生效：本文件 601 行与 src/pagx/ppt/PPTModifierResolver.cpp diff -u 仅差 28 行（类名 + 2 处注释）。PPTWriter.h:51,703 仍持有 PPTModifierResolver，二进制中并存两份等价实现，PR 标题 "shared modifier resolver utilities" 目标未达成。建议让 PPT 迁移到 pagx::ModifierResolver 并删除 src/pagx/ppt/PPTModifierResolver.{h,cpp}，或至少 using PPTModifierResolver = ModifierResolver;。

shlzxjp · 2026-05-21T14:20:44Z

+    canvas->concat(targetLayer->getRelativeMatrix(coordinateSpace));
+    targetLayer->draw(canvas);
+  }
+};


[H2] MaskedLayerDrawerInSpace 缺少 scrollRect clip。同文件 826-844 的 MaskedLayerDrawer 注释明示 tgfx::Layer::draw 不应用 layer 自身 scrollRect，必须由 drawer 显式 clipRect。SVGExporter::rasterizeLayerAsImage（SVGExporter.cpp:2077）走此 drawer，且 writeLayer 成功后 return（SVGExporter.cpp:2272）跳过后续 scrollRect 处理。当 layer 同时带 scrollRect 与 unsupported feature（TextPath/TextModifier/Conic/Diamond）时，导出的 <image> 含越界像素。建议在 concat 之后、draw 之前补上对称的 scrollRect clip。

shlzxjp · 2026-05-21T14:20:44Z

+    auto data = GetImageData(image);
+    if (data && data->size() > 0) {
+      return EncodeImageDataURI(data->bytes(), data->size());
+    }
    return image->filePath;


[M1] 加载失败回退为本地绝对路径，与上方注释 "SVG cross-environment usage cannot rely on absolute filesystem paths" 自相矛盾，且会泄露用户机器路径。建议失败时返回 {} 让上层走兜底，避免产出不可移植 SVG。

shlzxjp · 2026-05-21T14:20:44Z

+      return "url(#" + defId + ")";
+    }
+    // If baking failed, fall through to try native tiling for Repeat modes
+  }


[M2] Mirror/Clamp bake 失败时 fall through 到下方 non-tiling 单图分支（行 652），输出"单张图覆盖整 shape"，与 Mirror/Clamp 语义不一致。建议 bake 失败且 mode 非 Repeat 时单独处理（保留 native pattern 或显式标错），不要静默落入 Repeat 路径。

shlzxjp · 2026-05-21T14:20:44Z

+   * stretch the denser bitmap over the same visible extent, yielding a crisper result.
+   * The default value is 192.
+   */
+  int rasterDPI = 192;


[M3+L4] rasterDPI 类型 int 且公开 API 文档无合法范围、入口无 clamp。
(1) 0/负数被 pixelWidth<=0 兜住但静默回退到 vector 路径，与 rasterizeUnsupportedFeatures=true 语义矛盾（用户期望保真）；
(2) 极端大值在 ExporterUtils.cpp:809 static_cast<int>(std::ceil(width * pixelScale)) 触发 float→int UB（C++ 实现定义）。
对照 HTMLExportOptions::rasterScale 已声明 Valid range: (0, 4]. clamped，建议对齐：API 文档加合法区间，并在 ToSVG/ToFile 入口 clamp 到 [1, 4096] 之类。

shlzxjp · 2026-05-21T14:20:44Z

+ * WebP magic bytes should be detected and produce a data:image/webp URI.
+ */
+PAGX_TEST(PAGXSVGTest, SVGExport_WebpMimeDetection) {
+  static constexpr uint8_t kFakeWebp[] = {'R', 'I', 'F', 'F', 0x10, 0x00, 0x00, 0x00,


[L1] kFakeWebp 违反规范"不加 k 前缀"。

shlzxjp · 2026-05-21T14:20:44Z

+ private:
+  PAGXDocument* _doc;
+
+  // Allocates a new pagx::Path whose data is a fresh PathData owned by _doc.


[L2] 私有方法 makePathFromData 上方多行注释违反规范"私有方法不加注释"。如属非显而易见的算法选择，应迁至 .cpp 实现处。同样的问题见 71、75 行（applyTrimToElement、applyRoundCornerToElement）。

shlzxjp · 2026-05-21T14:20:44Z

-        Matrix groupMatrix = BuildGroupMatrix(group);
-        Matrix combined = transform * groupMatrix;
-        writeTextBoxGroup(out, group, group->elements, combined);
+bool SVGWriter::rasterizeLayerAsImage(SVGBuilder& out, const Layer* layer) {


[L3] 函数体内 4 处 return false 静默吞错（layerMap 缺失/!root、!tgfxLayer、!pngData、bounds 空）。建议接入项目日志或对应 [M5] warnings 通道，至少 Debug 构建中输出诊断。

shlzxjp · 2026-05-21T14:20:44Z

+  doc->layers.push_back(layer);
+
+  pagx::SVGExporter::Options opts;
+  opts.rasterizeUnsupportedFeatures = false;


[T1+T2] 测试覆盖缺口：
(1) 仅此处与 1982 行命中 rasterizeUnsupportedFeatures，且都设为 false。无任何用例验证 rasterizeUnsupportedFeatures=true（默认）路径，即 conic/diamond/TextPath 实际生成 <image> 数据 URI 的端到端断言缺失。
(2) grep "rasterDPI" test/src/ 0 命中，新增 API 字段 rasterDPI（默认 192、边界 0/负/极大）零覆盖。

shlzxjp · 2026-05-21T14:20:44Z

+ * (rather than the legacy SVG 1.1 "tb") is used because text-anchor handling
+ * in the legacy keyword path is inconsistent across renderers.
+ */
+PAGX_TEST(PAGXSVGTest, SVGExport_WritingModeVertical) {


[T3] WritingModeVertical 仅断言 vertical-rl 字符串。grep "textLength|lengthAdjust" test/src/ 0 命中，新增的 vertical justify 拉伸逻辑（SVGExporter.cpp:1773-1777）未被实测。建议补一个超界文本 + TextAlign::Justify 的 vertical 用例，断言 textLength= 与 lengthAdjust="spacing" 实际写入 SVG。

OnionsYu added 30 commits April 2, 2026 10:28

Add ExporterUtils with shared helper functions for PAGX exporters.

bdc4670

Refactor SVGTextLayout to reuse ComputeGlyphPaths from ExporterUtils.

7de4194

Refactor SVGExporter to reuse shared helpers from ExporterUtils.

721feaf

Add PPTExporter with PPTX export support for PAGX documents.

3321b2c

Fix XML attribute escaping and strip quotes from font family names in…

a29b78c

… PPTExporter.

Remove unused fillRule parameter from writeCustomGeom in PPTExporter.

218dc4e

Fix zero-dimension path bounds handling for stroked shapes in PPTExpo…

83f37f5

…rter.

Add mask layer rasterization support to PPTExporter.

4519189

Add image pattern fill cropping and JPEG dimension parsing support.

1e21b4c

Add preset dash pattern matching for stroke dashes in PPTExporter.

ad7a653

Fix image pattern fill stretching distortion in PPT export by using t…

5e83842

…ile mode instead of stretch mode.

Fix image pattern fill by using srcRect plus fillRect to preserve asp…

4171d66

…ect ratio instead of tile mode.

Fix linear gradient angle calculation by swapping atan2 arguments to …

49d618a

…correct x-y order.

Fix ImagePattern tiling in PPT export to use a:tile instead of a:stre…

6651d32

…tch when tileModeX or tileModeY is Repeat or Mirror.

Emulate even-odd fill rule in PPT export by reversing winding of alte…

013def6

…rnate contours.

Export non-tiling ImagePattern as a separate p:pic element when the i…

25996cc

…mage is smaller than the shape.

Fix image pattern tiling scale by applying DPI correction from PNG an…

72cc868

…d JPEG metadata.

Refactor PPTExporter by extracting shared helpers and deduplicating i…

ae96374

…mage pattern and shadow code.

Reformat PrintUsage alignment in CommandExport.

2ddf405

Add PPT export test that converts SVG files to PPTX via PAGX roundtrip.

cdaf2a3

Add comprehensive PPT export unit tests for shapes and text and gradi…

0adbf25

…ents and shadows.

Add unit tests for PAGX exporter utility functions.

8529dec

Fix even-odd fill emulation by using signed area to detect contour wi…

697adbb

…nding direction.

Reformat byte array alignment in PAGXUtilsTest.

deb8fb3

Fix expected ty value in BuildGroupMatrix rotation test to account fo…

49cbca6

…r anchor offset.

Add bakeMask option to PPT exporter for exporting masked layers as ed…

221d16e

…itable vector shapes.

Replace custom ZipWriter with minizip for compressed PPTX output.

b6523a9

Extract unified XMLBuilder into shared header to deduplicate XML gene…

8427cb3

…ration across exporters.

Refactor PPT exporter to replace lambdas with named functions and imp…

e90cd8f

…rove resource management.

Add PPTX export CLI tests and PAGX utils tests.

04460de

OnionsYu added 16 commits May 9, 2026 16:01

Group glyph contours per glyph in PPTX export so even-odd fill no lon…

78d4ed4

…ger cancels overlapping skewed letters.

Refactor PPT writer to remove lambdas and dedupe shape/typeface helpers.

814cf51

Add PPT exporter coverage tests for bridge contours, gradient fallbac…

7ce01cb

…ks, modifier edges, and text alignment paths.

Merge remote-tracking branch 'origin/main' into feature/onionsyu_expo…

7b239e3

…rt_ppt2

Drop BackgroundBlurStyle from PPTX vector path and rasterize with bac…

a8817cb

…kdrop when rasterizeUnsupported is on.

Merge branch 'feature/onionsyu_export_ppt2' into feature/onionsyu_exp…

790180a

…ort_svg2 # Conflicts: # src/pagx/ppt/PPTExporter.cpp resolved by feature/onionsyu_export_ppt2 version

Fix PPT writer build by following ModifierResolver relocation and rem…

a418367

…oving the duplicated ApplyStrokeBoxInset definition.

Align SVG exporter with the PAGX renderer for image scaleMode layout-…

5fc84fe

…resolved scales RTL paragraphs and glyph runs.

Fix SVG vertical text positioning by skipping per-column line iterati…

b8a2afe

…on that misuses baselineY as a Y coordinate.

Fix SVG ImagePattern Decal scaleMode by skipping bake path and inline…

291b75c

… image bytes when only filePath is set.

Fix SVG vertical text by emitting one text element per layout-compute…

75be4b9

…d column so wrapping textAlign End and overflow hidden render correctly.

Fix SVG vertical text justify by emitting textLength with lengthAdjus…

b5d5bbe

…t spacing so non-last columns stretch to fill the box like the PAGX renderer.

Re-encode bold and italic font styles into the PPTX typeface name so …

5779fa4

…PowerPoint uses the real bold face.

Merge branch 'feature/onionsyu_export_ppt2' into feature/onionsyu_exp…

b6aecd4

…ort_svg2

Re-encode bold and italic font styles into the SVG font-family name s…

bc1f57a

…o browsers and CoreText viewers use the real bold face.

OnionsYu requested review from Hparty, domchen, kevingpqi123 and shlzxjp as code owners May 13, 2026 03:23

OnionsYu added 5 commits May 13, 2026 11:33

Fix SVG export of plusLighter and plusDarker layer blend modes by emi…

59d553d

…tting CSS Compositing Level 2 mix-blend-mode values and guarding feBlend against the unsupported Porter-Duff modes.

Share UTF-8 walk RichTextRun typeface and logical anchor helpers acro…

ee2a708

…ss SVG and PPT exporters to remove mirrored implementations.

Remove zlib entry from vendor.json since it is no longer needed as a …

d64defa

…vendored dependency.

Allow scrollRect conversion with translation-only matrices and prune …

5bb69e1

…empty shell layers to match verify.

Reformat empty layer pruning conditions to match project line width.

9bb33f3

OnionsYu added 3 commits May 13, 2026 17:04

Merge remote-tracking branch 'origin/main' into feature/onionsyu_expo…

4d30ad8

…rt_svg2

Add PAGX SVG export and utils tests covering modifier resolver gradie…

e83d4a0

…nts filters and image helpers.

Merge remote-tracking branch 'origin/main' into feature/onionsyu_expo…

a046ed8

…rt_svg2

shlzxjp reviewed May 21, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve PAGX SVG export coverage and add shared modifier resolver utilities.#3427

Improve PAGX SVG export coverage and add shared modifier resolver utilities.#3427
OnionsYu wants to merge 209 commits into
Tencent:mainfrom
OnionsYu:feature/onionsyu_export_svg2

OnionsYu commented May 13, 2026

Uh oh!

codecov-commenter commented May 13, 2026 •

edited

Loading

Uh oh!

shlzxjp left a comment

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

shlzxjp May 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,601 @@
		/////////////////////////////////////////////////////////////////////////////////////////////////

Conversation

OnionsYu commented May 13, 2026

Uh oh!

codecov-commenter commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shlzxjp left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented May 13, 2026 •

edited

Loading