ooxml-core 1.32.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.
@@ -72186,16 +72186,16 @@ function textSvg(node2, rect3, ctx) {
72186
72186
  const anchorAttr = line4.align === "ctr" ? "middle" : line4.align === "r" ? "end" : "start";
72187
72187
  const baseline = y + (heights[index3] ?? 0) * 0.8;
72188
72188
  y += heights[index3] ?? 0;
72189
- return `<text x="${round4(x)}" y="${round4(baseline)}" font-family="Calibri,Arial,sans-serif" font-size="${round4(line4.fontPx)}" fill="${line4.color}" text-anchor="${anchorAttr}"${line4.bold ? ' font-weight="bold"' : ""}${line4.italic ? ' font-style="italic"' : ""}>${escapeXml(line4.text)}</text>`;
72189
+ return `<text x="${round4(x)}" y="${round4(baseline)}" font-family="Calibri,Arial,sans-serif" font-size="${round4(line4.fontPx)}" fill="${escapeXml(line4.color)}" text-anchor="${anchorAttr}"${line4.bold ? ' font-weight="bold"' : ""}${line4.italic ? ' font-style="italic"' : ""}>${escapeXml(line4.text)}</text>`;
72190
72190
  });
72191
- return `<g clip-path="url(#${clip})">${spans3.join("")}</g>`;
72191
+ return `<g clip-path="url(#${escapeXml(clip)})">${spans3.join("")}</g>`;
72192
72192
  }
72193
72193
  function markerDef(ctx, end, color3) {
72194
72194
  if (!end?.type || end.type === "none") return void 0;
72195
72195
  const id = `${ctx.prefix}m${ctx.counter.n++}`;
72196
72196
  const shape2 = end.type === "oval" ? '<circle cx="5" cy="5" r="4"/>' : end.type === "diamond" ? '<path d="M1 5 L5 1 L9 5 L5 9 Z"/>' : end.type === "arrow" ? '<path d="M1 1 L9 5 L1 9" fill="none" stroke-width="1.5"/>' : '<path d="M1 1 L9 5 L1 9 Z"/>';
72197
72197
  ctx.defs.push(
72198
- `<marker id="${id}" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="4" markerHeight="4" orient="auto-start-reverse" fill="${color3}" stroke="${color3}">${shape2}</marker>`
72198
+ `<marker id="${escapeXml(id)}" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="4" markerHeight="4" orient="auto-start-reverse" fill="${escapeXml(color3)}" stroke="${escapeXml(color3)}">${shape2}</marker>`
72199
72199
  );
72200
72200
  return id;
72201
72201
  }
@@ -72251,7 +72251,7 @@ function drawNode(node2, box2, ctx) {
72251
72251
  const body = paths.map((path3) => {
72252
72252
  const fill2 = fillNone || path3.fill === "none" || node2.kind === "connector" ? "none" : paint2.fill;
72253
72253
  const line4 = path3.stroke === false ? "none" : stroke.stroke;
72254
- return `<path d="${escapeXml(path3.d)}" transform="translate(${round4(box2.x)} ${round4(box2.y)})" fill="${fill2}" stroke="${line4}" stroke-width="${round4(stroke.width)}" stroke-linejoin="miter"${stroke.dash ? ` stroke-dasharray="${stroke.dash}"` : ""}${head ? ` marker-start="url(#${head})"` : ""}${tail ? ` marker-end="url(#${tail})"` : ""}/>`;
72254
+ return `<path d="${escapeXml(path3.d)}" transform="translate(${round4(box2.x)} ${round4(box2.y)})" fill="${escapeXml(fill2)}" stroke="${escapeXml(line4)}" stroke-width="${round4(stroke.width)}" stroke-linejoin="miter"${stroke.dash ? ` stroke-dasharray="${escapeXml(stroke.dash)}"` : ""}${head ? ` marker-start="url(#${escapeXml(head)})"` : ""}${tail ? ` marker-end="url(#${escapeXml(tail)})"` : ""}/>`;
72255
72255
  }).join("");
72256
72256
  const rect3 = textRect ? {
72257
72257
  x: box2.x + textRect.l,
@@ -72305,8 +72305,8 @@ function arrow(cx, cy, up, size = 3) {
72305
72305
  function dropdown(c2, s, items, w, h2, size) {
72306
72306
  const button2 = Math.min(16, w / 2);
72307
72307
  const text3 = s.selected >= 1 ? items[s.selected - 1] ?? "" : "";
72308
- const clip = `<clipPath id="fc-drop-${c2.shapeId}"><rect x="2" y="1" width="${round5(Math.max(0, w - button2 - 4))}" height="${round5(h2 - 2)}"/></clipPath>`;
72309
- return `<defs>${clip}</defs><rect x="0.5" y="0.5" width="${round5(w - 1)}" height="${round5(h2 - 1)}" fill="#fff" stroke="#7a7a7a"/><g clip-path="url(#fc-drop-${c2.shapeId})">${caption(text3, 4, h2, size)}</g><rect data-control-part="drop" x="${round5(w - button2 - 0.5)}" y="1.5" width="${round5(button2 - 1)}" height="${round5(h2 - 3)}" fill="${FACE}" stroke="${EDGE}"/>${arrow(w - button2 / 2, h2 / 2, false)}`;
72308
+ const clip = `<clipPath id="fc-drop-${escapeXml2(String(c2.shapeId))}"><rect x="2" y="1" width="${round5(Math.max(0, w - button2 - 4))}" height="${round5(h2 - 2)}"/></clipPath>`;
72309
+ return `<defs>${clip}</defs><rect x="0.5" y="0.5" width="${round5(w - 1)}" height="${round5(h2 - 1)}" fill="#fff" stroke="#7a7a7a"/><g clip-path="url(#fc-drop-${escapeXml2(String(c2.shapeId))})">${caption(text3, 4, h2, size)}</g><rect data-control-part="drop" x="${round5(w - button2 - 0.5)}" y="1.5" width="${round5(button2 - 1)}" height="${round5(h2 - 3)}" fill="${FACE}" stroke="${EDGE}"/>${arrow(w - button2 / 2, h2 / 2, false)}`;
72310
72310
  }
72311
72311
  function list2(s, items, w, h2, size) {
72312
72312
  const row2 = size * 1.4;
@@ -72334,7 +72334,7 @@ function scroll(c2, s, w, h2) {
72334
72334
  const thumbLength = Math.max(8, Math.min(length, end));
72335
72335
  const offset2 = end + ratio * Math.max(0, length - thumbLength);
72336
72336
  const track = "#f0f0f0";
72337
- const rect3 = (part, x, y, rw, rh, fill2) => `<rect data-control-part="${part}" x="${round5(x)}" y="${round5(y)}" width="${round5(rw)}" height="${round5(rh)}" fill="${fill2}" stroke="${EDGE}"/>`;
72337
+ const rect3 = (part, x, y, rw, rh, fill2) => `<rect data-control-part="${escapeXml2(part)}" x="${round5(x)}" y="${round5(y)}" width="${round5(rw)}" height="${round5(rh)}" fill="${escapeXml2(fill2)}" stroke="${EDGE}"/>`;
72338
72338
  if (horizontal)
72339
72339
  return `${rect3("track", end, 0.5, length, h2 - 1, track)}${rect3("step-down", 0.5, 0.5, end, h2 - 1, FACE)}${rect3("step-up", w - end - 0.5, 0.5, end, h2 - 1, FACE)}${rect3("thumb", offset2, 0.5, thumbLength, h2 - 1, FACE)}<path d="M${round5(end * 0.6)} ${round5(h2 / 2 - 3)} l-3 3 l3 3 Z M${round5(w - end * 0.6)} ${round5(h2 / 2 - 3)} l3 3 l-3 3 Z" fill="#606060"/>`;
72340
72340
  return `${rect3("track", 0.5, end, w - 1, length, track)}${rect3("step-down", 0.5, 0.5, w - 1, end, FACE)}${rect3("step-up", 0.5, h2 - end - 0.5, w - 1, end, FACE)}${rect3("thumb", 0.5, offset2, w - 1, thumbLength, FACE)}${arrow(w / 2, end / 2, true)}${arrow(w / 2, h2 - end / 2, false)}`;
@@ -72180,16 +72180,16 @@ function textSvg(node2, rect3, ctx) {
72180
72180
  const anchorAttr = line4.align === "ctr" ? "middle" : line4.align === "r" ? "end" : "start";
72181
72181
  const baseline = y + (heights[index3] ?? 0) * 0.8;
72182
72182
  y += heights[index3] ?? 0;
72183
- return `<text x="${round4(x)}" y="${round4(baseline)}" font-family="Calibri,Arial,sans-serif" font-size="${round4(line4.fontPx)}" fill="${line4.color}" text-anchor="${anchorAttr}"${line4.bold ? ' font-weight="bold"' : ""}${line4.italic ? ' font-style="italic"' : ""}>${escapeXml(line4.text)}</text>`;
72183
+ return `<text x="${round4(x)}" y="${round4(baseline)}" font-family="Calibri,Arial,sans-serif" font-size="${round4(line4.fontPx)}" fill="${escapeXml(line4.color)}" text-anchor="${anchorAttr}"${line4.bold ? ' font-weight="bold"' : ""}${line4.italic ? ' font-style="italic"' : ""}>${escapeXml(line4.text)}</text>`;
72184
72184
  });
72185
- return `<g clip-path="url(#${clip})">${spans3.join("")}</g>`;
72185
+ return `<g clip-path="url(#${escapeXml(clip)})">${spans3.join("")}</g>`;
72186
72186
  }
72187
72187
  function markerDef(ctx, end, color3) {
72188
72188
  if (!end?.type || end.type === "none") return void 0;
72189
72189
  const id = `${ctx.prefix}m${ctx.counter.n++}`;
72190
72190
  const shape2 = end.type === "oval" ? '<circle cx="5" cy="5" r="4"/>' : end.type === "diamond" ? '<path d="M1 5 L5 1 L9 5 L5 9 Z"/>' : end.type === "arrow" ? '<path d="M1 1 L9 5 L1 9" fill="none" stroke-width="1.5"/>' : '<path d="M1 1 L9 5 L1 9 Z"/>';
72191
72191
  ctx.defs.push(
72192
- `<marker id="${id}" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="4" markerHeight="4" orient="auto-start-reverse" fill="${color3}" stroke="${color3}">${shape2}</marker>`
72192
+ `<marker id="${escapeXml(id)}" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="4" markerHeight="4" orient="auto-start-reverse" fill="${escapeXml(color3)}" stroke="${escapeXml(color3)}">${shape2}</marker>`
72193
72193
  );
72194
72194
  return id;
72195
72195
  }
@@ -72245,7 +72245,7 @@ function drawNode(node2, box2, ctx) {
72245
72245
  const body = paths.map((path3) => {
72246
72246
  const fill2 = fillNone || path3.fill === "none" || node2.kind === "connector" ? "none" : paint2.fill;
72247
72247
  const line4 = path3.stroke === false ? "none" : stroke.stroke;
72248
- return `<path d="${escapeXml(path3.d)}" transform="translate(${round4(box2.x)} ${round4(box2.y)})" fill="${fill2}" stroke="${line4}" stroke-width="${round4(stroke.width)}" stroke-linejoin="miter"${stroke.dash ? ` stroke-dasharray="${stroke.dash}"` : ""}${head ? ` marker-start="url(#${head})"` : ""}${tail ? ` marker-end="url(#${tail})"` : ""}/>`;
72248
+ return `<path d="${escapeXml(path3.d)}" transform="translate(${round4(box2.x)} ${round4(box2.y)})" fill="${escapeXml(fill2)}" stroke="${escapeXml(line4)}" stroke-width="${round4(stroke.width)}" stroke-linejoin="miter"${stroke.dash ? ` stroke-dasharray="${escapeXml(stroke.dash)}"` : ""}${head ? ` marker-start="url(#${escapeXml(head)})"` : ""}${tail ? ` marker-end="url(#${escapeXml(tail)})"` : ""}/>`;
72249
72249
  }).join("");
72250
72250
  const rect3 = textRect ? {
72251
72251
  x: box2.x + textRect.l,
@@ -72299,8 +72299,8 @@ function arrow(cx, cy, up, size = 3) {
72299
72299
  function dropdown(c2, s, items, w, h2, size) {
72300
72300
  const button2 = Math.min(16, w / 2);
72301
72301
  const text3 = s.selected >= 1 ? items[s.selected - 1] ?? "" : "";
72302
- const clip = `<clipPath id="fc-drop-${c2.shapeId}"><rect x="2" y="1" width="${round5(Math.max(0, w - button2 - 4))}" height="${round5(h2 - 2)}"/></clipPath>`;
72303
- return `<defs>${clip}</defs><rect x="0.5" y="0.5" width="${round5(w - 1)}" height="${round5(h2 - 1)}" fill="#fff" stroke="#7a7a7a"/><g clip-path="url(#fc-drop-${c2.shapeId})">${caption(text3, 4, h2, size)}</g><rect data-control-part="drop" x="${round5(w - button2 - 0.5)}" y="1.5" width="${round5(button2 - 1)}" height="${round5(h2 - 3)}" fill="${FACE}" stroke="${EDGE}"/>${arrow(w - button2 / 2, h2 / 2, false)}`;
72302
+ const clip = `<clipPath id="fc-drop-${escapeXml2(String(c2.shapeId))}"><rect x="2" y="1" width="${round5(Math.max(0, w - button2 - 4))}" height="${round5(h2 - 2)}"/></clipPath>`;
72303
+ return `<defs>${clip}</defs><rect x="0.5" y="0.5" width="${round5(w - 1)}" height="${round5(h2 - 1)}" fill="#fff" stroke="#7a7a7a"/><g clip-path="url(#fc-drop-${escapeXml2(String(c2.shapeId))})">${caption(text3, 4, h2, size)}</g><rect data-control-part="drop" x="${round5(w - button2 - 0.5)}" y="1.5" width="${round5(button2 - 1)}" height="${round5(h2 - 3)}" fill="${FACE}" stroke="${EDGE}"/>${arrow(w - button2 / 2, h2 / 2, false)}`;
72304
72304
  }
72305
72305
  function list2(s, items, w, h2, size) {
72306
72306
  const row2 = size * 1.4;
@@ -72328,7 +72328,7 @@ function scroll(c2, s, w, h2) {
72328
72328
  const thumbLength = Math.max(8, Math.min(length, end));
72329
72329
  const offset2 = end + ratio * Math.max(0, length - thumbLength);
72330
72330
  const track = "#f0f0f0";
72331
- const rect3 = (part, x, y, rw, rh, fill2) => `<rect data-control-part="${part}" x="${round5(x)}" y="${round5(y)}" width="${round5(rw)}" height="${round5(rh)}" fill="${fill2}" stroke="${EDGE}"/>`;
72331
+ const rect3 = (part, x, y, rw, rh, fill2) => `<rect data-control-part="${escapeXml2(part)}" x="${round5(x)}" y="${round5(y)}" width="${round5(rw)}" height="${round5(rh)}" fill="${escapeXml2(fill2)}" stroke="${EDGE}"/>`;
72332
72332
  if (horizontal)
72333
72333
  return `${rect3("track", end, 0.5, length, h2 - 1, track)}${rect3("step-down", 0.5, 0.5, end, h2 - 1, FACE)}${rect3("step-up", w - end - 0.5, 0.5, end, h2 - 1, FACE)}${rect3("thumb", offset2, 0.5, thumbLength, h2 - 1, FACE)}<path d="M${round5(end * 0.6)} ${round5(h2 / 2 - 3)} l-3 3 l3 3 Z M${round5(w - end * 0.6)} ${round5(h2 / 2 - 3)} l3 3 l-3 3 Z" fill="#606060"/>`;
72334
72334
  return `${rect3("track", 0.5, end, w - 1, length, track)}${rect3("step-down", 0.5, 0.5, w - 1, end, FACE)}${rect3("step-up", 0.5, h2 - end - 0.5, w - 1, end, FACE)}${rect3("thumb", 0.5, offset2, w - 1, thumbLength, FACE)}${arrow(w / 2, end / 2, true)}${arrow(w / 2, h2 - end / 2, false)}`;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ooxml-core",
3
- "version": "1.32.0",
3
+ "version": "1.32.1",
4
4
  "description": "Shared OOXML logic for the Word, PowerPoint and Excel viewers: everything except the UI",
5
5
  "keywords": [
6
6
  "charts",