ooxml-core 1.31.0 → 1.32.1

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.
Files changed (123) hide show
  1. package/dist/{PptxHandler-KKLAYUGQ.mjs → PptxHandler-QY5VL3CY.mjs} +2 -2
  2. package/dist/PptxHandler-SJ5ZUIUX.mjs +4 -0
  3. package/dist/{PptxHandler-DHQPVTUI.cjs → PptxHandler-TESZUH66.cjs} +3 -3
  4. package/dist/{PresentationBuilder-YYZYCKTZ.mjs → PresentationBuilder-3CH5TR4W.mjs} +2 -2
  5. package/dist/{PresentationBuilder-JORMF5CP.cjs → PresentationBuilder-5NFBUP7Y.cjs} +5 -5
  6. package/dist/{PresentationBuilder-Q2Z33LLM.mjs → PresentationBuilder-S6HXHKEJ.mjs} +2 -2
  7. package/dist/automation/index.cjs +862 -389
  8. package/dist/automation/index.mjs +862 -389
  9. package/dist/{chunk-GJDFCP2T.mjs → chunk-3H5UAJB3.mjs} +258 -155
  10. package/dist/{chunk-MKDONWNO.mjs → chunk-4R65YYAD.mjs} +32 -14
  11. package/dist/{chunk-KWJYMAEF.mjs → chunk-IOTGRLJH.mjs} +255 -152
  12. package/dist/{chunk-6FXOAMNL.mjs → chunk-N6424WKA.mjs} +1 -1
  13. package/dist/{chunk-WZJ25K7P.mjs → chunk-NAWLWKOJ.mjs} +1 -1
  14. package/dist/{chunk-DJ3CDTMX.mjs → chunk-O7SVHLD7.mjs} +23 -5
  15. package/dist/{chunk-CZXM4ZJH.cjs → chunk-Q6NM64J2.cjs} +23 -4
  16. package/dist/{chunk-FFJBOR2Y.mjs → chunk-UYMSFJQZ.mjs} +76 -4
  17. package/dist/{chunk-B4LXDHBX.cjs → chunk-X6VNUBES.cjs} +1419 -1316
  18. package/dist/diagram/index.cjs +8 -4
  19. package/dist/diagram/index.mjs +8 -4
  20. package/dist/docx/embedded.cjs +8 -4
  21. package/dist/docx/embedded.mjs +8 -4
  22. package/dist/docx/index.cjs +8 -4
  23. package/dist/docx/index.mjs +8 -4
  24. package/dist/docx/layout/index.cjs +8 -4
  25. package/dist/docx/layout/index.mjs +8 -4
  26. package/dist/docx/load/index.cjs +8 -4
  27. package/dist/docx/load/index.mjs +8 -4
  28. package/dist/docx/ui/index.cjs +8 -4
  29. package/dist/docx/ui/index.mjs +8 -4
  30. package/dist/geometry/index.cjs +16 -12
  31. package/dist/geometry/index.mjs +16 -12
  32. package/dist/geometry/preset-shape-definitions-table.d.ts.map +1 -1
  33. package/dist/index.cjs +16 -12
  34. package/dist/index.mjs +16 -12
  35. package/dist/pptx/automation/index.cjs +294 -157
  36. package/dist/pptx/automation/index.d.ts +3 -3
  37. package/dist/pptx/automation/index.mjs +5 -5
  38. package/dist/pptx/chunks/{index-PdM5zpmu.d.ts → index-D-FdgqrP.d.ts} +102 -3
  39. package/dist/pptx/chunks/index-D-FdgqrP.d.ts.map +1 -0
  40. package/dist/pptx/chunks/{index-BQDcu_0a.d.ts → index-DKybuHPT.d.ts} +51 -3
  41. package/dist/pptx/chunks/{index-BQDcu_0a.d.ts.map → index-DKybuHPT.d.ts.map} +1 -1
  42. package/dist/pptx/chunks/{index-CBV1oHN7.d.ts → index-DnWlmYCy.d.ts} +2 -2
  43. package/dist/pptx/chunks/{index-CBV1oHN7.d.ts.map → index-DnWlmYCy.d.ts.map} +1 -1
  44. package/dist/pptx/cli/index.cjs +294 -157
  45. package/dist/pptx/cli/index.mjs +4 -4
  46. package/dist/pptx/converter/index.cjs +8 -4
  47. package/dist/pptx/converter/index.d.ts +1 -1
  48. package/dist/pptx/converter/index.mjs +2 -2
  49. package/dist/pptx/editor/render/find-replace.cjs +14 -14
  50. package/dist/pptx/editor/render/find-replace.d.ts +1 -1
  51. package/dist/pptx/editor/render/find-replace.mjs +1 -1
  52. package/dist/pptx/editor/render/slide-operations.cjs +8 -8
  53. package/dist/pptx/editor/render/slide-operations.mjs +2 -2
  54. package/dist/pptx/index.cjs +380 -171
  55. package/dist/pptx/index.d.ts +4 -4
  56. package/dist/pptx/index.mjs +5 -5
  57. package/dist/pptx/node/index.d.ts +1 -1
  58. package/dist/teams/chat-view.d.ts +10 -1
  59. package/dist/teams/chat-view.d.ts.map +1 -1
  60. package/dist/teams/index.cjs +805 -144
  61. package/dist/teams/index.d.ts +1 -0
  62. package/dist/teams/index.d.ts.map +1 -1
  63. package/dist/teams/index.mjs +795 -145
  64. package/dist/teams/presence-controller.d.ts +18 -3
  65. package/dist/teams/presence-controller.d.ts.map +1 -1
  66. package/dist/teams/presence-meetings.d.ts +21 -0
  67. package/dist/teams/presence-meetings.d.ts.map +1 -0
  68. package/dist/teams/presence.d.ts +40 -2
  69. package/dist/teams/presence.d.ts.map +1 -1
  70. package/dist/teams/store.d.ts +5 -0
  71. package/dist/teams/store.d.ts.map +1 -1
  72. package/dist/teams/view.d.ts +5 -0
  73. package/dist/teams/view.d.ts.map +1 -1
  74. package/dist/teams/workspace.d.ts +5 -2
  75. package/dist/teams/workspace.d.ts.map +1 -1
  76. package/dist/visio/index.cjs +6 -1
  77. package/dist/visio/index.mjs +6 -1
  78. package/dist/visio/ui/index.cjs +6 -1
  79. package/dist/visio/ui/index.mjs +6 -1
  80. package/dist/xlsx/formula/ets-drift-compare.d.ts +19 -0
  81. package/dist/xlsx/formula/ets-drift-compare.d.ts.map +1 -0
  82. package/dist/xlsx/formula/ets-excel-compare.d.ts +12 -0
  83. package/dist/xlsx/formula/ets-excel-compare.d.ts.map +1 -1
  84. package/dist/xlsx/formula/ets-init-compare.d.ts +24 -0
  85. package/dist/xlsx/formula/ets-init-compare.d.ts.map +1 -0
  86. package/dist/xlsx/formula/ets-init-maps.d.ts +21 -0
  87. package/dist/xlsx/formula/ets-init-maps.d.ts.map +1 -0
  88. package/dist/xlsx/formula/functions/ets-core.d.ts +1 -1
  89. package/dist/xlsx/formula/functions/ets-core.d.ts.map +1 -1
  90. package/dist/xlsx/formula/functions/ets-init-chain.d.ts +11 -0
  91. package/dist/xlsx/formula/functions/ets-init-chain.d.ts.map +1 -0
  92. package/dist/xlsx/formula/functions/ets-init-four.d.ts +3 -0
  93. package/dist/xlsx/formula/functions/ets-init-four.d.ts.map +1 -0
  94. package/dist/xlsx/formula/functions/ets-init-short.d.ts +17 -0
  95. package/dist/xlsx/formula/functions/ets-init-short.d.ts.map +1 -0
  96. package/dist/xlsx/formula/functions/ets-init-states.d.ts +5 -0
  97. package/dist/xlsx/formula/functions/ets-init-states.d.ts.map +1 -0
  98. package/dist/xlsx/formula/functions/ets-init-three.d.ts +23 -0
  99. package/dist/xlsx/formula/functions/ets-init-three.d.ts.map +1 -0
  100. package/dist/xlsx/formula/functions/ets-init-threeplus.d.ts +13 -0
  101. package/dist/xlsx/formula/functions/ets-init-threeplus.d.ts.map +1 -0
  102. package/dist/xlsx/formula/functions/ets-init.d.ts +18 -0
  103. package/dist/xlsx/formula/functions/ets-init.d.ts.map +1 -1
  104. package/dist/xlsx/formula/functions/ets-search-map.d.ts +24 -0
  105. package/dist/xlsx/formula/functions/ets-search-map.d.ts.map +1 -0
  106. package/dist/xlsx/formula/functions/ets-search.d.ts +17 -0
  107. package/dist/xlsx/formula/functions/ets-search.d.ts.map +1 -0
  108. package/dist/xlsx/formula/functions/ets-season.d.ts +2 -2
  109. package/dist/xlsx/formula/functions/ets-season.d.ts.map +1 -1
  110. package/dist/xlsx/formula/functions/ets-validate.d.ts +16 -0
  111. package/dist/xlsx/formula/functions/ets-validate.d.ts.map +1 -0
  112. package/dist/xlsx/index.cjs +762 -289
  113. package/dist/xlsx/index.mjs +762 -289
  114. package/dist/xlsx/layout/form-control-view.d.ts.map +1 -1
  115. package/dist/xlsx/layout/shape-view.d.ts.map +1 -1
  116. package/dist/xlsx/load/index.cjs +599 -126
  117. package/dist/xlsx/load/index.mjs +599 -126
  118. package/dist/xlsx/read/form-control.d.ts.map +1 -1
  119. package/dist/xlsx/ui/index.cjs +756 -283
  120. package/dist/xlsx/ui/index.mjs +756 -283
  121. package/package.json +1 -1
  122. package/dist/PptxHandler-E4DDV3FQ.mjs +0 -4
  123. package/dist/pptx/chunks/index-PdM5zpmu.d.ts.map +0 -1
@@ -7695,7 +7695,8 @@ var init_preset_shape_definitions_table = __esm({
7695
7695
  gd16("stAng", "pin 0 adj1 21599999"),
7696
7696
  gd16("endAng", "pin 0 adj2 21599999"),
7697
7697
  gd16("swAng", "+- endAng 0 stAng"),
7698
- gd16("swAng2", "?: swAng swAng +- 21600000 swAng 0"),
7698
+ gd16("swAngWrap", "+- swAng 21600000 0"),
7699
+ gd16("swAng2", "?: swAng swAng swAngWrap"),
7699
7700
  gd16("stx", "cos wd2 stAng"),
7700
7701
  gd16("sty", "sin hd2 stAng"),
7701
7702
  gd16("x1", "+- hc stx 0"),
@@ -7740,7 +7741,8 @@ var init_preset_shape_definitions_table = __esm({
7740
7741
  gd16("stAng", "pin 0 adj1 21599999"),
7741
7742
  gd16("endAng", "pin 0 adj2 21599999"),
7742
7743
  gd16("swAng", "+- endAng 0 stAng"),
7743
- gd16("swAng2", "?: swAng swAng +- 21600000 swAng 0"),
7744
+ gd16("swAngWrap", "+- swAng 21600000 0"),
7745
+ gd16("swAng2", "?: swAng swAng swAngWrap"),
7744
7746
  gd16("stx", "cos wd2 stAng"),
7745
7747
  gd16("sty", "sin hd2 stAng"),
7746
7748
  gd16("x1", "+- hc stx 0"),
@@ -7764,7 +7766,8 @@ var init_preset_shape_definitions_table = __esm({
7764
7766
  gd16("stAng", "pin 0 adj1 21599999"),
7765
7767
  gd16("endAng", "pin 0 adj2 21599999"),
7766
7768
  gd16("swAng", "+- endAng 0 stAng"),
7767
- gd16("swAng2", "?: swAng swAng +- 21600000 swAng 0"),
7769
+ gd16("swAngWrap", "+- swAng 21600000 0"),
7770
+ gd16("swAng2", "?: swAng swAng swAngWrap"),
7768
7771
  gd16("stx", "cos wd2 stAng"),
7769
7772
  gd16("sty", "sin hd2 stAng"),
7770
7773
  gd16("x1", "+- hc stx 0"),
@@ -7859,7 +7862,8 @@ var init_preset_shape_definitions_table = __esm({
7859
7862
  gd16("iwd2", "+- wd2 0 thw"),
7860
7863
  gd16("ihd2", "+- hd2 0 thh2"),
7861
7864
  gd16("swAng", "+- endAng 0 stAng"),
7862
- gd16("swAng2", "?: swAng swAng +- 21600000 swAng 0"),
7865
+ gd16("swAngWrap", "+- swAng 21600000 0"),
7866
+ gd16("swAng2", "?: swAng swAng swAngWrap"),
7863
7867
  gd16("mswAng", "+- 0 0 swAng2"),
7864
7868
  gd16("stx", "cos wd2 stAng"),
7865
7869
  gd16("sty", "sin hd2 stAng"),
@@ -48800,9 +48804,23 @@ function reorderObjectKeysByLocalName(obj, schemaOrder) {
48800
48804
  }
48801
48805
  return result;
48802
48806
  }
48803
- var EFFECT_LST_ORDER, SP_PR_ORDER2, TC_PR_BORDERS_ORDER, BLIP_FILL_ORDER, PRESENTATION_CHILD_ORDER, SHAPE_STYLE_ORDER;
48807
+ var LN_CHILD_ORDER, EFFECT_LST_ORDER, SP_PR_ORDER2, TC_PR_BORDERS_ORDER, BLIP_FILL_ORDER, PRESENTATION_CHILD_ORDER, SHAPE_STYLE_ORDER;
48804
48808
  var init_xml_reorder = __esm({
48805
48809
  "pptx/core/utils/xml-reorder.ts"() {
48810
+ LN_CHILD_ORDER = [
48811
+ "a:noFill",
48812
+ "a:solidFill",
48813
+ "a:gradFill",
48814
+ "a:pattFill",
48815
+ "a:prstDash",
48816
+ "a:custDash",
48817
+ "a:round",
48818
+ "a:bevel",
48819
+ "a:miter",
48820
+ "a:headEnd",
48821
+ "a:tailEnd",
48822
+ "a:extLst"
48823
+ ];
48806
48824
  EFFECT_LST_ORDER = [
48807
48825
  "a:blur",
48808
48826
  "a:fillOverlay",
@@ -54723,11 +54741,7 @@ var init_chart_layout_operations = __esm({
54723
54741
  }
54724
54742
  });
54725
54743
 
54726
- // pptx/core/builders/sdk/ElementFactory.ts
54727
- function generateId(prefix) {
54728
- idCounter += 1;
54729
- return `${prefix}_${Date.now().toString(36)}_${idCounter}`;
54730
- }
54744
+ // pptx/core/builders/sdk/shape-style-input.ts
54731
54745
  function mapFillToShapeStyle(fill3) {
54732
54746
  if (!fill3) {
54733
54747
  return {};
@@ -54743,18 +54757,24 @@ function mapFillToShapeStyle(fill3) {
54743
54757
  case "gradient":
54744
54758
  return {
54745
54759
  fillMode: "gradient",
54746
- fillGradientType: fill3.gradientType ?? "linear",
54760
+ fillGradientType: fill3.path ? "radial" : fill3.gradientType ?? "linear",
54747
54761
  fillGradientAngle: fill3.angle ?? 0,
54748
54762
  fillGradientStops: fill3.stops.map((s) => ({
54749
54763
  color: s.color,
54750
54764
  position: s.position,
54751
54765
  opacity: s.opacity
54752
- }))
54766
+ })),
54767
+ ...fill3.path ? { fillGradientPathType: fill3.path } : {},
54768
+ ...fill3.focus ? { fillGradientFillToRect: { ...fill3.focus } } : {},
54769
+ ...fill3.tile ? { fillGradientTileRect: { ...fill3.tile } } : {},
54770
+ ...fill3.scaled !== void 0 ? { fillGradientScaled: fill3.scaled } : {},
54771
+ ...fill3.rotWithShape !== void 0 ? { fillGradientRotWithShape: fill3.rotWithShape } : {}
54753
54772
  };
54754
54773
  case "pattern":
54755
54774
  return {
54756
54775
  fillMode: "pattern",
54757
54776
  fillPatternPreset: fill3.preset,
54777
+ ...fill3.foreground !== void 0 ? { fillColor: fill3.foreground } : {},
54758
54778
  fillPatternBackgroundColor: fill3.background
54759
54779
  };
54760
54780
  case "image":
@@ -54769,18 +54789,64 @@ function mapFillToShapeStyle(fill3) {
54769
54789
  return {};
54770
54790
  }
54771
54791
  }
54792
+ function customDashSegments(lengths, width) {
54793
+ const values = lengths.length % 2 === 1 ? [...lengths, ...lengths] : lengths;
54794
+ const segments = [];
54795
+ for (let i2 = 0; i2 + 1 < values.length; i2 += 2) {
54796
+ segments.push({
54797
+ dash: Math.max(0, Math.round(values[i2] / width * DASH_UNITS_PER_WIDTH)),
54798
+ space: Math.max(0, Math.round(values[i2 + 1] / width * DASH_UNITS_PER_WIDTH))
54799
+ });
54800
+ }
54801
+ return segments;
54802
+ }
54803
+ function mapStrokeDash(stroke) {
54804
+ if (!Array.isArray(stroke.dash)) {
54805
+ return { strokeDash: stroke.dash };
54806
+ }
54807
+ const width = stroke.width !== void 0 && stroke.width > 0 ? stroke.width : 1;
54808
+ return {
54809
+ strokeDash: "custom",
54810
+ customDashSegments: customDashSegments(stroke.dash, width)
54811
+ };
54812
+ }
54772
54813
  function mapStrokeToShapeStyle(stroke) {
54773
54814
  if (!stroke) {
54774
54815
  return {};
54775
54816
  }
54817
+ const lineJoin = stroke.join ?? (stroke.miterLimit !== void 0 ? "miter" : void 0);
54818
+ const miterLimit = lineJoin === "miter" ? stroke.miterLimit : void 0;
54776
54819
  return {
54777
54820
  strokeColor: stroke.color,
54778
54821
  strokeWidth: stroke.width,
54779
- strokeDash: stroke.dash,
54822
+ ...mapStrokeDash(stroke),
54780
54823
  strokeOpacity: stroke.opacity,
54781
- lineJoin: stroke.join,
54824
+ lineJoin,
54782
54825
  lineCap: stroke.cap,
54783
- ...stroke.themeColorRef ? { strokeColorRef: stroke.themeColorRef } : {}
54826
+ ...stroke.themeColorRef ? { strokeColorRef: stroke.themeColorRef } : {},
54827
+ ...miterLimit !== void 0 ? { miterLimit: Math.round(miterLimit * MITER_UNITS_PER_RATIO) } : {},
54828
+ ...stroke.compound ? { compoundLine: stroke.compound } : {},
54829
+ ...stroke.align ? { lineAlignment: stroke.align } : {},
54830
+ ...stroke.headEnd ? {
54831
+ connectorStartArrow: stroke.headEnd.type,
54832
+ connectorStartArrowWidth: stroke.headEnd.width,
54833
+ connectorStartArrowLength: stroke.headEnd.length
54834
+ } : {},
54835
+ ...stroke.tailEnd ? {
54836
+ connectorEndArrow: stroke.tailEnd.type,
54837
+ connectorEndArrowWidth: stroke.tailEnd.width,
54838
+ connectorEndArrowLength: stroke.tailEnd.length
54839
+ } : {}
54840
+ };
54841
+ }
54842
+ function connectorLineEndOverride(end, type) {
54843
+ if (type === void 0) {
54844
+ return {};
54845
+ }
54846
+ return {
54847
+ [`connector${end}Arrow`]: type,
54848
+ [`connector${end}ArrowWidth`]: void 0,
54849
+ [`connector${end}ArrowLength`]: void 0
54784
54850
  };
54785
54851
  }
54786
54852
  function mapShadowToShapeStyle(shadow) {
@@ -54795,14 +54861,77 @@ function mapShadowToShapeStyle(shadow) {
54795
54861
  shadowOpacity: shadow.opacity ?? 0.4
54796
54862
  };
54797
54863
  }
54864
+ function mapInnerShadowToShapeStyle(shadow) {
54865
+ if (!shadow) {
54866
+ return {};
54867
+ }
54868
+ return {
54869
+ innerShadowColor: shadow.color ?? "#000000",
54870
+ innerShadowBlur: shadow.blur,
54871
+ innerShadowOffsetX: shadow.offsetX,
54872
+ innerShadowOffsetY: shadow.offsetY,
54873
+ innerShadowOpacity: shadow.opacity
54874
+ };
54875
+ }
54876
+ function mapGlowToShapeStyle(glow) {
54877
+ if (!glow) {
54878
+ return {};
54879
+ }
54880
+ return { glowColor: glow.color, glowRadius: glow.radius, glowOpacity: glow.opacity ?? 1 };
54881
+ }
54882
+ function mapReflectionToShapeStyle(reflection) {
54883
+ if (!reflection) {
54884
+ return {};
54885
+ }
54886
+ return {
54887
+ reflectionBlurRadius: reflection.blur,
54888
+ reflectionDistance: reflection.distance,
54889
+ reflectionStartOpacity: reflection.startOpacity ?? 0.5,
54890
+ reflectionEndOpacity: reflection.endOpacity ?? 0,
54891
+ reflectionEndPosition: reflection.endPosition ?? 0.9,
54892
+ // PowerPoint's reflection presets: a mirror image below the shape.
54893
+ reflectionDirection: 90,
54894
+ reflectionScaleY: -1e5,
54895
+ reflectionAlignment: "bl",
54896
+ reflectionRotateWithShape: false
54897
+ };
54898
+ }
54798
54899
  function buildShapeStyle(opts) {
54799
54900
  const parts = {
54800
54901
  ...mapFillToShapeStyle(opts.fill),
54801
54902
  ...mapStrokeToShapeStyle(opts.stroke),
54802
- ...mapShadowToShapeStyle(opts.shadow)
54903
+ ...mapShadowToShapeStyle(opts.shadow),
54904
+ ...mapInnerShadowToShapeStyle(opts.innerShadow),
54905
+ ...mapGlowToShapeStyle(opts.glow),
54906
+ ...opts.softEdge !== void 0 ? { softEdgeRadius: opts.softEdge } : {},
54907
+ ...mapReflectionToShapeStyle(opts.reflection)
54803
54908
  };
54804
54909
  return Object.keys(parts).length > 0 ? parts : void 0;
54805
54910
  }
54911
+ var DASH_UNITS_PER_WIDTH, MITER_UNITS_PER_RATIO;
54912
+ var init_shape_style_input = __esm({
54913
+ "pptx/core/builders/sdk/shape-style-input.ts"() {
54914
+ DASH_UNITS_PER_WIDTH = 1e5;
54915
+ MITER_UNITS_PER_RATIO = 1e5;
54916
+ }
54917
+ });
54918
+
54919
+ // pptx/core/builders/sdk/ElementFactory.ts
54920
+ function generateId(prefix) {
54921
+ idCounter += 1;
54922
+ return `${prefix}_${Date.now().toString(36)}_${idCounter}`;
54923
+ }
54924
+ function effectInputs(options2, fill3) {
54925
+ return {
54926
+ fill: fill3,
54927
+ stroke: options2?.stroke,
54928
+ shadow: options2?.shadow,
54929
+ innerShadow: options2?.innerShadow,
54930
+ glow: options2?.glow,
54931
+ softEdge: options2?.softEdge,
54932
+ reflection: options2?.reflection
54933
+ };
54934
+ }
54806
54935
  function mapTextStyleInput(opts) {
54807
54936
  if (!opts) {
54808
54937
  return {};
@@ -54904,11 +55033,7 @@ function createTextElement(text2, options2) {
54904
55033
  text: plainText,
54905
55034
  textStyle: mapTextStyleInput(textStyleBase),
54906
55035
  textSegments: buildTextSegments(text2, textStyleBase),
54907
- shapeStyle: buildShapeStyle({
54908
- fill: options2?.fill,
54909
- stroke: options2?.stroke,
54910
- shadow: options2?.shadow
54911
- })
55036
+ shapeStyle: buildShapeStyle(effectInputs(options2, options2?.fill))
54912
55037
  };
54913
55038
  }
54914
55039
  function createShapeElement(shapeType, options2) {
@@ -54921,11 +55046,9 @@ function createShapeElement(shapeType, options2) {
54921
55046
  opacity: options2?.opacity,
54922
55047
  shapeType,
54923
55048
  shapeAdjustments: options2?.adjustments,
54924
- shapeStyle: buildShapeStyle({
54925
- fill: options2?.fill ?? { type: "solid", color: "#4472C4" },
54926
- stroke: options2?.stroke,
54927
- shadow: options2?.shadow
54928
- })
55049
+ shapeStyle: buildShapeStyle(
55050
+ effectInputs(options2, options2?.fill ?? { type: "solid", color: "#4472C4" })
55051
+ )
54929
55052
  };
54930
55053
  if (options2?.text) {
54931
55054
  el.text = options2.text;
@@ -54937,11 +55060,19 @@ function createShapeElement(shapeType, options2) {
54937
55060
  function createConnectorElement(options2) {
54938
55061
  const p = pos("connector", options2);
54939
55062
  const connType = options2?.type === "bent" ? "bentConnector3" : options2?.type === "curved" ? "curvedConnector3" : "straightConnector1";
55063
+ const strokeInput = options2?.stroke;
55064
+ const stroke = mapStrokeToShapeStyle({
55065
+ ...strokeInput,
55066
+ color: strokeInput?.color ?? "#000000",
55067
+ width: strokeInput?.width ?? 1
55068
+ });
54940
55069
  const style = {
54941
- ...mapStrokeToShapeStyle(options2?.stroke ?? { color: "#000000", width: 1 }),
54942
- connectorStartArrow: options2?.startArrow ?? "none",
54943
- connectorEndArrow: options2?.endArrow ?? "none"
55070
+ ...stroke,
55071
+ ...connectorLineEndOverride("Start", options2?.startArrow),
55072
+ ...connectorLineEndOverride("End", options2?.endArrow)
54944
55073
  };
55074
+ style.connectorStartArrow ??= "none";
55075
+ style.connectorEndArrow ??= "none";
54945
55076
  if (options2?.from) {
54946
55077
  style.connectorStartConnection = {
54947
55078
  shapeId: options2.from.elementId,
@@ -55121,9 +55252,8 @@ function createFreeformElement(pathData, options2) {
55121
55252
  pathHeight,
55122
55253
  customGeometryPaths,
55123
55254
  shapeStyle: buildShapeStyle({
55124
- fill: options2?.fill ?? { type: "none" },
55125
- stroke: options2?.stroke ?? { color: "#000000", width: 2 },
55126
- shadow: options2?.shadow
55255
+ ...effectInputs(options2, options2?.fill ?? { type: "none" }),
55256
+ stroke: options2?.stroke ?? { color: "#000000", width: 2 }
55127
55257
  })
55128
55258
  };
55129
55259
  if (options2?.text) {
@@ -55140,6 +55270,7 @@ var init_ElementFactory = __esm({
55140
55270
  init_custom_geometry();
55141
55271
  init_chart_gradient_input();
55142
55272
  init_chart_layout_operations();
55273
+ init_shape_style_input();
55143
55274
  idCounter = 0;
55144
55275
  DEFAULTS = {
55145
55276
  text: { x: 100, y: 100, width: 600, height: 50 },
@@ -56192,7 +56323,8 @@ var init_ConnectorXmlFactory = __esm({
56192
56323
  const { element: element2 } = init;
56193
56324
  const geometry = element2.shapeType && element2.shapeType !== "line" ? this.context.normalizePresetGeometry(element2.shapeType) : "straightConnector1";
56194
56325
  const strokeColor = element2.shapeStyle?.strokeColor || "#1F2937";
56195
- const strokeWidth = Math.max(1, element2.shapeStyle?.strokeWidth || 1);
56326
+ const requestedWidth = element2.shapeStyle?.strokeWidth;
56327
+ const strokeWidth = requestedWidth !== void 0 && requestedWidth > 0 ? requestedWidth : 1;
56196
56328
  const lineNode = {
56197
56329
  "@_w": String(Math.round(strokeWidth * this.context.emuPerPx))
56198
56330
  };
@@ -60562,6 +60694,7 @@ function buildReflectionXml(style, context) {
60562
60694
  const numericValues = [
60563
60695
  style.reflectionBlurRadius,
60564
60696
  style.reflectionStartOpacity,
60697
+ style.reflectionEndOpacity,
60565
60698
  style.reflectionDistance
60566
60699
  ];
60567
60700
  if (!numericValues.some((value) => typeof value === "number" && Number.isFinite(value) && value > 0)) {
@@ -114234,6 +114367,56 @@ var init_pptx_show_properties = __esm({
114234
114367
  }
114235
114368
  });
114236
114369
 
114370
+ // pptx/core/utils/cust-data-list-dom.ts
114371
+ function custDataContainer(doc) {
114372
+ const root = doc.documentElement;
114373
+ if (!root || root.namespaceURI !== NS.p) {
114374
+ return void 0;
114375
+ }
114376
+ if (root.localName === "presentation") {
114377
+ return root;
114378
+ }
114379
+ return CSLD_ROOTS.has(root.localName) ? first(root, "cSld", NS.p) : void 0;
114380
+ }
114381
+ function createPresentationElement(doc, container2, local) {
114382
+ return doc.createElementNS(NS.p, container2.prefix ? `${container2.prefix}:${local}` : local);
114383
+ }
114384
+ function ensureCustDataList(doc, container2) {
114385
+ const existing = first(container2, "custDataLst", NS.p);
114386
+ if (existing) {
114387
+ return existing;
114388
+ }
114389
+ const insertBefore4 = container2.localName === "presentation" ? PRESENTATION_INSERT_BEFORE : CSLD_INSERT_BEFORE;
114390
+ const list3 = createPresentationElement(doc, container2, "custDataLst");
114391
+ const before = elements(container2).find(
114392
+ (child32) => child32.namespaceURI === NS.p && insertBefore4.has(child32.localName)
114393
+ );
114394
+ container2.insertBefore(list3, before ?? null);
114395
+ return list3;
114396
+ }
114397
+ function listChildren(list3, local) {
114398
+ return elements(list3).filter((child32) => child32.namespaceURI === NS.p && child32.localName === local);
114399
+ }
114400
+ function removeIfEmpty(list3) {
114401
+ if (elements(list3).length === 0) {
114402
+ list3.parentNode?.removeChild(list3);
114403
+ }
114404
+ }
114405
+ var CSLD_ROOTS, PRESENTATION_INSERT_BEFORE, CSLD_INSERT_BEFORE;
114406
+ var init_cust_data_list_dom = __esm({
114407
+ "pptx/core/utils/cust-data-list-dom.ts"() {
114408
+ init_xml2();
114409
+ CSLD_ROOTS = /* @__PURE__ */ new Set(["sld", "notes", "sldLayout", "sldMaster", "handoutMaster"]);
114410
+ PRESENTATION_INSERT_BEFORE = /* @__PURE__ */ new Set([
114411
+ "kinsoku",
114412
+ "defaultTextStyle",
114413
+ "modifyVerifier",
114414
+ "extLst"
114415
+ ]);
114416
+ CSLD_INSERT_BEFORE = /* @__PURE__ */ new Set(["controls", "extLst"]);
114417
+ }
114418
+ });
114419
+
114237
114420
  // pptx/core/utils/customer-data-package.ts
114238
114421
  async function writeCustomerDataScopes(zip, scopes, codec) {
114239
114422
  let nextIndex = maxCustomXmlIndex(zip) + 1;
@@ -114243,9 +114426,9 @@ async function writeCustomerDataScopes(zip, scopes, codec) {
114243
114426
  if (!sourceXml) {
114244
114427
  continue;
114245
114428
  }
114246
- const sourceData = codec.parse(sourceXml);
114247
- const container2 = getContainer(sourceData, scope.location);
114248
- if (!container2) {
114429
+ const sourceDoc = parseXml(sourceXml, { label: scope.sourcePartPath });
114430
+ const container2 = custDataContainer(sourceDoc);
114431
+ if (!container2 || !matchesLocation(container2, scope.location)) {
114249
114432
  continue;
114250
114433
  }
114251
114434
  const relsPath2 = relsForSourcePart(scope.sourcePartPath);
@@ -114280,12 +114463,10 @@ async function writeCustomerDataScopes(zip, scopes, codec) {
114280
114463
  authoredEntries.push(rawEntry);
114281
114464
  contentTypes2.set(path4, entry2.contentType);
114282
114465
  }
114283
- const existingList = container2["p:custDataLst"] ?? {};
114284
- existingList["p:custData"] = authoredEntries;
114285
- placeCustomerDataList(container2, existingList, scope.location);
114466
+ replaceCustomerDataEntries(sourceDoc, container2, authoredEntries, codec);
114286
114467
  relsRoot["Relationship"] = relationships3;
114287
114468
  zip.file(relsPath2, codec.build(relsData));
114288
- zip.file(scope.sourcePartPath, codec.build(sourceData));
114469
+ zip.file(scope.sourcePartPath, buildXml(sourceDoc));
114289
114470
  }
114290
114471
  await upsertContentTypes(zip, codec, contentTypes2);
114291
114472
  }
@@ -114307,12 +114488,9 @@ async function resolveContentType(zip, codec, path4) {
114307
114488
  );
114308
114489
  return fallback?.["@_ContentType"] ? String(fallback["@_ContentType"]) : void 0;
114309
114490
  }
114310
- function getContainer(data, location) {
114311
- if (location === "presentation") {
114312
- return data["p:presentation"];
114313
- }
114314
- const slide = data["p:sld"];
114315
- return slide?.["p:cSld"];
114491
+ function matchesLocation(container2, location) {
114492
+ const rootName = container2.ownerDocument?.documentElement?.localName;
114493
+ return rootName === (location === "presentation" ? "presentation" : "sld");
114316
114494
  }
114317
114495
  function upsertRelationship(relationships3, entry2, target) {
114318
114496
  let relationship2 = relationships3.find(
@@ -114332,27 +114510,27 @@ function upsertRelationship(relationships3, entry2, target) {
114332
114510
  function isCustomXmlRelationship(value) {
114333
114511
  return String(value ?? "").endsWith("/relationships/customXml");
114334
114512
  }
114335
- function placeCustomerDataList(container2, list3, location) {
114336
- const insertBefore4 = location === "presentation" ? /* @__PURE__ */ new Set(["p:kinsoku", "p:defaultTextStyle", "p:modifyVerifier", "p:extLst"]) : /* @__PURE__ */ new Set(["p:controls", "p:extLst"]);
114337
- const rebuilt = {};
114338
- let inserted = false;
114339
- for (const [key2, value] of Object.entries(container2)) {
114340
- if (key2 === "p:custDataLst") {
114341
- continue;
114342
- }
114343
- if (!inserted && insertBefore4.has(key2)) {
114344
- rebuilt["p:custDataLst"] = list3;
114345
- inserted = true;
114346
- }
114347
- rebuilt[key2] = value;
114348
- }
114349
- if (!inserted) {
114350
- rebuilt["p:custDataLst"] = list3;
114513
+ function replaceCustomerDataEntries(doc, container2, entries, codec) {
114514
+ const list3 = ensureCustDataList(doc, container2);
114515
+ for (const stale of listChildren(list3, "custData")) {
114516
+ list3.removeChild(stale);
114351
114517
  }
114352
- for (const key2 of Object.keys(container2)) {
114353
- delete container2[key2];
114518
+ const anchor = listChildren(list3, "tags")[0] ?? null;
114519
+ for (const entry2 of entries) {
114520
+ list3.insertBefore(customerDataElement(doc, entry2, codec), anchor);
114354
114521
  }
114355
- Object.assign(container2, rebuilt);
114522
+ removeIfEmpty(list3);
114523
+ }
114524
+ function customerDataElement(doc, entry2, codec) {
114525
+ const root = doc.documentElement;
114526
+ const declarations = Array.from(root.attributes).filter((attribute5) => attribute5.name === "xmlns" || attribute5.name.startsWith("xmlns:")).map((attribute5) => `${attribute5.name}="${attribute5.value}"`).join(" ");
114527
+ const fragment2 = parseXml(
114528
+ `<wrap ${declarations}>${codec.build({ "p:custData": entry2 })}</wrap>`,
114529
+ {
114530
+ label: "p:custData"
114531
+ }
114532
+ );
114533
+ return doc.importNode(fragment2.documentElement.firstChild, true);
114356
114534
  }
114357
114535
  async function upsertContentTypes(zip, codec, contentTypes2) {
114358
114536
  const xml = await zip.file("[Content_Types].xml")?.async("string");
@@ -114407,6 +114585,8 @@ function ensureArray15(value) {
114407
114585
  var CUSTOM_XML_RELATIONSHIP_TYPE, DEFAULT_CONTENT_TYPE;
114408
114586
  var init_customer_data_package = __esm({
114409
114587
  "pptx/core/utils/customer-data-package.ts"() {
114588
+ init_xml2();
114589
+ init_cust_data_list_dom();
114410
114590
  init_safe_path();
114411
114591
  CUSTOM_XML_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";
114412
114592
  DEFAULT_CONTENT_TYPE = "application/xml";
@@ -114414,88 +114594,60 @@ var init_customer_data_package = __esm({
114414
114594
  });
114415
114595
 
114416
114596
  // pptx/core/utils/tag-package-owning-element.ts
114417
- function resolveTagsContainer(data) {
114418
- const presentation = data["p:presentation"];
114419
- if (presentation) {
114420
- return { container: presentation, insertBefore: PRESENTATION_INSERT_BEFORE };
114421
- }
114422
- for (const rootKey of CSLD_ROOTS) {
114423
- const root = data[rootKey];
114424
- if (root) {
114425
- const cSld = root["p:cSld"] ??= {};
114426
- return { container: cSld, insertBefore: CSLD_INSERT_BEFORE };
114427
- }
114428
- }
114429
- return void 0;
114597
+ function tagsElements(doc) {
114598
+ return Array.from(doc.getElementsByTagNameNS(NS.p, "tags"));
114430
114599
  }
114431
- function placeAtKey(container2, key2, value, insertBefore4) {
114432
- const rebuilt = {};
114433
- let inserted = false;
114434
- for (const [childKey3, childValue] of Object.entries(container2)) {
114435
- if (childKey3 === key2) {
114436
- continue;
114437
- }
114438
- if (!inserted && insertBefore4.has(childKey3)) {
114439
- rebuilt[key2] = value;
114440
- inserted = true;
114441
- }
114442
- rebuilt[childKey3] = childValue;
114443
- }
114444
- if (!inserted) {
114445
- rebuilt[key2] = value;
114446
- }
114447
- for (const existingKey of Object.keys(container2)) {
114448
- delete container2[existingKey];
114449
- }
114450
- Object.assign(container2, rebuilt);
114600
+ function mentionsTagsId(xml, relationshipId2) {
114601
+ return xml.includes("tags") && xml.includes(`"${relationshipId2}"`);
114451
114602
  }
114452
- async function upsertTagsOwningElement(zip, codec, sourcePartPath, relationshipId2) {
114603
+ async function upsertTagsOwningElement(zip, sourcePartPath, relationshipId2) {
114453
114604
  const xml = await zip.file(sourcePartPath)?.async("string");
114454
114605
  if (!xml) {
114455
114606
  return;
114456
114607
  }
114457
- const data = codec.parse(xml);
114458
- const resolved = resolveTagsContainer(data);
114459
- if (!resolved) {
114608
+ const doc = parseXml(xml, { label: sourcePartPath });
114609
+ if (mentionsTagsId(xml, relationshipId2) && tagsElements(doc).some((tags2) => relAttr(tags2, "id") === relationshipId2)) {
114460
114610
  return;
114461
114611
  }
114462
- const { container: container2, insertBefore: insertBefore4 } = resolved;
114463
- const list3 = { ...container2["p:custDataLst"] ?? {} };
114464
- list3["p:tags"] = { "@_r:id": relationshipId2 };
114465
- placeAtKey(container2, "p:custDataLst", list3, insertBefore4);
114466
- zip.file(sourcePartPath, codec.build(data));
114467
- }
114468
- async function removeTagsOwningElement(zip, codec, sourcePartPath) {
114469
- const xml = await zip.file(sourcePartPath)?.async("string");
114470
- if (!xml) {
114612
+ const container2 = custDataContainer(doc);
114613
+ if (!container2) {
114471
114614
  return;
114472
114615
  }
114473
- const data = codec.parse(xml);
114474
- const resolved = resolveTagsContainer(data);
114475
- if (!resolved) {
114616
+ const list3 = ensureCustDataList(doc, container2);
114617
+ for (const stale of listChildren(list3, "tags")) {
114618
+ list3.removeChild(stale);
114619
+ }
114620
+ const tags = createPresentationElement(doc, container2, "tags");
114621
+ tags.setAttributeNS(NS.r, "r:id", relationshipId2);
114622
+ list3.appendChild(tags);
114623
+ zip.file(sourcePartPath, buildXml(doc));
114624
+ }
114625
+ async function removeTagsOwningElement(zip, sourcePartPath, relationshipId2) {
114626
+ const xml = await zip.file(sourcePartPath)?.async("string");
114627
+ if (!xml || relationshipId2 !== void 0 && !mentionsTagsId(xml, relationshipId2)) {
114476
114628
  return;
114477
114629
  }
114478
- const list3 = resolved.container["p:custDataLst"];
114479
- if (!list3 || list3["p:tags"] === void 0) {
114630
+ const doc = parseXml(xml, { label: sourcePartPath });
114631
+ const container2 = custDataContainer(doc);
114632
+ const owned = tagsElements(doc).filter(
114633
+ (tags) => relationshipId2 === void 0 ? tags.parentNode?.parentNode === container2 : relAttr(tags, "id") === relationshipId2
114634
+ );
114635
+ if (owned.length === 0) {
114480
114636
  return;
114481
114637
  }
114482
- delete list3["p:tags"];
114483
- if (Object.keys(list3).length === 0) {
114484
- delete resolved.container["p:custDataLst"];
114638
+ for (const tags of owned) {
114639
+ const list3 = tags.parentNode;
114640
+ list3?.removeChild(tags);
114641
+ if (list3) {
114642
+ removeIfEmpty(list3);
114643
+ }
114485
114644
  }
114486
- zip.file(sourcePartPath, codec.build(data));
114645
+ zip.file(sourcePartPath, buildXml(doc));
114487
114646
  }
114488
- var CSLD_ROOTS, PRESENTATION_INSERT_BEFORE, CSLD_INSERT_BEFORE;
114489
114647
  var init_tag_package_owning_element = __esm({
114490
114648
  "pptx/core/utils/tag-package-owning-element.ts"() {
114491
- CSLD_ROOTS = ["p:sld", "p:notes", "p:sldLayout", "p:sldMaster", "p:handoutMaster"];
114492
- PRESENTATION_INSERT_BEFORE = /* @__PURE__ */ new Set([
114493
- "p:kinsoku",
114494
- "p:defaultTextStyle",
114495
- "p:modifyVerifier",
114496
- "p:extLst"
114497
- ]);
114498
- CSLD_INSERT_BEFORE = /* @__PURE__ */ new Set(["p:controls", "p:extLst"]);
114649
+ init_xml2();
114650
+ init_cust_data_list_dom();
114499
114651
  }
114500
114652
  });
114501
114653
 
@@ -114566,12 +114718,7 @@ async function writeTagCollections(zip, collections, codec) {
114566
114718
  collection.rawXml = { ...collection.rawXml ?? {}, "p:tagLst": root };
114567
114719
  zip.file(collection.path, codec.build(collection.rawXml));
114568
114720
  await upsertTagRelationship(zip, codec, collection);
114569
- await upsertTagsOwningElement(
114570
- zip,
114571
- codec,
114572
- collection.sourcePartPath,
114573
- collection.relationshipId
114574
- );
114721
+ await upsertTagsOwningElement(zip, collection.sourcePartPath, collection.relationshipId);
114575
114722
  writtenPaths.add(collection.path);
114576
114723
  }
114577
114724
  await upsertTagContentTypes(zip, codec, writtenPaths);
@@ -114580,7 +114727,7 @@ async function removeTagCollection(zip, codec, collection) {
114580
114727
  if (!collection.path || !collection.sourcePartPath) {
114581
114728
  return;
114582
114729
  }
114583
- await removeTagsOwningElement(zip, codec, collection.sourcePartPath);
114730
+ await removeTagsOwningElement(zip, collection.sourcePartPath, collection.relationshipId);
114584
114731
  await removeTagRelationship(zip, codec, collection);
114585
114732
  zip.remove(collection.path);
114586
114733
  await removeTagContentTypeOverride(zip, codec, collection.path);
@@ -132558,14 +132705,13 @@ function writeLineJoin(spPr, shapeStyle, owns) {
132558
132705
  }
132559
132706
  function writeShapeStroke(spPr, shapeStyle, ctx) {
132560
132707
  const owns = createLineStyleGate(shapeStyle);
132561
- if ((shapeStyle.strokeColor !== void 0 || shapeStyle.strokeFillMode === "gradient" || shapeStyle.strokeFillMode === "pattern") && // The width travels with the paint: `writeLineFill` turns a zero width
132708
+ if (typeof shapeStyle.strokeWidth === "number" && shapeStyle.strokeWidth > 0 && owns("strokeWidth")) {
132709
+ ensureLineNode(spPr)["@_w"] = String(Math.round(shapeStyle.strokeWidth * ctx.emuPerPx));
132710
+ }
132711
+ if ((shapeStyle.strokeColor !== void 0 || shapeStyle.strokeFillMode === "gradient" || shapeStyle.strokeFillMode === "pattern") && // The paint still waits on the width: `writeLineFill` turns a zero width
132562
132712
  // into `a:noFill`, so the two cannot be decided apart.
132563
132713
  owns("strokeColor", "strokeOpacity", "strokeFillMode", "strokeWidth")) {
132564
- const lineNode = ensureLineNode(spPr);
132565
- if (typeof shapeStyle.strokeWidth === "number" && shapeStyle.strokeWidth > 0 && owns("strokeWidth")) {
132566
- lineNode["@_w"] = String(Math.round(shapeStyle.strokeWidth * ctx.emuPerPx));
132567
- }
132568
- writeLineFill(lineNode, shapeStyle, ctx.parseColor);
132714
+ writeLineFill(ensureLineNode(spPr), shapeStyle, ctx.parseColor);
132569
132715
  }
132570
132716
  if (shapeStyle.strokeDash !== void 0 && owns("strokeDash")) {
132571
132717
  applyDrawingLineDash(ensureLineNode(spPr), shapeStyle);
@@ -132584,6 +132730,10 @@ function writeShapeStroke(spPr, shapeStyle, ctx) {
132584
132730
  if (ctx.lineEffectListXml && spPr["a:ln"]) {
132585
132731
  spPr["a:ln"]["a:effectLst"] = ctx.lineEffectListXml;
132586
132732
  }
132733
+ const lineNode = spPr["a:ln"];
132734
+ if (lineNode && typeof lineNode === "object" && !Array.isArray(lineNode)) {
132735
+ spPr["a:ln"] = reorderObjectKeysByLocalName(lineNode, LN_CHILD_ORDER);
132736
+ }
132587
132737
  }
132588
132738
  function writeShapeFillAndStroke(spPr, shapeStyle, ctx) {
132589
132739
  resetSpPrFormattingForStyleMatrix(spPr, shapeStyle);
@@ -132594,6 +132744,7 @@ var init_save_shape_fill_stroke = __esm({
132594
132744
  "pptx/core/core/runtime/save-shape-fill-stroke.ts"() {
132595
132745
  init_color_xml_preservation();
132596
132746
  init_drawing_line_dash();
132747
+ init_xml_reorder();
132597
132748
  init_drawing_fill_xml();
132598
132749
  init_authored_shape_style();
132599
132750
  init_fill_choice_group();
@@ -137718,7 +137869,7 @@ function writeTableStyleSectionCell3D(section, cell3D) {
137718
137869
  }
137719
137870
  tcStyle["a:cell3D"] = node;
137720
137871
  }
137721
- var EMU_PER_PIXEL4, BORDER_SIDE_ORDER, LN_CHILD_ORDER, LN_FILL_KEYS;
137872
+ var EMU_PER_PIXEL4, BORDER_SIDE_ORDER, LN_FILL_KEYS;
137722
137873
  var init_table_style_border_write = __esm({
137723
137874
  "pptx/core/core/runtime/table-style-border-write.ts"() {
137724
137875
  init_xml_reorder();
@@ -137734,20 +137885,6 @@ var init_table_style_border_write = __esm({
137734
137885
  "a:tl2br",
137735
137886
  "a:tr2bl"
137736
137887
  ];
137737
- LN_CHILD_ORDER = [
137738
- "a:noFill",
137739
- "a:solidFill",
137740
- "a:gradFill",
137741
- "a:pattFill",
137742
- "a:prstDash",
137743
- "a:custDash",
137744
- "a:round",
137745
- "a:bevel",
137746
- "a:miter",
137747
- "a:headEnd",
137748
- "a:tailEnd",
137749
- "a:extLst"
137750
- ];
137751
137888
  LN_FILL_KEYS = ["a:noFill", "a:solidFill", "a:gradFill", "a:pattFill"];
137752
137889
  }
137753
137890
  });