ooxml-core 1.8.4 → 1.9.0

package/dist/{chunk-NIHPA63A.mjs → chunk-M76PHYRR.mjs}

@@ -1,4 +1,4 @@
-import { hasTextProperties, isImageLikeElement, blobUrlToDataUrl, getSubstituteFontFamily, stripXmlOrderSuffix } from './chunk-TTPZITQN.mjs';
+import { hasTextProperties, isImageLikeElement, blobUrlToDataUrl, getSubstituteFontFamily, stripXmlOrderSuffix } from './chunk-FIELY5PI.mjs';
 
 // pptx/converter/media-context.ts
 var MIME_TO_EXT = {
@@ -1719,15 +1719,26 @@ ${htmlRows.join("\n")}
 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;
@@ -1763,33 +1774,58 @@ function drawTextSegments(ctx, segments, bodyStyle, w, h, scaleFactor = 1) {
     y += line.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;
@@ -1805,19 +1841,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,
@@ -1828,14 +1852,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;
 }