ooxml-core 1.8.4 → 1.9.0

package/dist/pptx/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { a as MergeOptions, t as FindResult } from "../chunks/text-operations-BHfAm5K9.js";
+import { a as MergeOptions, t as FindResult } from "../chunks/text-operations-BLodkuXE.js";
 //#region pptx/cli/commands.d.ts
 /** Result from the `info` command. */
 interface InfoResult {

package/dist/pptx/cli/index.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { replaceText, findText, mergePresentation } from '../../chunk-ZAP5WLEN.mjs';
-import { PptxMarkdownConverter } from '../../chunk-NIHPA63A.mjs';
-import { PptxHandler } from '../../chunk-GAGSCAR3.mjs';
-import { SvgExporter, isImageLikeElement, blobUrlToDataUrl } from '../../chunk-TTPZITQN.mjs';
+import { replaceText, findText, mergePresentation } from '../../chunk-IGOA57LE.mjs';
+import { PptxMarkdownConverter } from '../../chunk-M76PHYRR.mjs';
+import { PptxHandler } from '../../chunk-OXHMZS7B.mjs';
+import { SvgExporter, isImageLikeElement, blobUrlToDataUrl } from '../../chunk-FIELY5PI.mjs';
 import '../../chunk-KBIJI6P5.mjs';
 import '../../chunk-3GXV5MPC.mjs';
 import '../../chunk-54S5A5PZ.mjs';

package/dist/pptx/converter/index.cjs

@@ -30158,15 +30158,26 @@ init_font_substitution();
 var DEFAULT_FONT_SIZE = 18;
 var FALLBACK_PAD_FACTOR = 0.06;
 function drawTextSegments(ctx, segments, bodyStyle, w, h, scaleFactor = 1) {
-  const padL = bodyStyle?.bodyInsetLeft ? bodyStyle.bodyInsetLeft * scaleFactor : Math.round(w * FALLBACK_PAD_FACTOR);
-  const padR = bodyStyle?.bodyInsetRight ? bodyStyle.bodyInsetRight * scaleFactor : Math.round(w * FALLBACK_PAD_FACTOR);
-  const padT = bodyStyle?.bodyInsetTop ? bodyStyle.bodyInsetTop * scaleFactor : Math.round(h * FALLBACK_PAD_FACTOR);
-  const padB = bodyStyle?.bodyInsetBottom ? bodyStyle.bodyInsetBottom * scaleFactor : Math.round(h * FALLBACK_PAD_FACTOR);
+  const padL = bodyStyle?.bodyInsetLeft !== void 0 ? bodyStyle.bodyInsetLeft * scaleFactor : Math.round(w * FALLBACK_PAD_FACTOR);
+  const padR = bodyStyle?.bodyInsetRight !== void 0 ? bodyStyle.bodyInsetRight * scaleFactor : Math.round(w * FALLBACK_PAD_FACTOR);
+  const padT = bodyStyle?.bodyInsetTop !== void 0 ? bodyStyle.bodyInsetTop * scaleFactor : Math.round(h * FALLBACK_PAD_FACTOR);
+  const padB = bodyStyle?.bodyInsetBottom !== void 0 ? bodyStyle.bodyInsetBottom * scaleFactor : Math.round(h * FALLBACK_PAD_FACTOR);
   const maxWidth = w - padL - padR;
   if (maxWidth <= 0) {
     return;
   }
-  const paragraphs = splitIntoParagraphs(segments);
+  const paragraphs = splitIntoParagraphs(
+    segments.map((segment) => ({
+      ...segment,
+      style: {
+        ...bodyStyle,
+        ...Object.fromEntries(
+          Object.entries(segment.style).filter(([, value]) => value !== void 0)
+        )
+      }
+    })),
+    bodyStyle
+  );
   const lines = layoutParagraphs(ctx, paragraphs, maxWidth, scaleFactor);
   if (lines.length === 0) {
     return;
@@ -30202,33 +30213,58 @@ function drawTextSegments(ctx, segments, bodyStyle, w, h, scaleFactor = 1) {
     y += line2.height * 0.3;
   }
 }
-function splitIntoParagraphs(segments) {
-  const paragraphs = [[]];
+function splitIntoParagraphs(segments, bodyStyle) {
+  const paragraphs = [{ segments: [], style: bodyStyle ?? {} }];
   for (const seg of segments) {
-    if (seg.isParagraphBreak) {
-      paragraphs.push([]);
-    } else if (seg.text) {
-      paragraphs[paragraphs.length - 1].push(seg);
+    if (seg.isParagraphBreak || seg.text === "\n" && !seg.isLineBreak) {
+      paragraphs.push({ segments: [], style: seg.style });
+    } else if (seg.text || seg.isLineBreak) {
+      paragraphs[paragraphs.length - 1].segments.push(seg);
     }
   }
-  return paragraphs.filter((p) => p.length > 0);
+  return paragraphs;
 }
 function layoutParagraphs(ctx, paragraphs, maxWidth, scaleFactor) {
   const lines = [];
-  for (const para of paragraphs) {
-    const paraAlign = para[0]?.style?.align;
+  for (const paragraph of paragraphs) {
+    const para = paragraph.segments;
+    const paraAlign = para[0]?.style.align ?? paragraph.style.align;
     let currentLine = [];
     let lineWidth = 0;
     let lineHeight = 0;
+    let fallbackHeight = (para[0]?.style.fontSize ?? paragraph.style.fontSize ?? DEFAULT_FONT_SIZE) * scaleFactor * 1.2;
+    const flushLine = () => {
+      while (currentLine.length > 0 && /^\s+$/.test(currentLine[currentLine.length - 1].text)) {
+        lineWidth -= currentLine.pop().measuredWidth;
+      }
+      lines.push({
+        runs: currentLine,
+        width: lineWidth,
+        height: lineHeight || fallbackHeight,
+        align: paraAlign
+      });
+      currentLine = [];
+      lineWidth = 0;
+      lineHeight = 0;
+    };
     for (const seg of para) {
       ctx.font = buildFont(seg.style, scaleFactor);
       const fontSize = (seg.style.fontSize ?? DEFAULT_FONT_SIZE) * scaleFactor;
       const segHeight = fontSize * 1.2;
-      const tokens = seg.text.split(/(?<=\s)(?=\S)|(?<=\S)(?=\s)/);
+      fallbackHeight = segHeight;
+      if (seg.isLineBreak) {
+        flushLine();
+        continue;
+      }
+      const tokens = seg.text.split(/(\r\n|\r|\n)|(?<=\s)(?=\S)|(?<=\S)(?=\s)/);
       for (const raw of tokens) {
         if (!raw) {
           continue;
         }
+        if (/^(\r\n|\r|\n)$/.test(raw)) {
+          flushLine();
+          continue;
+        }
         if (/^\s+$/.test(raw)) {
           if (currentLine.length > 0) {
             const spaceW = ctx.measureText(raw).width;
@@ -30244,19 +30280,7 @@ function layoutParagraphs(ctx, paragraphs, maxWidth, scaleFactor) {
         const word = raw;
         const wordW = ctx.measureText(word).width;
         if (lineWidth + wordW > maxWidth && currentLine.length > 0) {
-          while (currentLine.length > 0 && /^\s+$/.test(currentLine[currentLine.length - 1].text)) {
-            const removed = currentLine.pop();
-            lineWidth -= removed.measuredWidth;
-          }
-          lines.push({
-            runs: currentLine,
-            width: lineWidth,
-            height: lineHeight,
-            align: paraAlign
-          });
-          currentLine = [];
-          lineWidth = 0;
-          lineHeight = 0;
+          flushLine();
         }
         currentLine.push({
           text: word,
@@ -30267,14 +30291,7 @@ function layoutParagraphs(ctx, paragraphs, maxWidth, scaleFactor) {
         lineHeight = Math.max(lineHeight, segHeight);
       }
     }
-    if (currentLine.length > 0) {
-      lines.push({
-        runs: currentLine,
-        width: lineWidth,
-        height: lineHeight,
-        align: paraAlign
-      });
-    }
+    flushLine();
   }
   return lines;
 }

package/dist/pptx/converter/index.d.ts

@@ -1,2 +1,2 @@
-import { A as SlideProcessor, B as generateMediaFilename, C as PptxJsonAssetStats, D as SvgExportOptions, E as isPptxJsonText, F as deriveOutputPath, H as ConversionResult, I as getDirectory, L as normalizePath, M as PptxConverterOptions, N as PptxMarkdownConverter, O as SvgExporter, P as DocumentConverter, R as MediaContext, S as PPTX_JSON_VERSION, T as decodePptxJsonText, U as FileSystemAdapter, V as ConversionOptions, _ as decodeJsonValue, a as deserializePptxFromJson, b as PPTX_JSON_FORMAT, c as pptxDataFromJsonDocument, d as serializePptxToJson, f as PRESENTATION_FIELD_KEYS, g as bytesToBase64, h as base64ToBytes, i as PptxJsonFormatError, j as SlideProcessorOptions, k as SlideMetadataRenderer, l as PptxJsonSerializeOptions, m as JsonAssetAccumulator, n as PptxJsonConverterOptions, o as parsePptxJson, p as PRESENTATION_FIELD_NAMES, r as applyImportedPptxData, s as parsePptxJsonDocument, t as PptxJsonConverter, u as buildPptxJsonDocument, v as encodeJsonValue, w as PptxJsonDocument, x as PPTX_JSON_MIME_TYPE, y as PPTX_JSON_FILE_EXTENSION, z as dataUrlToMediaBytes } from "../chunks/index-CKIUurnd.js";
+import { A as SlideProcessor, B as generateMediaFilename, C as PptxJsonAssetStats, D as SvgExportOptions, E as isPptxJsonText, F as deriveOutputPath, H as ConversionResult, I as getDirectory, L as normalizePath, M as PptxConverterOptions, N as PptxMarkdownConverter, O as SvgExporter, P as DocumentConverter, R as MediaContext, S as PPTX_JSON_VERSION, T as decodePptxJsonText, U as FileSystemAdapter, V as ConversionOptions, _ as decodeJsonValue, a as deserializePptxFromJson, b as PPTX_JSON_FORMAT, c as pptxDataFromJsonDocument, d as serializePptxToJson, f as PRESENTATION_FIELD_KEYS, g as bytesToBase64, h as base64ToBytes, i as PptxJsonFormatError, j as SlideProcessorOptions, k as SlideMetadataRenderer, l as PptxJsonSerializeOptions, m as JsonAssetAccumulator, n as PptxJsonConverterOptions, o as parsePptxJson, p as PRESENTATION_FIELD_NAMES, r as applyImportedPptxData, s as parsePptxJsonDocument, t as PptxJsonConverter, u as buildPptxJsonDocument, v as encodeJsonValue, w as PptxJsonDocument, x as PPTX_JSON_MIME_TYPE, y as PPTX_JSON_FILE_EXTENSION, z as dataUrlToMediaBytes } from "../chunks/index-BZh-IMkN.js";
 export { type ConversionOptions, type ConversionResult, DocumentConverter, type FileSystemAdapter, type JsonAssetAccumulator, MediaContext, PPTX_JSON_FILE_EXTENSION, PPTX_JSON_FORMAT, PPTX_JSON_MIME_TYPE, PPTX_JSON_VERSION, PRESENTATION_FIELD_KEYS, PRESENTATION_FIELD_NAMES, type PptxConverterOptions, type PptxJsonAssetStats, PptxJsonConverter, type PptxJsonConverterOptions, type PptxJsonDocument, PptxJsonFormatError, type PptxJsonSerializeOptions, PptxMarkdownConverter, SlideMetadataRenderer, SlideProcessor, type SlideProcessorOptions, type SvgExportOptions, SvgExporter, applyImportedPptxData, base64ToBytes, buildPptxJsonDocument, bytesToBase64, dataUrlToMediaBytes, decodeJsonValue, decodePptxJsonText, deriveOutputPath, deserializePptxFromJson, encodeJsonValue, generateMediaFilename, getDirectory, isPptxJsonText, normalizePath, parsePptxJson, parsePptxJsonDocument, pptxDataFromJsonDocument, serializePptxToJson };

package/dist/pptx/converter/index.mjs

@@ -1,6 +1,6 @@
 import '../../chunk-6Q7TP72Y.mjs';
-export { DocumentConverter, MediaContext, PptxMarkdownConverter, SlideMetadataRenderer, SlideProcessor, dataUrlToMediaBytes, deriveOutputPath, generateMediaFilename, getDirectory, normalizePath } from '../../chunk-NIHPA63A.mjs';
-export { PPTX_JSON_FILE_EXTENSION, PPTX_JSON_FORMAT, PPTX_JSON_MIME_TYPE, PPTX_JSON_VERSION, PRESENTATION_FIELD_KEYS, PRESENTATION_FIELD_NAMES, PptxJsonConverter, PptxJsonFormatError, SvgExporter, applyImportedPptxData, base64ToBytes, buildPptxJsonDocument, bytesToBase64, decodeJsonValue, decodePptxJsonText, deserializePptxFromJson, encodeJsonValue, isPptxJsonText, parsePptxJson, parsePptxJsonDocument, pptxDataFromJsonDocument, serializePptxToJson } from '../../chunk-TTPZITQN.mjs';
+export { DocumentConverter, MediaContext, PptxMarkdownConverter, SlideMetadataRenderer, SlideProcessor, dataUrlToMediaBytes, deriveOutputPath, generateMediaFilename, getDirectory, normalizePath } from '../../chunk-M76PHYRR.mjs';
+export { PPTX_JSON_FILE_EXTENSION, PPTX_JSON_FORMAT, PPTX_JSON_MIME_TYPE, PPTX_JSON_VERSION, PRESENTATION_FIELD_KEYS, PRESENTATION_FIELD_NAMES, PptxJsonConverter, PptxJsonFormatError, SvgExporter, applyImportedPptxData, base64ToBytes, buildPptxJsonDocument, bytesToBase64, decodeJsonValue, decodePptxJsonText, deserializePptxFromJson, encodeJsonValue, isPptxJsonText, parsePptxJson, parsePptxJsonDocument, pptxDataFromJsonDocument, serializePptxToJson } from '../../chunk-FIELY5PI.mjs';
 import '../../chunk-KBIJI6P5.mjs';
 import '../../chunk-54S5A5PZ.mjs';
 import '../../chunk-KII4AAYH.mjs';