ooxml-core 1.40.0 → 1.42.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -0
- package/dist/PptxHandler-73QIJ6SD.cjs +14 -0
- package/dist/{PptxHandler-2WYH66TS.mjs → PptxHandler-A2J4PCOB.mjs} +2 -2
- package/dist/PptxHandler-OGLVLX2T.mjs +5 -0
- package/dist/{PresentationBuilder-BUUVVMNI.cjs → PresentationBuilder-6S5PJXXF.cjs} +6 -6
- package/dist/{PresentationBuilder-VHDHLGIK.mjs → PresentationBuilder-APJKCMVS.mjs} +2 -2
- package/dist/{PresentationBuilder-RTHLLHLE.mjs → PresentationBuilder-F3BWDERK.mjs} +3 -3
- package/dist/automation/index.cjs +5322 -3452
- package/dist/automation/index.mjs +5322 -3452
- package/dist/chart/index.cjs +5 -5
- package/dist/chart/index.mjs +5 -5
- package/dist/{chunk-EXSPNK6W.cjs → chunk-3J6VIKLP.cjs} +3 -3
- package/dist/chunk-CODMW5KF.cjs +110 -0
- package/dist/{chunk-3E4GSBC7.mjs → chunk-CPSTCCRD.mjs} +4 -4
- package/dist/{chunk-6XAAJTA3.mjs → chunk-IPV3J3I5.mjs} +4925 -3049
- package/dist/{chunk-HLBIT5H4.mjs → chunk-MXA67O7R.mjs} +1 -1
- package/dist/{chunk-OGD5OQK2.mjs → chunk-N6X5CJZP.mjs} +6723 -4840
- package/dist/chunk-O3YGBYGZ.mjs +104 -0
- package/dist/{chunk-SEGPDD5W.cjs → chunk-QZPOPUI5.cjs} +4925 -3048
- package/dist/{chunk-5BVSDSJZ.mjs → chunk-VKFKEVHK.mjs} +1 -1
- package/dist/{chunk-AZNF3IOI.mjs → chunk-VV724DWE.mjs} +87 -11
- package/dist/{chunk-NHV47JOE.mjs → chunk-XVB3CBNM.mjs} +53 -9
- package/dist/{chunk-U6FMLGWH.cjs → chunk-YNQRXFTC.cjs} +1317 -1273
- package/dist/{chunk-725QJW4K.mjs → chunk-ZUEN4RQG.mjs} +1 -1
- package/dist/color/index.cjs +36 -0
- package/dist/color/index.d.ts +1 -0
- package/dist/color/index.d.ts.map +1 -1
- package/dist/color/index.mjs +35 -1
- package/dist/color/office-gradient-stops.d.ts +27 -0
- package/dist/color/office-gradient-stops.d.ts.map +1 -0
- package/dist/diagram/index.cjs +5223 -3170
- package/dist/diagram/index.d.ts +1 -0
- package/dist/diagram/index.d.ts.map +1 -1
- package/dist/diagram/index.mjs +5218 -3171
- package/dist/docx/embedded.cjs +4862 -3000
- package/dist/docx/embedded.mjs +4862 -3000
- package/dist/docx/index.cjs +4970 -3072
- package/dist/docx/index.mjs +4970 -3072
- package/dist/docx/layout/index.cjs +4952 -3054
- package/dist/docx/layout/index.mjs +4952 -3054
- package/dist/docx/load/index.cjs +4999 -3137
- package/dist/docx/load/index.mjs +4999 -3137
- package/dist/docx/shape-svg.d.ts.map +1 -1
- package/dist/docx/ui/index.cjs +4907 -3045
- package/dist/docx/ui/index.mjs +4907 -3045
- package/dist/drawingml/dash-pattern.d.ts +61 -0
- package/dist/drawingml/dash-pattern.d.ts.map +1 -0
- package/dist/drawingml/index.cjs +319 -53
- package/dist/drawingml/index.d.ts +3 -0
- package/dist/drawingml/index.d.ts.map +1 -1
- package/dist/drawingml/index.mjs +310 -54
- package/dist/drawingml/path-data.d.ts.map +1 -1
- package/dist/drawingml/rect-path-gradient.d.ts +17 -0
- package/dist/drawingml/rect-path-gradient.d.ts.map +1 -1
- package/dist/drawingml/shape-path-gradient.d.ts +57 -0
- package/dist/drawingml/shape-path-gradient.d.ts.map +1 -0
- package/dist/geometry/index.cjs +4117 -2254
- package/dist/geometry/index.mjs +4117 -2255
- package/dist/geometry/ooxml-arc.d.ts +10 -1
- package/dist/geometry/ooxml-arc.d.ts.map +1 -1
- package/dist/geometry/preset-shape-definitions-action-buttons.d.ts +7 -36
- package/dist/geometry/preset-shape-definitions-action-buttons.d.ts.map +1 -1
- package/dist/geometry/preset-shape-definitions-connectors-brackets.d.ts.map +1 -1
- package/dist/geometry/preset-shape-definitions-exact-action-buttons.d.ts +19 -0
- package/dist/geometry/preset-shape-definitions-exact-action-buttons.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-arcs.d.ts +14 -0
- package/dist/geometry/preset-shape-definitions-exact-arcs.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-arrows.d.ts +11 -0
- package/dist/geometry/preset-shape-definitions-exact-arrows.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-basic.d.ts +12 -0
- package/dist/geometry/preset-shape-definitions-exact-basic.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-circular.d.ts +18 -0
- package/dist/geometry/preset-shape-definitions-exact-circular.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-ellipse-ribbons.d.ts +16 -0
- package/dist/geometry/preset-shape-definitions-exact-ellipse-ribbons.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-funnel.d.ts +13 -0
- package/dist/geometry/preset-shape-definitions-exact-funnel.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-left-right-ribbon.d.ts +13 -0
- package/dist/geometry/preset-shape-definitions-exact-left-right-ribbon.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-math.d.ts +14 -0
- package/dist/geometry/preset-shape-definitions-exact-math.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-misc.d.ts +11 -0
- package/dist/geometry/preset-shape-definitions-exact-misc.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-ribbons.d.ts +12 -0
- package/dist/geometry/preset-shape-definitions-exact-ribbons.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-exact-scrolls.d.ts +13 -0
- package/dist/geometry/preset-shape-definitions-exact-scrolls.d.ts.map +1 -0
- package/dist/geometry/preset-shape-definitions-flowchart.d.ts.map +1 -1
- package/dist/geometry/preset-shape-definitions-misc.d.ts.map +1 -1
- package/dist/geometry/preset-shape-definitions-table.d.ts.map +1 -1
- package/dist/geometry/preset-shape-exact-dsl.d.ts +30 -0
- package/dist/geometry/preset-shape-exact-dsl.d.ts.map +1 -0
- package/dist/index.cjs +7637 -5216
- package/dist/index.mjs +7637 -5216
- package/dist/pptx/automation/index.cjs +5683 -3508
- package/dist/pptx/automation/index.d.ts +11 -17
- package/dist/pptx/automation/index.d.ts.map +1 -1
- package/dist/pptx/automation/index.mjs +156 -71
- package/dist/pptx/chunks/{elements-DheCTwi0.d.ts → elements-PBugbKtv.d.ts} +3 -848
- package/dist/pptx/chunks/elements-PBugbKtv.d.ts.map +1 -0
- package/dist/pptx/chunks/{index-Jcce8TlI.d.ts → index-BJuR8GLL.d.ts} +4 -4
- package/dist/pptx/chunks/{index-Jcce8TlI.d.ts.map → index-BJuR8GLL.d.ts.map} +1 -1
- package/dist/pptx/chunks/{index-CYukxWbl.d.ts → index-Rbvl2WaM.d.ts} +32 -13
- package/dist/pptx/chunks/index-Rbvl2WaM.d.ts.map +1 -0
- package/dist/pptx/chunks/{index-B4ofjG6_.d.ts → index-xoJGYTgQ.d.ts} +5 -3
- package/dist/pptx/chunks/index-xoJGYTgQ.d.ts.map +1 -0
- package/dist/pptx/chunks/table-C7ITXL3Y.d.ts +875 -0
- package/dist/pptx/chunks/table-C7ITXL3Y.d.ts.map +1 -0
- package/dist/pptx/chunks/{text-operations-CdgEnFuK.d.ts → text-operations-BNJr7aGa.d.ts} +3 -2
- package/dist/pptx/chunks/text-operations-BNJr7aGa.d.ts.map +1 -0
- package/dist/pptx/cli/index.cjs +5419 -3335
- package/dist/pptx/cli/index.d.ts +1 -1
- package/dist/pptx/cli/index.mjs +4 -4
- package/dist/pptx/converter/index.cjs +4936 -2978
- package/dist/pptx/converter/index.d.ts +1 -1
- package/dist/pptx/converter/index.mjs +2 -2
- package/dist/pptx/editor/render/custom-show-operations.cjs +2 -2
- package/dist/pptx/editor/render/custom-show-operations.mjs +1 -1
- package/dist/pptx/editor/render/find-replace.cjs +15 -15
- package/dist/pptx/editor/render/find-replace.d.ts +2 -2
- package/dist/pptx/editor/render/find-replace.mjs +2 -2
- package/dist/pptx/editor/render/slide-operations.cjs +9 -9
- package/dist/pptx/editor/render/slide-operations.mjs +3 -3
- package/dist/pptx/editor/render/table-data-grid-ops.cjs +5 -5
- package/dist/pptx/editor/render/table-data-grid-ops.mjs +1 -1
- package/dist/pptx/editor/render/table-layout.cjs +6 -6
- package/dist/pptx/editor/render/table-layout.d.ts +8 -37
- package/dist/pptx/editor/render/table-layout.d.ts.map +1 -1
- package/dist/pptx/editor/render/table-layout.mjs +1 -1
- package/dist/pptx/editor/render/text-runs-style-patch.d.ts +1 -1
- package/dist/pptx/editor/render/text-style-scope.d.ts +1 -1
- package/dist/pptx/index.cjs +7298 -5162
- package/dist/pptx/index.d.ts +7 -6
- package/dist/pptx/index.mjs +5 -5
- package/dist/pptx/node/index.d.ts +1 -1
- package/dist/teams/index.cjs +5332 -3307
- package/dist/teams/index.mjs +5332 -3307
- package/dist/text/font-metrics/design-advances.generated.d.ts +3 -1
- package/dist/text/font-metrics/design-advances.generated.d.ts.map +1 -1
- package/dist/text/font-metrics/office-font-metrics.generated.d.ts +23 -0
- package/dist/text/font-metrics/office-font-metrics.generated.d.ts.map +1 -0
- package/dist/text/font-metrics/vertical-metrics.d.ts +35 -0
- package/dist/text/font-metrics/vertical-metrics.d.ts.map +1 -0
- package/dist/text/index.cjs +268 -0
- package/dist/text/index.d.ts +1 -0
- package/dist/text/index.d.ts.map +1 -1
- package/dist/text/index.mjs +267 -1
- package/dist/visio/index.cjs +8 -0
- package/dist/visio/index.mjs +8 -0
- package/dist/visio/ui/index.cjs +8 -0
- package/dist/visio/ui/index.mjs +8 -0
- package/dist/xlsx/collab/index.cjs +5084 -3222
- package/dist/xlsx/collab/index.mjs +5084 -3222
- package/dist/xlsx/index.cjs +5298 -3404
- package/dist/xlsx/index.mjs +5298 -3404
- package/dist/xlsx/layout/shape-paint.d.ts.map +1 -1
- package/dist/xlsx/load/index.cjs +5103 -3241
- package/dist/xlsx/load/index.mjs +5103 -3241
- package/dist/xlsx/ui/index.cjs +5261 -3399
- package/dist/xlsx/ui/index.mjs +5261 -3399
- package/package.json +1 -1
- package/dist/PptxHandler-SD6VWF3I.mjs +0 -5
- package/dist/PptxHandler-ZHWWOO2X.cjs +0 -14
- package/dist/chunk-3IT6ZD7K.mjs +0 -213
- package/dist/chunk-FRUB573B.cjs +0 -219
- package/dist/pptx/chunks/elements-DheCTwi0.d.ts.map +0 -1
- package/dist/pptx/chunks/index-B4ofjG6_.d.ts.map +0 -1
- package/dist/pptx/chunks/index-CYukxWbl.d.ts.map +0 -1
- package/dist/pptx/chunks/text-operations-CdgEnFuK.d.ts.map +0 -1
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PowerPoint's dash patterns, measured from its own 1280x720 exports.
|
|
3
|
+
*
|
|
4
|
+
* Every preset is a fixed run of (dash, gap) lengths in units of the pen width:
|
|
5
|
+
*
|
|
6
|
+
* | preset | dash, gap, ... |
|
|
7
|
+
* | --------------------------- | ---------------------------------- |
|
|
8
|
+
* | `dash` | 4 3 |
|
|
9
|
+
* | `dot` | 1 3 |
|
|
10
|
+
* | `lgDash` | 8 3 |
|
|
11
|
+
* | `dashDot` | 4 3 1 3 |
|
|
12
|
+
* | `lgDashDot` | 8 3 1 3 |
|
|
13
|
+
* | `lgDashDotDot` | 8 3 1 3 1 3 |
|
|
14
|
+
* | `sysDash` | 3 1 |
|
|
15
|
+
* | `sysDot` | 1 1 |
|
|
16
|
+
* | `sysDashDot` | 3 1 1 1 |
|
|
17
|
+
* | `sysDashDotDot` | 3 1 1 1 1 1 |
|
|
18
|
+
* | `custDash` (`a:ds d sp`) | d, sp in 1000ths of a percent |
|
|
19
|
+
*
|
|
20
|
+
* Three behaviours the numbers alone do not say:
|
|
21
|
+
*
|
|
22
|
+
* - The unit is the pen width rounded to WHOLE device pixels (at least one),
|
|
23
|
+
* the same rounding the line itself gets: at 1280 px a 2 pt line (2.67 px)
|
|
24
|
+
* dashes as a 3 px pen, 1 pt (1.33 px) as 1 px. See {@link dashPenWidth}.
|
|
25
|
+
* - The pattern starts at the first point of the path with a dash.
|
|
26
|
+
* - Caps are part of the dash, not added to it. A `rnd` dash is the pattern's
|
|
27
|
+
* dash length INCLUDING its round ends (a `dot` is a circle one pen wide and
|
|
28
|
+
* the period is unchanged), and `sq` adds nothing to interior dashes: they
|
|
29
|
+
* are the flat dashes, only the line's own ends overshoot. SVG draws a cap
|
|
30
|
+
* on top of the dash, so {@link capCompensatedDashArray} shortens round dashes
|
|
31
|
+
* by one pen width, and the stroke uses a `butt` cap for dashed square lines
|
|
32
|
+
* (`svgLineCap(cap, true)`).
|
|
33
|
+
*
|
|
34
|
+
* Pure and framework-agnostic.
|
|
35
|
+
*
|
|
36
|
+
* @module render/dash-pattern
|
|
37
|
+
*/
|
|
38
|
+
/** A `custDash` segment: lengths in 1000ths of a percent of the line width. */
|
|
39
|
+
export interface DashSegmentInput {
|
|
40
|
+
dash: number;
|
|
41
|
+
space: number;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* The pen width dash lengths scale with: the stroke width rounded to whole
|
|
45
|
+
* pixels, at least one (ties round down: 4.5 px dashes as 4 px, measured).
|
|
46
|
+
*/
|
|
47
|
+
export declare function dashPenWidth(strokeWidth: number): number;
|
|
48
|
+
/**
|
|
49
|
+
* The dash pattern of a preset or custom dash in pen widths, or `undefined` for
|
|
50
|
+
* a solid line.
|
|
51
|
+
*/
|
|
52
|
+
export declare function dashPatternUnits(dashType: string | undefined, customSegments?: ReadonlyArray<DashSegmentInput>): readonly number[] | undefined;
|
|
53
|
+
/** Whether an `a:ln` dash token paints a dashed (not solid) line. */
|
|
54
|
+
export declare function isDashedStroke(dashType: string | undefined): boolean;
|
|
55
|
+
/**
|
|
56
|
+
* The SVG dash array (user units) for a pattern at a stroke width. With a
|
|
57
|
+
* `rnd` cap each dash gives up one pen width to its two round ends, and the gap
|
|
58
|
+
* gains it back, so dots and dashes land where PowerPoint puts them.
|
|
59
|
+
*/
|
|
60
|
+
export declare function capCompensatedDashArray(pattern: readonly number[], strokeWidth: number, lineCap?: 'flat' | 'rnd' | 'sq'): string;
|
|
61
|
+
//# sourceMappingURL=dash-pattern.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dash-pattern.d.ts","sourceRoot":"","sources":["../../drawingml/dash-pattern.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAgBH,+EAA+E;AAC/E,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACd;AAQD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC,GAC9C,SAAS,MAAM,EAAE,GAAG,SAAS,CAU/B;AAED,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACtC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,GAC7B,MAAM,CAiBR"}
|
package/dist/drawingml/index.cjs
CHANGED
|
@@ -284,7 +284,7 @@ function linearToSrgb255(linear) {
|
|
|
284
284
|
function orderedColorTransforms(channels, transforms) {
|
|
285
285
|
let { r, g, b } = channels;
|
|
286
286
|
let alpha = 1;
|
|
287
|
-
const
|
|
287
|
+
const wrap2 = (value) => (value % 360 + 360) % 360;
|
|
288
288
|
for (const transform of transforms) {
|
|
289
289
|
const { name, value } = transform;
|
|
290
290
|
const fraction = parseDrawingFraction(value);
|
|
@@ -302,14 +302,14 @@ function orderedColorTransforms(channels, transforms) {
|
|
|
302
302
|
[r, g, b] = [mix(r), mix(g), mix(b)];
|
|
303
303
|
} else {
|
|
304
304
|
const hsl = rgbToHsl(r, g, b);
|
|
305
|
-
if (name === "comp") hsl.h =
|
|
305
|
+
if (name === "comp") hsl.h = wrap2(hsl.h + 180);
|
|
306
306
|
else if (name === "hue") {
|
|
307
307
|
const hue = parseDrawingHueDegrees(value);
|
|
308
|
-
if (hue !== void 0) hsl.h =
|
|
308
|
+
if (hue !== void 0) hsl.h = wrap2(hue);
|
|
309
309
|
} else if (name === "hueOff") {
|
|
310
310
|
const hue = parseDrawingHueDegrees(value);
|
|
311
|
-
if (hue !== void 0) hsl.h =
|
|
312
|
-
} else if (name === "hueMod" && fraction !== void 0) hsl.h =
|
|
311
|
+
if (hue !== void 0) hsl.h = wrap2(hsl.h + hue);
|
|
312
|
+
} else if (name === "hueMod" && fraction !== void 0) hsl.h = wrap2(hsl.h * fraction);
|
|
313
313
|
else if (name === "sat" && fraction !== void 0) hsl.s = clampUnitInterval(fraction);
|
|
314
314
|
else if (name === "satMod" && fraction !== void 0) hsl.s *= fraction;
|
|
315
315
|
else if (name === "satOff" && fraction !== void 0)
|
|
@@ -467,13 +467,13 @@ function resolveDrawingColor(color, theme, options) {
|
|
|
467
467
|
}
|
|
468
468
|
if (["hue", "hueMod", "hueOff", "sat", "satMod", "satOff", "lum", "lumMod", "lumOff"].some(has)) {
|
|
469
469
|
const hsl = rgbToHsl(r, g, b);
|
|
470
|
-
const
|
|
470
|
+
const wrap2 = (degrees) => (degrees % 360 + 360) % 360;
|
|
471
471
|
const hueAbs = parseDrawingHueDegrees(find("hue"));
|
|
472
|
-
if (hueAbs !== void 0) hsl.h =
|
|
472
|
+
if (hueAbs !== void 0) hsl.h = wrap2(hueAbs);
|
|
473
473
|
const hueMod = parseDrawingFraction(find("hueMod"));
|
|
474
|
-
if (hueMod !== void 0) hsl.h =
|
|
474
|
+
if (hueMod !== void 0) hsl.h = wrap2(hsl.h * hueMod);
|
|
475
475
|
const hueOff = parseDrawingHueDegrees(find("hueOff"));
|
|
476
|
-
if (hueOff !== void 0) hsl.h =
|
|
476
|
+
if (hueOff !== void 0) hsl.h = wrap2(hsl.h + hueOff);
|
|
477
477
|
const satAbs = parseDrawingFraction(find("sat"));
|
|
478
478
|
if (satAbs !== void 0) hsl.s = clampUnitInterval(satAbs);
|
|
479
479
|
const satMod = parseDrawingFraction(find("satMod"));
|
|
@@ -586,12 +586,12 @@ function parseArtisticPictureExtension(node) {
|
|
|
586
586
|
const key = ARTISTIC_PRIMARY_ATTRIBUTE[effect.localName];
|
|
587
587
|
if (!key) return void 0;
|
|
588
588
|
const raw = key ? effect.getAttribute(key) : null;
|
|
589
|
-
const
|
|
590
|
-
if (!Number.isFinite(
|
|
589
|
+
const n2 = raw === null ? 0 : Number(raw);
|
|
590
|
+
if (!Number.isFinite(n2)) return void 0;
|
|
591
591
|
return {
|
|
592
592
|
kind: "artistic",
|
|
593
593
|
name: effect.localName,
|
|
594
|
-
radius: effect.localName === "artisticBlur" ?
|
|
594
|
+
radius: effect.localName === "artisticBlur" ? n2 : n2 / 1e3,
|
|
595
595
|
baked: true,
|
|
596
596
|
...unhandled.length ? { unhandled } : {}
|
|
597
597
|
};
|
|
@@ -703,10 +703,10 @@ function parseStandardPictureEffect(node) {
|
|
|
703
703
|
const raw = node.getAttribute(attribute);
|
|
704
704
|
if (raw === null) continue;
|
|
705
705
|
const percent = raw.endsWith("%");
|
|
706
|
-
const
|
|
707
|
-
if (!Number.isFinite(
|
|
706
|
+
const n2 = Number(percent ? raw.slice(0, -1) : raw) / (key === "hue" ? 6e4 : key === "radiusEmu" ? 1 : percent ? 100 : 1e5);
|
|
707
|
+
if (!Number.isFinite(n2) || key === "hue" && (n2 < 0 || n2 >= 360) || key === "threshold" && (n2 < 0 || n2 > 1) || key === "radiusEmu" && (!Number.isSafeInteger(n2) || n2 < 0) || ["saturation", "luminance", "amount"].includes(key) && name !== "alphaMod" && (n2 < (name === "alphaRepl" ? 0 : -1) || n2 > 1))
|
|
708
708
|
return void 0;
|
|
709
|
-
values[key] =
|
|
709
|
+
values[key] = n2;
|
|
710
710
|
}
|
|
711
711
|
if (["biLevel", "alphaBiLevel"].includes(name) && values.threshold === void 0)
|
|
712
712
|
return void 0;
|
|
@@ -716,9 +716,9 @@ function parseStandardPictureEffect(node) {
|
|
|
716
716
|
const nested = cont ? elements(cont) : [];
|
|
717
717
|
if (nested.length !== 1 || nested[0]?.localName !== "alphaModFix") return void 0;
|
|
718
718
|
const raw = nested[0].getAttribute("amt") ?? "100000";
|
|
719
|
-
const
|
|
720
|
-
if (!Number.isFinite(
|
|
721
|
-
values.amount =
|
|
719
|
+
const n2 = Number(raw.endsWith("%") ? raw.slice(0, -1) : raw) / (raw.endsWith("%") ? 100 : 1e5);
|
|
720
|
+
if (!Number.isFinite(n2) || n2 < 0) return void 0;
|
|
721
|
+
values.amount = n2;
|
|
722
722
|
}
|
|
723
723
|
let colors = [];
|
|
724
724
|
if (name === "duotone") {
|
|
@@ -814,8 +814,8 @@ function picturePercentage(value) {
|
|
|
814
814
|
const text = String(value ?? "").trim();
|
|
815
815
|
if (!text) return void 0;
|
|
816
816
|
const percent = text.endsWith("%");
|
|
817
|
-
const
|
|
818
|
-
return Number.isFinite(
|
|
817
|
+
const n2 = Number(percent ? text.slice(0, -1) : text) / (percent ? 100 : 1e5);
|
|
818
|
+
return Number.isFinite(n2) ? n2 : void 0;
|
|
819
819
|
}
|
|
820
820
|
function readPictureEffect(name, attribute) {
|
|
821
821
|
if (name === "grayscl") return { kind: "grayscale" };
|
|
@@ -975,16 +975,16 @@ function parsePictureLayout(fill) {
|
|
|
975
975
|
["scaleX", "sx"],
|
|
976
976
|
["scaleY", "sy"]
|
|
977
977
|
]) {
|
|
978
|
-
const
|
|
979
|
-
if (
|
|
978
|
+
const n2 = picturePercentage(tile.getAttribute(attr));
|
|
979
|
+
if (n2 !== void 0) value[key] = n2;
|
|
980
980
|
}
|
|
981
981
|
for (const [key, attr] of [
|
|
982
982
|
["offsetXEmu", "tx"],
|
|
983
983
|
["offsetYEmu", "ty"]
|
|
984
984
|
]) {
|
|
985
985
|
const raw = tile.getAttribute(attr);
|
|
986
|
-
const
|
|
987
|
-
if (Number.isSafeInteger(
|
|
986
|
+
const n2 = raw === null ? NaN : Number(raw);
|
|
987
|
+
if (Number.isSafeInteger(n2)) value[key] = n2;
|
|
988
988
|
}
|
|
989
989
|
const alignment = tile.getAttribute("algn");
|
|
990
990
|
if (alignment) value.alignment = alignment;
|
|
@@ -1039,14 +1039,14 @@ function applyPictureLayout(fill, layout) {
|
|
|
1039
1039
|
["offsetXEmu", "tx"],
|
|
1040
1040
|
["offsetYEmu", "ty"]
|
|
1041
1041
|
]) {
|
|
1042
|
-
const
|
|
1043
|
-
if (
|
|
1042
|
+
const n2 = layout.tile[key];
|
|
1043
|
+
if (n2 !== void 0 && (!Number.isFinite(n2) || (name === "sx" || name === "sy" ? n2 <= 0 : !Number.isSafeInteger(n2))))
|
|
1044
1044
|
throw new RangeError("Invalid picture tile");
|
|
1045
|
-
if (
|
|
1045
|
+
if (n2 !== before.tile?.[key])
|
|
1046
1046
|
attr(
|
|
1047
1047
|
tile,
|
|
1048
1048
|
name,
|
|
1049
|
-
|
|
1049
|
+
n2 === void 0 ? void 0 : Math.round(n2 * (name === "sx" || name === "sy" ? 1e5 : 1)),
|
|
1050
1050
|
void 0
|
|
1051
1051
|
);
|
|
1052
1052
|
}
|
|
@@ -1063,11 +1063,11 @@ function applyPictureLayout(fill, layout) {
|
|
|
1063
1063
|
if (tile) fill.removeChild(tile);
|
|
1064
1064
|
const rect = make(make(fill, "stretch"), "fillRect");
|
|
1065
1065
|
for (const key of ["l", "t", "r", "b"]) {
|
|
1066
|
-
const
|
|
1067
|
-
if (
|
|
1066
|
+
const n2 = layout.fillRect?.[key];
|
|
1067
|
+
if (n2 !== void 0 && !Number.isFinite(n2))
|
|
1068
1068
|
throw new RangeError("Invalid picture fill rectangle");
|
|
1069
|
-
if (
|
|
1070
|
-
attr(rect, key,
|
|
1069
|
+
if (n2 !== before.fillRect?.[key])
|
|
1070
|
+
attr(rect, key, n2 === void 0 ? void 0 : Math.round(n2 * 1e5), void 0);
|
|
1071
1071
|
}
|
|
1072
1072
|
}
|
|
1073
1073
|
}
|
|
@@ -1620,7 +1620,7 @@ function parseCustomGeometry(custom, width, height) {
|
|
|
1620
1620
|
}
|
|
1621
1621
|
const pathWidth = path.hasAttribute("w") ? Number(path.getAttribute("w")) : contextWidth;
|
|
1622
1622
|
const pathHeight = path.hasAttribute("h") ? Number(path.getAttribute("h")) : contextHeight;
|
|
1623
|
-
if (![pathWidth, pathHeight].every((
|
|
1623
|
+
if (![pathWidth, pathHeight].every((n2) => Number.isFinite(n2) && n2 > 0)) return void 0;
|
|
1624
1624
|
paths.push({
|
|
1625
1625
|
commands,
|
|
1626
1626
|
width: pathWidth,
|
|
@@ -2795,7 +2795,7 @@ function lerpStops(a, b, t) {
|
|
|
2795
2795
|
opacity: oa + (ob - oa) * t
|
|
2796
2796
|
};
|
|
2797
2797
|
}
|
|
2798
|
-
function
|
|
2798
|
+
function gradientColorAt(stops, position) {
|
|
2799
2799
|
const first2 = stops[0];
|
|
2800
2800
|
const last = stops[stops.length - 1];
|
|
2801
2801
|
if (position <= first2.position) {
|
|
@@ -2857,7 +2857,7 @@ function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
|
|
|
2857
2857
|
if (!Number.isInteger(bands) || bands < 1) throw new RangeError("Invalid gradient band count");
|
|
2858
2858
|
for (let i = bands; i >= 0; i -= 1) {
|
|
2859
2859
|
const t = i / bands;
|
|
2860
|
-
const { color, opacity } =
|
|
2860
|
+
const { color, opacity } = gradientColorAt(sorted, t * 100);
|
|
2861
2861
|
const left = lerpEdge(inner.left, 0, t);
|
|
2862
2862
|
const top = lerpEdge(inner.top, 0, t);
|
|
2863
2863
|
const right = lerpEdge(inner.right, 100, t);
|
|
@@ -2876,9 +2876,194 @@ function buildRectPathGradientSvg(stops, focalPoint, fillToRect, options) {
|
|
|
2876
2876
|
const paint = masked ? `<defs><mask id="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="100" height="100" mask-type="luminance" color-interpolation="sRGB">${alphaRects.join("")}</mask></defs><g mask="url(#alpha)">${rects.join("")}</g>` : rects.join("");
|
|
2877
2877
|
return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="none">${paint}</svg>`;
|
|
2878
2878
|
}
|
|
2879
|
+
function buildRectPathGradientExactSvg(stops, focalPoint, fillToRect) {
|
|
2880
|
+
if (stops.length === 0) {
|
|
2881
|
+
return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"/>';
|
|
2882
|
+
}
|
|
2883
|
+
const sorted = [...stops].sort((a, b) => a.position - b.position);
|
|
2884
|
+
const { left, top, right, bottom } = resolveInnerRect(fillToRect, focalPoint);
|
|
2885
|
+
const n2 = (value) => String(Math.round(value * 1e3) / 1e3);
|
|
2886
|
+
const alpha = (opacity, attr) => (opacity ?? 1) < 1 ? ` ${attr}="${n2(Math.max(0, opacity ?? 1))}"` : "";
|
|
2887
|
+
const stopMarkup = sorted.map(
|
|
2888
|
+
(stop) => `<stop offset="${n2(Math.min(Math.max(stop.position, 0), 100) / 100)}" stop-color="${stop.color}"${alpha(stop.opacity, "stop-opacity")}/>`
|
|
2889
|
+
).join("");
|
|
2890
|
+
const sides = [
|
|
2891
|
+
{ id: "t", pts: [0, 0, 100, 0, right, top, left, top], v: [0, top, 0, 0], size: top },
|
|
2892
|
+
{
|
|
2893
|
+
id: "b",
|
|
2894
|
+
pts: [0, 100, 100, 100, right, bottom, left, bottom],
|
|
2895
|
+
v: [0, bottom, 0, 100],
|
|
2896
|
+
size: 100 - bottom
|
|
2897
|
+
},
|
|
2898
|
+
{ id: "l", pts: [0, 0, left, top, left, bottom, 0, 100], v: [left, 0, 0, 0], size: left },
|
|
2899
|
+
{
|
|
2900
|
+
id: "r",
|
|
2901
|
+
pts: [100, 0, right, top, right, bottom, 100, 100],
|
|
2902
|
+
v: [right, 0, 100, 0],
|
|
2903
|
+
size: 100 - right
|
|
2904
|
+
}
|
|
2905
|
+
].filter((side) => side.size > 1e-3);
|
|
2906
|
+
const defs = sides.map(
|
|
2907
|
+
(side) => `<linearGradient id="${side.id}" gradientUnits="userSpaceOnUse" x1="${n2(side.v[0])}" y1="${n2(side.v[1])}" x2="${n2(side.v[2])}" y2="${n2(side.v[3])}">${stopMarkup}</linearGradient>`
|
|
2908
|
+
).join("");
|
|
2909
|
+
const polygons = sides.map((side) => {
|
|
2910
|
+
const points = side.pts.map(n2);
|
|
2911
|
+
const pairs = [0, 2, 4, 6].map((i) => `${points[i]},${points[i + 1]}`).join(" ");
|
|
2912
|
+
return `<polygon points="${pairs}" fill="url(#${side.id})"/>`;
|
|
2913
|
+
}).join("");
|
|
2914
|
+
const first2 = sorted[0];
|
|
2915
|
+
const plateau = right - left > 1e-3 && bottom - top > 1e-3 ? `<rect x="${n2(left)}" y="${n2(top)}" width="${n2(right - left)}" height="${n2(bottom - top)}" fill="${first2.color}"${alpha(first2.opacity, "fill-opacity")}/>` : "";
|
|
2916
|
+
return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="none" shape-rendering="crispEdges"><defs>${defs}</defs>${polygons}${plateau}</svg>`;
|
|
2917
|
+
}
|
|
2879
2918
|
function buildRectPathGradientImage(stops, focalPoint, fillToRect) {
|
|
2880
|
-
const markup =
|
|
2881
|
-
return `url("data:image/svg+xml,${encodeURIComponent(markup)}")`;
|
|
2919
|
+
const markup = buildRectPathGradientExactSvg(stops, focalPoint, fillToRect);
|
|
2920
|
+
return `url("data:image/svg+xml,${encodeURIComponent(markup).replace(/[()]/gu, (c) => c === "(" ? "%28" : "%29")}")`;
|
|
2921
|
+
}
|
|
2922
|
+
|
|
2923
|
+
// drawingml/shape-path-gradient.ts
|
|
2924
|
+
var CIRCLE_FIELD_PRESETS = new Set(
|
|
2925
|
+
[
|
|
2926
|
+
"chevron",
|
|
2927
|
+
"rightArrow",
|
|
2928
|
+
"leftArrow",
|
|
2929
|
+
"upArrow",
|
|
2930
|
+
"downArrow",
|
|
2931
|
+
"stripedRightArrow",
|
|
2932
|
+
"notchedRightArrow",
|
|
2933
|
+
"bentUpArrow",
|
|
2934
|
+
"bentArrow",
|
|
2935
|
+
"uturnArrow",
|
|
2936
|
+
"leftRightArrow",
|
|
2937
|
+
"upDownArrow",
|
|
2938
|
+
"leftUpArrow",
|
|
2939
|
+
"leftRightUpArrow",
|
|
2940
|
+
"quadArrow",
|
|
2941
|
+
"curvedRightArrow",
|
|
2942
|
+
"curvedLeftArrow",
|
|
2943
|
+
"curvedUpArrow",
|
|
2944
|
+
"curvedDownArrow",
|
|
2945
|
+
"swooshArrow",
|
|
2946
|
+
"lightningBolt",
|
|
2947
|
+
"sun",
|
|
2948
|
+
"moon",
|
|
2949
|
+
"smileyFace",
|
|
2950
|
+
"ribbon",
|
|
2951
|
+
"ribbon2",
|
|
2952
|
+
"ellipseRibbon",
|
|
2953
|
+
"ellipseRibbon2",
|
|
2954
|
+
"leftRightRibbon",
|
|
2955
|
+
"verticalScroll",
|
|
2956
|
+
"horizontalScroll",
|
|
2957
|
+
"wave",
|
|
2958
|
+
"doubleWave",
|
|
2959
|
+
"flowChartDocument",
|
|
2960
|
+
"flowChartMultidocument",
|
|
2961
|
+
"flowChartPunchedTape",
|
|
2962
|
+
"flowChartMagneticDisk",
|
|
2963
|
+
"flowChartDisplay"
|
|
2964
|
+
].map((name) => name.toLowerCase())
|
|
2965
|
+
);
|
|
2966
|
+
var LEGACY_FIELD_PRESETS = new Set(
|
|
2967
|
+
[
|
|
2968
|
+
"donut",
|
|
2969
|
+
"noSmoking",
|
|
2970
|
+
"blockArc",
|
|
2971
|
+
"frame",
|
|
2972
|
+
"chord",
|
|
2973
|
+
"funnel",
|
|
2974
|
+
"mathDivide",
|
|
2975
|
+
"mathNotEqual",
|
|
2976
|
+
"cornerTabs",
|
|
2977
|
+
"squareTabs",
|
|
2978
|
+
"plaqueTabs",
|
|
2979
|
+
"circularArrow",
|
|
2980
|
+
"leftCircularArrow",
|
|
2981
|
+
"leftRightCircularArrow",
|
|
2982
|
+
"flowChartMagneticTape",
|
|
2983
|
+
"flowChartMagneticDrum"
|
|
2984
|
+
].map((name) => name.toLowerCase())
|
|
2985
|
+
);
|
|
2986
|
+
function shapePathGradientField(preset) {
|
|
2987
|
+
if (!preset || preset === "custom") return "circle";
|
|
2988
|
+
const key = preset.toLowerCase();
|
|
2989
|
+
if (CIRCLE_FIELD_PRESETS.has(key)) return "circle";
|
|
2990
|
+
if (LEGACY_FIELD_PRESETS.has(key)) return "legacy";
|
|
2991
|
+
return "outline";
|
|
2992
|
+
}
|
|
2993
|
+
var BAND_COUNT2 = 100;
|
|
2994
|
+
function n(value) {
|
|
2995
|
+
return String(Math.round(value * 1e3) / 1e3);
|
|
2996
|
+
}
|
|
2997
|
+
var ARG_COUNT = { M: 2, L: 2, Q: 4, C: 6, A: 7, Z: 0 };
|
|
2998
|
+
function scalePathAbout(d, s, fx, fy) {
|
|
2999
|
+
const tokens = d.match(/[A-Za-z]|-?\d*\.?\d+(?:e[-+]?\d+)?/gu);
|
|
3000
|
+
if (!tokens) return void 0;
|
|
3001
|
+
const out = [];
|
|
3002
|
+
let i = 0;
|
|
3003
|
+
while (i < tokens.length) {
|
|
3004
|
+
const command = tokens[i++];
|
|
3005
|
+
const count = ARG_COUNT[command];
|
|
3006
|
+
if (count === void 0) return void 0;
|
|
3007
|
+
out.push(command);
|
|
3008
|
+
if (command === "Z") continue;
|
|
3009
|
+
const args = tokens.slice(i, i + count).map(Number);
|
|
3010
|
+
i += count;
|
|
3011
|
+
if (args.length !== count || args.some((value) => !Number.isFinite(value))) return void 0;
|
|
3012
|
+
if (command === "A") {
|
|
3013
|
+
out.push(
|
|
3014
|
+
n(args[0] * s),
|
|
3015
|
+
n(args[1] * s),
|
|
3016
|
+
n(args[2]),
|
|
3017
|
+
n(args[3]),
|
|
3018
|
+
n(args[4]),
|
|
3019
|
+
n(fx + (args[5] - fx) * s),
|
|
3020
|
+
n(fy + (args[6] - fy) * s)
|
|
3021
|
+
);
|
|
3022
|
+
continue;
|
|
3023
|
+
}
|
|
3024
|
+
for (let k = 0; k < count; k += 2) {
|
|
3025
|
+
out.push(n(fx + (args[k] - fx) * s), n(fy + (args[k + 1] - fy) * s));
|
|
3026
|
+
}
|
|
3027
|
+
}
|
|
3028
|
+
return out.join(" ");
|
|
3029
|
+
}
|
|
3030
|
+
function closedSubpaths(d) {
|
|
3031
|
+
const parts = d.split(/(?=M)/u).map((part) => part.trim()).filter((part) => part.endsWith("Z"));
|
|
3032
|
+
return parts.length > 0 ? parts.join(" ") : void 0;
|
|
3033
|
+
}
|
|
3034
|
+
function buildOutlinePathGradientSvg(stops, d, width, height, focusX, focusY) {
|
|
3035
|
+
if (stops.length === 0 || !(width > 0) || !(height > 0)) return void 0;
|
|
3036
|
+
if (scalePathAbout(d, 1, 0, 0) === void 0) return void 0;
|
|
3037
|
+
const sorted = [...stops].sort((a, b) => a.position - b.position);
|
|
3038
|
+
const fx = focusX * width;
|
|
3039
|
+
const fy = focusY * height;
|
|
3040
|
+
const translucent = sorted.some((stop) => (stop.opacity ?? 1) < 1);
|
|
3041
|
+
const body = [];
|
|
3042
|
+
if (translucent) {
|
|
3043
|
+
for (let i = BAND_COUNT2; i >= 1; i -= 1) {
|
|
3044
|
+
const outer = scalePathAbout(d, i / BAND_COUNT2, fx, fy);
|
|
3045
|
+
if (outer === void 0) return void 0;
|
|
3046
|
+
const inner = i > 1 ? scalePathAbout(d, (i - 1) / BAND_COUNT2, fx, fy) : void 0;
|
|
3047
|
+
const { color, opacity } = gradientColorAt(sorted, (i - 0.5) / BAND_COUNT2 * 100);
|
|
3048
|
+
const alpha = opacity < 1 ? ` fill-opacity="${n(Math.max(0, opacity))}"` : "";
|
|
3049
|
+
body.push(
|
|
3050
|
+
`<path d="${outer}${inner ? ` ${inner}` : ""}" fill="${color}"${alpha} fill-rule="evenodd"/>`
|
|
3051
|
+
);
|
|
3052
|
+
}
|
|
3053
|
+
return wrap(width, height, body.join(""));
|
|
3054
|
+
}
|
|
3055
|
+
body.push(`<defs><path id="p" d="${d}"/></defs>`);
|
|
3056
|
+
for (let i = BAND_COUNT2; i >= 1; i -= 1) {
|
|
3057
|
+
const s = i / BAND_COUNT2;
|
|
3058
|
+
const { color } = gradientColorAt(sorted, (i - 0.5) / BAND_COUNT2 * 100);
|
|
3059
|
+
body.push(
|
|
3060
|
+
`<use href="#p" transform="matrix(${n(s)} 0 0 ${n(s)} ${n(fx * (1 - s))} ${n(fy * (1 - s))})" fill="${color}"/>`
|
|
3061
|
+
);
|
|
3062
|
+
}
|
|
3063
|
+
return wrap(width, height, body.join(""));
|
|
3064
|
+
}
|
|
3065
|
+
function wrap(width, height, body) {
|
|
3066
|
+
return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${n(width)} ${n(height)}" preserveAspectRatio="none">${body}</svg>`;
|
|
2882
3067
|
}
|
|
2883
3068
|
|
|
2884
3069
|
// drawingml/theme.ts
|
|
@@ -3362,8 +3547,8 @@ var LIGHT_DIRECTIONS = /* @__PURE__ */ new Set(["tl", "t", "tr", "l", "r", "bl",
|
|
|
3362
3547
|
// drawingml/read-3d-values.ts
|
|
3363
3548
|
var integer = (value) => {
|
|
3364
3549
|
if (value === void 0 || value === null || String(value).trim() === "") return void 0;
|
|
3365
|
-
const
|
|
3366
|
-
return Number.isSafeInteger(
|
|
3550
|
+
const n2 = Number(value);
|
|
3551
|
+
return Number.isSafeInteger(n2) ? n2 : void 0;
|
|
3367
3552
|
};
|
|
3368
3553
|
function readScene3DValues(node, read) {
|
|
3369
3554
|
const out = {};
|
|
@@ -4230,7 +4415,10 @@ function drawingRichTextBodyXml(body, qualifiedName = "a:txBody", namespace = NS
|
|
|
4230
4415
|
}
|
|
4231
4416
|
|
|
4232
4417
|
// geometry/ooxml-arc.ts
|
|
4233
|
-
function
|
|
4418
|
+
function visualToParametric(visual, wR, hR) {
|
|
4419
|
+
return Math.atan2(wR * Math.sin(visual), hR * Math.cos(visual));
|
|
4420
|
+
}
|
|
4421
|
+
function ooxmlArcToSvg(wR, hR, stAng, swAng, penX, penY, scaleX = 1, scaleY = 1, parametric = false) {
|
|
4234
4422
|
if (![wR, hR, stAng, swAng, penX, penY].every(Number.isFinite) || wR <= 0 || hR <= 0 || swAng === 0) {
|
|
4235
4423
|
return null;
|
|
4236
4424
|
}
|
|
@@ -4242,7 +4430,7 @@ function ooxmlArcToSvg(wR, hR, stAng, swAng, penX, penY) {
|
|
|
4242
4430
|
let angle = stAng;
|
|
4243
4431
|
const commands = [];
|
|
4244
4432
|
for (let index = 0; index < pieces; index++) {
|
|
4245
|
-
const part = ooxmlArcToSvg(wR, hR, angle, sweep2 / pieces, x, y);
|
|
4433
|
+
const part = ooxmlArcToSvg(wR, hR, angle, sweep2 / pieces, x, y, scaleX, scaleY, parametric);
|
|
4246
4434
|
commands.push(part.svg);
|
|
4247
4435
|
x = part.endX;
|
|
4248
4436
|
y = part.endY;
|
|
@@ -4250,17 +4438,32 @@ function ooxmlArcToSvg(wR, hR, stAng, swAng, penX, penY) {
|
|
|
4250
4438
|
}
|
|
4251
4439
|
return { svg: commands.join(" "), endX: x, endY: y };
|
|
4252
4440
|
}
|
|
4253
|
-
const
|
|
4254
|
-
const
|
|
4255
|
-
|
|
4256
|
-
|
|
4257
|
-
|
|
4258
|
-
|
|
4259
|
-
|
|
4441
|
+
const visualStart = angleToRadians(stAng);
|
|
4442
|
+
const visualSweep = angleToRadians(swAng);
|
|
4443
|
+
let startRad = visualStart;
|
|
4444
|
+
let endRad = visualStart + visualSweep;
|
|
4445
|
+
if (!parametric) {
|
|
4446
|
+
startRad = visualToParametric(visualStart, wR, hR);
|
|
4447
|
+
endRad = visualToParametric(visualStart + visualSweep, wR, hR);
|
|
4448
|
+
const direction = Math.sign(swAng);
|
|
4449
|
+
while ((endRad - startRad) * direction < 0) {
|
|
4450
|
+
endRad += direction * 2 * Math.PI;
|
|
4451
|
+
}
|
|
4452
|
+
while (Math.abs(endRad - startRad) > Math.abs(visualSweep) + Math.PI) {
|
|
4453
|
+
endRad -= direction * 2 * Math.PI;
|
|
4454
|
+
}
|
|
4455
|
+
}
|
|
4456
|
+
const sweepRad = endRad - startRad;
|
|
4457
|
+
const outWR = wR * scaleX;
|
|
4458
|
+
const outHR = hR * scaleY;
|
|
4459
|
+
const cx = penX - outWR * Math.cos(startRad);
|
|
4460
|
+
const cy = penY - outHR * Math.sin(startRad);
|
|
4461
|
+
const endX = cx + outWR * Math.cos(endRad);
|
|
4462
|
+
const endY = cy + outHR * Math.sin(endRad);
|
|
4260
4463
|
const largeArc = Math.abs(sweepRad) > Math.PI ? 1 : 0;
|
|
4261
4464
|
const sweep = sweepRad > 0 ? 1 : 0;
|
|
4262
|
-
const rx = Math.round(
|
|
4263
|
-
const ry = Math.round(
|
|
4465
|
+
const rx = Math.round(outWR * 1e3) / 1e3;
|
|
4466
|
+
const ry = Math.round(outHR * 1e3) / 1e3;
|
|
4264
4467
|
const ex = Math.round(endX * 1e3) / 1e3;
|
|
4265
4468
|
const ey = Math.round(endY * 1e3) / 1e3;
|
|
4266
4469
|
return {
|
|
@@ -4282,12 +4485,14 @@ function drawingPathData(path, width, height) {
|
|
|
4282
4485
|
for (const command of path.commands) {
|
|
4283
4486
|
if (command.op === "A") {
|
|
4284
4487
|
const arc = ooxmlArcToSvg(
|
|
4285
|
-
command.wR
|
|
4286
|
-
command.hR
|
|
4488
|
+
command.wR,
|
|
4489
|
+
command.hR,
|
|
4287
4490
|
command.startAngle * 6e4,
|
|
4288
4491
|
command.swingAngle * 6e4,
|
|
4289
4492
|
px,
|
|
4290
|
-
py
|
|
4493
|
+
py,
|
|
4494
|
+
sx,
|
|
4495
|
+
sy
|
|
4291
4496
|
);
|
|
4292
4497
|
if (arc) {
|
|
4293
4498
|
out.push(arc.svg);
|
|
@@ -4566,6 +4771,57 @@ function applyPictureHslPixels(data, effect) {
|
|
|
4566
4771
|
}
|
|
4567
4772
|
}
|
|
4568
4773
|
|
|
4774
|
+
// drawingml/dash-pattern.ts
|
|
4775
|
+
var PRESET_PATTERNS = {
|
|
4776
|
+
dash: [4, 3],
|
|
4777
|
+
dot: [1, 3],
|
|
4778
|
+
lgDash: [8, 3],
|
|
4779
|
+
dashDot: [4, 3, 1, 3],
|
|
4780
|
+
lgDashDot: [8, 3, 1, 3],
|
|
4781
|
+
lgDashDotDot: [8, 3, 1, 3, 1, 3],
|
|
4782
|
+
sysDash: [3, 1],
|
|
4783
|
+
sysDot: [1, 1],
|
|
4784
|
+
sysDashDot: [3, 1, 1, 1],
|
|
4785
|
+
sysDashDotDot: [3, 1, 1, 1, 1, 1]
|
|
4786
|
+
};
|
|
4787
|
+
var CUSTOM_DASH_UNIT = 1e5;
|
|
4788
|
+
var FALLBACK_CUSTOM_PATTERN = [3, 2];
|
|
4789
|
+
function dashPenWidth(strokeWidth) {
|
|
4790
|
+
if (!Number.isFinite(strokeWidth) || strokeWidth <= 1) return 1;
|
|
4791
|
+
return Math.max(1, Math.ceil(strokeWidth - 0.5));
|
|
4792
|
+
}
|
|
4793
|
+
function dashPatternUnits(dashType, customSegments) {
|
|
4794
|
+
if (!dashType || dashType === "solid") return void 0;
|
|
4795
|
+
if (dashType === "custom") {
|
|
4796
|
+
const pattern = (customSegments ?? []).flatMap((seg) => [
|
|
4797
|
+
Math.max(0, seg.dash) / CUSTOM_DASH_UNIT,
|
|
4798
|
+
Math.max(0, seg.space) / CUSTOM_DASH_UNIT
|
|
4799
|
+
]);
|
|
4800
|
+
return pattern.some((n2) => n2 > 0) ? pattern : FALLBACK_CUSTOM_PATTERN;
|
|
4801
|
+
}
|
|
4802
|
+
return PRESET_PATTERNS[dashType];
|
|
4803
|
+
}
|
|
4804
|
+
function isDashedStroke(dashType) {
|
|
4805
|
+
return dashType !== void 0 && dashType !== "solid" && dashType !== "";
|
|
4806
|
+
}
|
|
4807
|
+
function capCompensatedDashArray(pattern, strokeWidth, lineCap) {
|
|
4808
|
+
const pen = dashPenWidth(strokeWidth);
|
|
4809
|
+
const round = lineCap === "rnd";
|
|
4810
|
+
const out = [];
|
|
4811
|
+
for (let i = 0; i < pattern.length; i += 1) {
|
|
4812
|
+
const len = (pattern[i] ?? 0) * pen;
|
|
4813
|
+
if (!round) {
|
|
4814
|
+
out.push(len);
|
|
4815
|
+
} else if (i % 2 === 0) {
|
|
4816
|
+
out.push(Math.max(0, len - pen));
|
|
4817
|
+
} else {
|
|
4818
|
+
const dash = (pattern[i - 1] ?? 0) * pen;
|
|
4819
|
+
out.push(len + (dash - Math.max(0, dash - pen)));
|
|
4820
|
+
}
|
|
4821
|
+
}
|
|
4822
|
+
return out.map((n2) => Number(n2.toFixed(4))).join(" ");
|
|
4823
|
+
}
|
|
4824
|
+
|
|
4569
4825
|
exports.ARTISTIC_PRIMARY_ATTRIBUTE = ARTISTIC_PRIMARY_ATTRIBUTE;
|
|
4570
4826
|
exports.BODY_PROPERTIES_ORDER = BODY_PROPERTIES_ORDER;
|
|
4571
4827
|
exports.DEFAULT_THEME_COLOR_MAP = DEFAULT_THEME_COLOR_MAP;
|
|
@@ -4586,8 +4842,14 @@ exports.attributeReader = attributeReader;
|
|
|
4586
4842
|
exports.booleanAttribute = booleanAttribute;
|
|
4587
4843
|
exports.buildImageBiLevelTable = buildImageBiLevelTable;
|
|
4588
4844
|
exports.buildImageLuminanceTransfer = buildImageLuminanceTransfer;
|
|
4845
|
+
exports.buildOutlinePathGradientSvg = buildOutlinePathGradientSvg;
|
|
4846
|
+
exports.buildRectPathGradientExactSvg = buildRectPathGradientExactSvg;
|
|
4589
4847
|
exports.buildRectPathGradientImage = buildRectPathGradientImage;
|
|
4590
4848
|
exports.buildRectPathGradientSvg = buildRectPathGradientSvg;
|
|
4849
|
+
exports.capCompensatedDashArray = capCompensatedDashArray;
|
|
4850
|
+
exports.closedSubpaths = closedSubpaths;
|
|
4851
|
+
exports.dashPatternUnits = dashPatternUnits;
|
|
4852
|
+
exports.dashPenWidth = dashPenWidth;
|
|
4591
4853
|
exports.descendants = descendants;
|
|
4592
4854
|
exports.drawingColorBrightness = drawingColorBrightness;
|
|
4593
4855
|
exports.drawingColorCss = drawingColorCss;
|
|
@@ -4605,9 +4867,11 @@ exports.drawingRunPropertiesXml = drawingRunPropertiesXml;
|
|
|
4605
4867
|
exports.drawingThemeFormatSchemeXml = drawingThemeFormatSchemeXml;
|
|
4606
4868
|
exports.drawingThemeXml = drawingThemeXml;
|
|
4607
4869
|
exports.fillElementOf = fillElementOf;
|
|
4870
|
+
exports.gradientColorAt = gradientColorAt;
|
|
4608
4871
|
exports.imageContentType = imageContentType;
|
|
4609
4872
|
exports.inspectRasterImage = inspectRasterImage;
|
|
4610
4873
|
exports.integerAttribute = integerAttribute;
|
|
4874
|
+
exports.isDashedStroke = isDashedStroke;
|
|
4611
4875
|
exports.isThemeColorSlot = isThemeColorSlot;
|
|
4612
4876
|
exports.officeGradientPresetFill = officeGradientPresetFill;
|
|
4613
4877
|
exports.officeGradientPresetId = officeGradientPresetId;
|
|
@@ -4665,7 +4929,9 @@ exports.resolveSchemeColor = resolveSchemeColor;
|
|
|
4665
4929
|
exports.resolveThemeEffectStyle = resolveThemeEffectStyle;
|
|
4666
4930
|
exports.resolveThemeFillStyle = resolveThemeFillStyle;
|
|
4667
4931
|
exports.resolveThemeLineStyle = resolveThemeLineStyle;
|
|
4932
|
+
exports.scalePathAbout = scalePathAbout;
|
|
4668
4933
|
exports.setDrawingFillXml = setDrawingFillXml;
|
|
4934
|
+
exports.shapePathGradientField = shapePathGradientField;
|
|
4669
4935
|
exports.stringAttribute = stringAttribute;
|
|
4670
4936
|
exports.substituteDrawingPlaceholder = substituteDrawingPlaceholder;
|
|
4671
4937
|
exports.svgDropShadowElement = svgDropShadowElement;
|
|
@@ -18,6 +18,7 @@ export * from './write-theme.js';
|
|
|
18
18
|
export * from './gradient-presets.js';
|
|
19
19
|
export * from './gradient-geometry.js';
|
|
20
20
|
export * from './rect-path-gradient.js';
|
|
21
|
+
export * from './shape-path-gradient.js';
|
|
21
22
|
export * from './theme-model.js';
|
|
22
23
|
export * from './theme.js';
|
|
23
24
|
export * from './format-scheme.js';
|
|
@@ -45,4 +46,6 @@ export * from './picture-artistic.js';
|
|
|
45
46
|
export { inspectRasterImage, RasterImageError, RASTER_IMAGE_LIMITS } from './raster-image.js';
|
|
46
47
|
export type { RasterImageInfo, RasterImageOptions, RasterImageErrorCode } from './raster-image.js';
|
|
47
48
|
export * from './picture-hsl-pixels.js';
|
|
49
|
+
export { capCompensatedDashArray, dashPatternUnits, dashPenWidth, isDashedStroke, } from './dash-pattern.js';
|
|
50
|
+
export type { DashSegmentInput } from './dash-pattern.js';
|
|
48
51
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../drawingml/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC;AACxB,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,eAAe,GACf,MAAM,OAAO,CAAC;AACf,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,OAAO,EACN,gBAAgB,EAChB,qBAAqB,EACrB,yBAAyB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAElC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3F,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAChG,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../drawingml/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC;AACxB,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,eAAe,GACf,MAAM,OAAO,CAAC;AACf,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,OAAO,EACN,gBAAgB,EAChB,qBAAqB,EACrB,yBAAyB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAElC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3F,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAChG,cAAc,sBAAsB,CAAC;AAErC,OAAO,EACN,uBAAuB,EACvB,gBAAgB,EAChB,YAAY,EACZ,cAAc,GACd,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC"}
|