@harbour-enterprises/superdoc 1.0.0-beta.97 → 1.0.0-beta.99

package/dist/chunks/{super-editor.es-BinyZw4F.es.js → super-editor.es-BiaFIbw-.es.js}

@@ -42404,7 +42404,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.97") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.99") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -59622,7 +59622,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.97";
+const summaryVersion = "1.0.0-beta.99";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -60411,7 +60411,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      import("./index-Pvlqsxge-vW641SZt.es.js"),
+      import("./index-BB0msI45-DUPBw4Bh.es.js"),
       import("./index-DRCvimau-Cw339678.es.js"),
       import("./index-C_x_N6Uh-DJn8hIEt.es.js"),
       import("./index-D_sWOSiG-DE96TaT5.es.js"),
@@ -60616,7 +60616,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.97");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.99");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -62994,14 +62994,15 @@ function extractPageSizeAndOrientation(elements) {
   return { pageSizePx, orientation };
 }
 function extractFallbackMargins(elements, currentHeader, currentFooter) {
-  if (currentHeader !== void 0 && currentFooter !== void 0) {
-    return { headerPx: currentHeader, footerPx: currentFooter };
-  }
   const pgMar = elements.find((el) => el?.name === "w:pgMar");
   const a = pgMar?.attributes || {};
   return {
     headerPx: currentHeader ?? (a["w:header"] != null ? twipsToPixels$1(a["w:header"]) : void 0),
-    footerPx: currentFooter ?? (a["w:footer"] != null ? twipsToPixels$1(a["w:footer"]) : void 0)
+    footerPx: currentFooter ?? (a["w:footer"] != null ? twipsToPixels$1(a["w:footer"]) : void 0),
+    topPx: a["w:top"] != null ? twipsToPixels$1(a["w:top"]) : void 0,
+    rightPx: a["w:right"] != null ? twipsToPixels$1(a["w:right"]) : void 0,
+    bottomPx: a["w:bottom"] != null ? twipsToPixels$1(a["w:bottom"]) : void 0,
+    leftPx: a["w:left"] != null ? twipsToPixels$1(a["w:left"]) : void 0
   };
 }
 function extractHeaderFooterRefs(elements, refName) {
@@ -63062,7 +63063,10 @@ function extractSectionData(para) {
   const type2 = extractSectionType(sectPrElements);
   const { pageSizePx, orientation } = extractPageSizeAndOrientation(sectPrElements);
   const titlePg = sectPrElements.some((el) => el?.name === "w:titlePg");
-  ({ headerPx, footerPx } = extractFallbackMargins(sectPrElements, headerPx, footerPx));
+  const fallbackMargins = extractFallbackMargins(sectPrElements, headerPx, footerPx);
+  headerPx = fallbackMargins.headerPx;
+  footerPx = fallbackMargins.footerPx;
+  const { topPx, rightPx, bottomPx, leftPx } = fallbackMargins;
   const headerRefs = extractHeaderFooterRefs(sectPrElements, "w:headerReference");
   const footerRefs = extractHeaderFooterRefs(sectPrElements, "w:footerReference");
   const numbering = extractPageNumbering(sectPrElements);
@@ -63071,6 +63075,10 @@ function extractSectionData(para) {
   return {
     headerPx,
     footerPx,
+    topPx,
+    rightPx,
+    bottomPx,
+    leftPx,
     type: type2,
     pageSizePx,
     orientation,
@@ -63182,7 +63190,14 @@ function buildSectionRangesFromParagraphs(paragraphs, hasBodySectPr) {
       startParagraphIndex: currentStart,
       endParagraphIndex: item.index,
       sectPr,
-      margins: sectionData.headerPx != null || sectionData.footerPx != null ? { header: sectionData.headerPx ?? 0, footer: sectionData.footerPx ?? 0 } : null,
+      margins: sectionData.headerPx != null || sectionData.footerPx != null ? {
+        header: sectionData.headerPx ?? 0,
+        footer: sectionData.footerPx ?? 0,
+        top: sectionData.topPx,
+        right: sectionData.rightPx,
+        bottom: sectionData.bottomPx,
+        left: sectionData.leftPx
+      } : null,
       pageSize: sectionData.pageSizePx ?? null,
       orientation: sectionData.orientation ?? null,
       columns: sectionData.columnsPx ?? null,
@@ -63224,7 +63239,14 @@ function createFinalSectionFromBodySectPr(bodySectPr, currentStart, totalParagra
     startParagraphIndex: currentStart,
     endParagraphIndex: totalParagraphs - 1,
     sectPr: bodySectPr,
-    margins: bodySectionData.headerPx != null || bodySectionData.footerPx != null ? { header: bodySectionData.headerPx ?? 0, footer: bodySectionData.footerPx ?? 0 } : null,
+    margins: bodySectionData.headerPx != null || bodySectionData.footerPx != null ? {
+      header: bodySectionData.headerPx ?? 0,
+      footer: bodySectionData.footerPx ?? 0,
+      top: bodySectionData.topPx,
+      right: bodySectionData.rightPx,
+      bottom: bodySectionData.bottomPx,
+      left: bodySectionData.leftPx
+    } : null,
     pageSize: bodySectionData.pageSizePx ?? null,
     orientation: bodySectionData.orientation ?? null,
     columns: bodySectionData.columnsPx ?? null,
@@ -69503,41 +69525,6 @@ const parseTableCell = (args) => {
       }
     }
   }
-  try {
-    const blockSummaries = blocks.map((b2) => {
-      if (b2.kind === "paragraph") {
-        const runs = b2.runs ?? [];
-        const attrs = b2.attrs ?? {};
-        return {
-          kind: "paragraph",
-          runKinds: runs.map((r2) => r2.kind ?? "text"),
-          runCount: runs.length,
-          runPreview: runs.map((r2) => {
-            const kind = r2.kind ?? "text";
-            if (kind === "image") {
-              const img = r2;
-              return { kind, src: img.src, width: img.width, height: img.height };
-            }
-            return { kind };
-          }),
-          hasNumbering: Boolean(attrs.numberingProperties),
-          markerText: attrs.wordLayout?.marker?.markerText
-        };
-      }
-      return { kind: b2.kind };
-    });
-    console.log(
-      "[tableNodeToBlock.parseTableCell] cell contents",
-      JSON.stringify({
-        cellIndex,
-        rowIndex,
-        cellIdPreview: `cell-${rowIndex}-${cellIndex}`,
-        childTypes: cellNode.content.map((c2) => c2?.type),
-        blocks: blockSummaries
-      })
-    );
-  } catch {
-  }
   if (blocks.length === 0) {
     return null;
   }
@@ -73402,20 +73389,6 @@ const renderTableCell = (deps) => {
   }
   const cellBlocks = cell?.blocks ?? (cell?.paragraph ? [cell.paragraph] : []);
   const blockMeasures = cellMeasure?.blocks ?? (cellMeasure?.paragraph ? [cellMeasure.paragraph] : []);
-  try {
-    console.log(
-      "[DomPainter.renderTableCell] cell render input",
-      JSON.stringify({
-        cellId: cell?.id,
-        blockKinds: cellBlocks.map((b2) => b2.kind),
-        measureKinds: blockMeasures.map((m2) => m2.kind),
-        width: cellMeasure?.width,
-        height: cellMeasure?.height,
-        rowHeight
-      })
-    );
-  } catch {
-  }
   if (cellBlocks.length > 0 && blockMeasures.length > 0) {
     const content = doc2.createElement("div");
     content.style.position = "relative";
@@ -73448,15 +73421,6 @@ const renderTableCell = (deps) => {
       const blockMeasure = blockMeasures[i];
       const block = cellBlocks[i];
       if (blockMeasure.kind === "image" && block?.kind === "image") {
-        console.log(
-          "[DomPainter.renderTableCell] rendering image block in cell",
-          JSON.stringify({
-            cellId: cell?.id,
-            blockId: block.id,
-            width: blockMeasure.width,
-            height: blockMeasure.height
-          })
-        );
         const imageWrapper = doc2.createElement("div");
         imageWrapper.style.position = "relative";
         imageWrapper.style.width = `${blockMeasure.width}px`;
@@ -73479,16 +73443,6 @@ const renderTableCell = (deps) => {
         continue;
       }
       if (blockMeasure.kind === "drawing" && block?.kind === "drawing") {
-        console.log(
-          "[DomPainter.renderTableCell] rendering drawing block in cell",
-          JSON.stringify({
-            cellId: cell?.id,
-            blockId: block.id,
-            drawingKind: block.drawingKind,
-            width: blockMeasure.width,
-            height: blockMeasure.height
-          })
-        );
         const drawingWrapper = doc2.createElement("div");
         drawingWrapper.style.position = "relative";
         drawingWrapper.style.width = `${blockMeasure.width}px`;
@@ -73531,20 +73485,6 @@ const renderTableCell = (deps) => {
         continue;
       }
       if (blockMeasure.kind === "paragraph" && block?.kind === "paragraph") {
-        try {
-          const runKinds = (block.runs ?? []).map((r2) => r2.kind ?? "text");
-          const imageRuns = (block.runs ?? []).filter((r2) => r2.kind === "image").map((r2) => ({ src: r2.src }));
-          console.log(
-            "[DomPainter.renderTableCell] rendering paragraph block in cell",
-            JSON.stringify({
-              cellId: cell?.id,
-              blockId: block.id,
-              runKinds,
-              imageRuns
-            })
-          );
-        } catch {
-        }
         const paragraphMeasure = blockMeasure;
         const lines = paragraphMeasure.lines;
         const blockLineCount = lines?.length || 0;
@@ -74467,6 +74407,61 @@ function ensureRulerStyles(doc2) {
   doc2.head?.appendChild(styleEl);
   rulerStylesInjected = true;
 }
+const hashParagraphBorder$1 = (border) => {
+  const parts = [];
+  if (border.style !== void 0) parts.push(`s:${border.style}`);
+  if (border.width !== void 0) parts.push(`w:${border.width}`);
+  if (border.color !== void 0) parts.push(`c:${border.color}`);
+  if (border.space !== void 0) parts.push(`sp:${border.space}`);
+  return parts.join(",");
+};
+const hashParagraphBorders$1 = (borders) => {
+  const parts = [];
+  if (borders.top) parts.push(`t:[${hashParagraphBorder$1(borders.top)}]`);
+  if (borders.right) parts.push(`r:[${hashParagraphBorder$1(borders.right)}]`);
+  if (borders.bottom) parts.push(`b:[${hashParagraphBorder$1(borders.bottom)}]`);
+  if (borders.left) parts.push(`l:[${hashParagraphBorder$1(borders.left)}]`);
+  return parts.join(";");
+};
+const hasStringProp = (run2, prop) => {
+  return prop in run2 && typeof run2[prop] === "string";
+};
+const hasNumberProp = (run2, prop) => {
+  return prop in run2 && typeof run2[prop] === "number";
+};
+const hasBooleanProp = (run2, prop) => {
+  return prop in run2 && typeof run2[prop] === "boolean";
+};
+const getRunStringProp = (run2, prop) => {
+  if (hasStringProp(run2, prop)) {
+    return run2[prop];
+  }
+  return "";
+};
+const getRunNumberProp = (run2, prop) => {
+  if (hasNumberProp(run2, prop)) {
+    return run2[prop];
+  }
+  return 0;
+};
+const getRunBooleanProp = (run2, prop) => {
+  if (hasBooleanProp(run2, prop)) {
+    return run2[prop];
+  }
+  return false;
+};
+const getRunUnderlineStyle = (run2) => {
+  if ("underline" in run2 && run2.underline && typeof run2.underline === "object") {
+    return run2.underline.style ?? "";
+  }
+  return "";
+};
+const getRunUnderlineColor = (run2) => {
+  if ("underline" in run2 && run2.underline && typeof run2.underline === "object") {
+    return run2.underline.color ?? "";
+  }
+  return "";
+};
 function isMinimalWordLayout(value) {
   if (typeof value !== "object" || value === null) {
     return false;
@@ -75359,7 +75354,9 @@ const _DomPainter = class _DomPainter2 {
       const isTocEntry = block.attrs?.isTocEntry;
       const hasMarker = !fragment.continuesFromPrev && fragment.markerWidth && wordLayout?.marker;
       const hasSdtContainer = block.attrs?.sdt?.type === "documentSection" || block.attrs?.sdt?.type === "structuredContent" || block.attrs?.containerSdt?.type === "documentSection" || block.attrs?.containerSdt?.type === "structuredContent";
-      const styles = isTocEntry ? { ...fragmentStyles, whiteSpace: "nowrap" } : hasMarker || hasSdtContainer ? { ...fragmentStyles, overflow: "visible" } : fragmentStyles;
+      const paraIndentForOverflow = block.attrs?.indent;
+      const hasNegativeIndent = (paraIndentForOverflow?.left ?? 0) < 0 || (paraIndentForOverflow?.right ?? 0) < 0;
+      const styles = isTocEntry ? { ...fragmentStyles, whiteSpace: "nowrap" } : hasMarker || hasSdtContainer || hasNegativeIndent ? { ...fragmentStyles, overflow: "visible" } : fragmentStyles;
       applyStyles$2(fragmentEl, styles);
       this.applyFragmentFrame(fragmentEl, fragment, context.section);
       if (isTocEntry) {
@@ -75388,6 +75385,8 @@ const _DomPainter = class _DomPainter2 {
       }
       if (fragmentEl.style.paddingLeft) fragmentEl.style.removeProperty("padding-left");
       if (fragmentEl.style.paddingRight) fragmentEl.style.removeProperty("padding-right");
+      if (fragmentEl.style.marginLeft) fragmentEl.style.removeProperty("margin-left");
+      if (fragmentEl.style.marginRight) fragmentEl.style.removeProperty("margin-right");
       if (fragmentEl.style.textIndent) fragmentEl.style.removeProperty("text-indent");
       const paraIndent = block.attrs?.indent;
       const paraIndentLeft = paraIndent?.left ?? 0;
@@ -75416,16 +75415,22 @@ const _DomPainter = class _DomPainter2 {
         if (!isListFirstLine) {
           if (hasExplicitSegmentPositioning) {
             if (isFirstLine && firstLineOffset !== 0) {
-              const adjustedPadding = paraIndentLeft + firstLineOffset;
-              lineEl.style.paddingLeft = `${adjustedPadding}px`;
+              const effectiveLeftIndent = paraIndentLeft < 0 ? 0 : paraIndentLeft;
+              const adjustedPadding = effectiveLeftIndent + firstLineOffset;
+              if (adjustedPadding > 0) {
+                lineEl.style.paddingLeft = `${adjustedPadding}px`;
+              }
             }
-          } else if (paraIndentLeft) {
+          } else if (paraIndentLeft && paraIndentLeft > 0) {
             lineEl.style.paddingLeft = `${paraIndentLeft}px`;
+          } else if (!isFirstLine && paraIndent?.hanging && paraIndent.hanging > 0) {
+            lineEl.style.paddingLeft = `${paraIndent.hanging}px`;
           }
         }
-        if (paraIndentRight) {
+        if (paraIndentRight && paraIndentRight > 0) {
           lineEl.style.paddingRight = `${paraIndentRight}px`;
         }
+        const hasNegativeLeftIndent = paraIndentLeft != null && paraIndentLeft < 0;
         if (!fragment.continuesFromPrev && index2 === 0 && firstLineOffset && !isListFirstLine) {
           if (!hasExplicitSegmentPositioning) {
             lineEl.style.textIndent = `${firstLineOffset}px`;
@@ -77536,7 +77541,7 @@ const deriveBlockVersion = (block) => {
       attrs.indent?.right ?? "",
       attrs.indent?.firstLine ?? "",
       attrs.indent?.hanging ?? "",
-      attrs.borders ? JSON.stringify(attrs.borders) : "",
+      attrs.borders ? hashParagraphBorders$1(attrs.borders) : "",
       attrs.shading?.fill ?? "",
       attrs.shading?.color ?? "",
       attrs.direction ?? "",
@@ -77625,14 +77630,43 @@ const deriveBlockVersion = (block) => {
         for (const cellBlock of cellBlocks) {
           hash2 = hashString(hash2, cellBlock?.kind ?? "unknown");
           if (cellBlock?.kind === "paragraph") {
-            const runs = cellBlock.runs ?? [];
+            const paragraphBlock = cellBlock;
+            const runs = paragraphBlock.runs ?? [];
             hash2 = hashNumber(hash2, runs.length);
+            const attrs = paragraphBlock.attrs;
+            if (attrs) {
+              hash2 = hashString(hash2, attrs.alignment ?? "");
+              hash2 = hashNumber(hash2, attrs.spacing?.before ?? 0);
+              hash2 = hashNumber(hash2, attrs.spacing?.after ?? 0);
+              hash2 = hashNumber(hash2, attrs.spacing?.line ?? 0);
+              hash2 = hashString(hash2, attrs.spacing?.lineRule ?? "");
+              hash2 = hashNumber(hash2, attrs.indent?.left ?? 0);
+              hash2 = hashNumber(hash2, attrs.indent?.right ?? 0);
+              hash2 = hashNumber(hash2, attrs.indent?.firstLine ?? 0);
+              hash2 = hashNumber(hash2, attrs.indent?.hanging ?? 0);
+              hash2 = hashString(hash2, attrs.shading?.fill ?? "");
+              hash2 = hashString(hash2, attrs.shading?.color ?? "");
+              hash2 = hashString(hash2, attrs.direction ?? "");
+              hash2 = hashString(hash2, attrs.rtl ? "1" : "");
+              if (attrs.borders) {
+                hash2 = hashString(hash2, hashParagraphBorders$1(attrs.borders));
+              }
+            }
             for (const run2 of runs) {
               if ("text" in run2 && typeof run2.text === "string") {
                 hash2 = hashString(hash2, run2.text);
               }
               hash2 = hashNumber(hash2, run2.pmStart ?? -1);
               hash2 = hashNumber(hash2, run2.pmEnd ?? -1);
+              hash2 = hashString(hash2, getRunStringProp(run2, "color"));
+              hash2 = hashString(hash2, getRunStringProp(run2, "highlight"));
+              hash2 = hashString(hash2, getRunBooleanProp(run2, "bold") ? "1" : "");
+              hash2 = hashString(hash2, getRunBooleanProp(run2, "italic") ? "1" : "");
+              hash2 = hashNumber(hash2, getRunNumberProp(run2, "fontSize"));
+              hash2 = hashString(hash2, getRunStringProp(run2, "fontFamily"));
+              hash2 = hashString(hash2, getRunUnderlineStyle(run2));
+              hash2 = hashString(hash2, getRunUnderlineColor(run2));
+              hash2 = hashString(hash2, getRunBooleanProp(run2, "strike") ? "1" : "");
             }
           }
         }
@@ -77710,15 +77744,18 @@ const applyParagraphBlockStyles = (element, attrs) => {
   }
   const indent = attrs.indent;
   if (indent) {
-    if (indent.left) {
+    if (indent.left && indent.left > 0) {
       element.style.paddingLeft = `${indent.left}px`;
     }
-    if (indent.right) {
+    if (indent.right && indent.right > 0) {
       element.style.paddingRight = `${indent.right}px`;
     }
-    const textIndent = (indent.firstLine ?? 0) - (indent.hanging ?? 0);
-    if (textIndent) {
-      element.style.textIndent = `${textIndent}px`;
+    const hasNegativeLeftIndent = indent.left != null && indent.left < 0;
+    if (!hasNegativeLeftIndent) {
+      const textIndent = (indent.firstLine ?? 0) - (indent.hanging ?? 0);
+      if (textIndent) {
+        element.style.textIndent = `${textIndent}px`;
+      }
     }
   }
   applyParagraphBorderStyles(element, attrs.borders);
@@ -79080,20 +79117,6 @@ const asSafeNumber = (value) => {
   }
   return value;
 };
-function calculateFirstLineIndent(block, measure) {
-  const wordLayout = block.attrs?.wordLayout;
-  if (!wordLayout?.firstLineIndentMode) {
-    return 0;
-  }
-  if (!wordLayout.marker || !measure.marker) {
-    return 0;
-  }
-  const markerWidthRaw = measure.marker.markerWidth ?? wordLayout.marker.markerBoxWidthPx ?? 0;
-  const markerWidth = Number.isFinite(markerWidthRaw) && markerWidthRaw >= 0 ? markerWidthRaw : 0;
-  const gutterWidthRaw = measure.marker.gutterWidth ?? 0;
-  const gutterWidth = Number.isFinite(gutterWidthRaw) && gutterWidthRaw >= 0 ? gutterWidthRaw : 0;
-  return markerWidth + gutterWidth;
-}
 function layoutParagraphBlock(ctx2, anchors) {
   const { block, measure, columnWidth, ensurePage, advanceColumn, columnX, floatManager } = ctx2;
   const remeasureParagraph2 = ctx2.remeasureParagraph;
@@ -79215,10 +79238,25 @@ function layoutParagraphBlock(ctx2, anchors) {
   }
   let lines = normalizeLines(measure);
   const measurementWidth = lines[0]?.maxWidth;
+  const paraIndent = block.attrs?.indent;
+  const indentLeft = typeof paraIndent?.left === "number" && Number.isFinite(paraIndent.left) ? paraIndent.left : 0;
+  const indentRight = typeof paraIndent?.right === "number" && Number.isFinite(paraIndent.right) ? paraIndent.right : 0;
+  const negativeLeftIndent = indentLeft < 0 ? indentLeft : 0;
+  const negativeRightIndent = indentRight < 0 ? indentRight : 0;
+  const remeasureWidth = Math.max(1, columnWidth - indentLeft - indentRight);
   let didRemeasureForColumnWidth = false;
-  if (typeof remeasureParagraph2 === "function" && typeof measurementWidth === "number" && measurementWidth > columnWidth) {
-    const firstLineIndent = calculateFirstLineIndent(block, measure);
-    const newMeasure = remeasureParagraph2(block, columnWidth, firstLineIndent);
+  if (typeof remeasureParagraph2 === "function" && typeof measurementWidth === "number" && measurementWidth > remeasureWidth) {
+    let firstLineIndent = 0;
+    const wordLayout = block.attrs?.wordLayout;
+    if (wordLayout?.marker && measure.marker) {
+      const markerJustification = wordLayout.marker.justification ?? "left";
+      if (markerJustification === "left") {
+        const markerWidth = measure.marker.markerWidth ?? 0;
+        const gutterWidth = measure.marker.gutterWidth ?? wordLayout.marker.gutterWidthPx ?? 0;
+        firstLineIndent = markerWidth + gutterWidth;
+      }
+    }
+    const newMeasure = remeasureParagraph2(block, remeasureWidth, firstLineIndent);
     lines = normalizeLines(newMeasure);
     didRemeasureForColumnWidth = true;
   }
@@ -79297,9 +79335,19 @@ function layoutParagraphBlock(ctx2, anchors) {
       }
       tempY += lineHeight2;
     }
-    if (narrowestWidth < columnWidth) {
-      const firstLineIndent = calculateFirstLineIndent(block, measure);
-      const newMeasure = remeasureParagraph2(block, narrowestWidth, firstLineIndent);
+    const narrowestRemeasureWidth = Math.max(1, narrowestWidth - indentLeft - indentRight);
+    if (narrowestRemeasureWidth < remeasureWidth) {
+      let firstLineIndent = 0;
+      const wordLayout = block.attrs?.wordLayout;
+      if (wordLayout?.marker && measure.marker) {
+        const markerJustification = wordLayout.marker.justification ?? "left";
+        if (markerJustification === "left") {
+          const markerWidth = measure.marker.markerWidth ?? 0;
+          const gutterWidth = measure.marker.gutterWidth ?? wordLayout.marker.gutterWidthPx ?? 0;
+          firstLineIndent = markerWidth + gutterWidth;
+        }
+      }
+      const newMeasure = remeasureParagraph2(block, narrowestRemeasureWidth, firstLineIndent);
       lines = normalizeLines(newMeasure);
       didRemeasureForFloats = true;
     }
@@ -79353,14 +79401,16 @@ function layoutParagraphBlock(ctx2, anchors) {
     }
     const slice2 = sliceLines(lines, fromLine, state2.contentBottom - state2.cursorY);
     const fragmentHeight = slice2.height;
+    const adjustedX = columnX(state2.columnIndex) + offsetX + negativeLeftIndent;
+    const adjustedWidth = effectiveColumnWidth - negativeLeftIndent - negativeRightIndent;
     const fragment = {
       kind: "para",
       blockId: block.id,
       fromLine,
       toLine: slice2.toLine,
-      x: columnX(state2.columnIndex) + offsetX,
+      x: adjustedX,
       y: state2.cursorY,
-      width: effectiveColumnWidth,
+      width: adjustedWidth,
       ...computeFragmentPmRange(block, lines, fromLine, slice2.toLine)
     };
     if (didRemeasureForColumnWidth) {
@@ -81314,10 +81364,6 @@ const resolveTrackedChangesEnabled = (attrs, defaultEnabled = true) => {
   }
   return attrs.trackedChangesEnabled !== false;
 };
-const MAX_CACHE_SIZE$1 = 1e4;
-const BYTES_PER_ENTRY_ESTIMATE = 5e3;
-const NORMALIZED_WHITESPACE = /\s+/g;
-const normalizeText = (text) => text.replace(NORMALIZED_WHITESPACE, " ");
 const hashParagraphBorder = (border) => {
   const parts = [];
   if (border.style !== void 0) parts.push(`s:${border.style}`);
@@ -81334,6 +81380,10 @@ const hashParagraphBorders = (borders) => {
   if (borders.left) parts.push(`l:[${hashParagraphBorder(borders.left)}]`);
   return parts.join(";");
 };
+const MAX_CACHE_SIZE$1 = 1e4;
+const BYTES_PER_ENTRY_ESTIMATE = 5e3;
+const NORMALIZED_WHITESPACE = /\s+/g;
+const normalizeText = (text) => text.replace(NORMALIZED_WHITESPACE, " ");
 const hashParagraphFrame = (frame) => {
   const parts = [];
   if (frame.wrap !== void 0) parts.push(`w:${frame.wrap}`);
@@ -81370,12 +81420,14 @@ const hashRuns = (block) => {
             const color = "color" in run2 ? run2.color : void 0;
             const fontSize2 = "fontSize" in run2 ? run2.fontSize : void 0;
             const fontFamily2 = "fontFamily" in run2 ? run2.fontFamily : void 0;
+            const highlight = "highlight" in run2 ? run2.highlight : void 0;
             const marks = [
               bold ? "b" : "",
               italic ? "i" : "",
               color ?? "",
               fontSize2 !== void 0 ? `fs:${fontSize2}` : "",
-              fontFamily2 ? `ff:${fontFamily2}` : ""
+              fontFamily2 ? `ff:${fontFamily2}` : "",
+              highlight ? `hl:${highlight}` : ""
             ].join("");
             let trackedKey = "";
             if (hasTrackedChange(run2)) {
@@ -81386,6 +81438,38 @@ const hashRuns = (block) => {
             }
             cellHashes.push(`${text}:${marks}${trackedKey}`);
           }
+          if (paragraphBlock.attrs) {
+            const attrs = paragraphBlock.attrs;
+            const parts = [];
+            if (attrs.alignment) parts.push(`al:${attrs.alignment}`);
+            if (attrs.spacing) {
+              const s2 = attrs.spacing;
+              if (s2.before !== void 0) parts.push(`sb:${s2.before}`);
+              if (s2.after !== void 0) parts.push(`sa:${s2.after}`);
+              if (s2.line !== void 0) parts.push(`sl:${s2.line}`);
+              if (s2.lineRule) parts.push(`sr:${s2.lineRule}`);
+            }
+            if (attrs.indent) {
+              const ind = attrs.indent;
+              if (ind.left !== void 0) parts.push(`il:${ind.left}`);
+              if (ind.right !== void 0) parts.push(`ir:${ind.right}`);
+              if (ind.firstLine !== void 0) parts.push(`if:${ind.firstLine}`);
+              if (ind.hanging !== void 0) parts.push(`ih:${ind.hanging}`);
+            }
+            if (attrs.borders) {
+              parts.push(`br:${hashParagraphBorders(attrs.borders)}`);
+            }
+            if (attrs.shading) {
+              const sh = attrs.shading;
+              if (sh.fill) parts.push(`shf:${sh.fill}`);
+              if (sh.color) parts.push(`shc:${sh.color}`);
+            }
+            if (attrs.direction) parts.push(`dir:${attrs.direction}`);
+            if (attrs.rtl) parts.push("rtl");
+            if (parts.length > 0) {
+              cellHashes.push(`pa:${parts.join(":")}`);
+            }
+          }
         }
       }
     }
@@ -81409,12 +81493,14 @@ const hashRuns = (block) => {
     const color = "color" in run2 ? run2.color : void 0;
     const fontSize2 = "fontSize" in run2 ? run2.fontSize : void 0;
     const fontFamily2 = "fontFamily" in run2 ? run2.fontFamily : void 0;
+    const highlight = "highlight" in run2 ? run2.highlight : void 0;
     const marks = [
       bold ? "b" : "",
       italic ? "i" : "",
       color ?? "",
       fontSize2 !== void 0 ? `fs:${fontSize2}` : "",
-      fontFamily2 ? `ff:${fontFamily2}` : ""
+      fontFamily2 ? `ff:${fontFamily2}` : "",
+      highlight ? `hl:${highlight}` : ""
     ].join("");
     let trackedKey = "";
     if (hasTrackedChange(run2)) {
@@ -82541,7 +82627,7 @@ const paragraphBlocksEqual = (a, b2) => {
   for (let i = 0; i < a.runs.length; i += 1) {
     const runA = a.runs[i];
     const runB = b2.runs[i];
-    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
+    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
       return false;
     }
   }
@@ -83068,9 +83154,15 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
 }
 const DEFAULT_PAGE_SIZE$1 = { w: 612, h: 792 };
 const DEFAULT_MARGINS$1 = { top: 72, right: 72, bottom: 72, left: 72 };
+const normalizeMargin = (value, fallback) => Number.isFinite(value) ? value : fallback;
 function resolveMeasurementConstraints(options) {
   const pageSize = options.pageSize ?? DEFAULT_PAGE_SIZE$1;
-  const margins = options.margins ?? DEFAULT_MARGINS$1;
+  const margins = {
+    top: normalizeMargin(options.margins?.top, DEFAULT_MARGINS$1.top),
+    right: normalizeMargin(options.margins?.right, DEFAULT_MARGINS$1.right),
+    bottom: normalizeMargin(options.margins?.bottom, DEFAULT_MARGINS$1.bottom),
+    left: normalizeMargin(options.margins?.left, DEFAULT_MARGINS$1.left)
+  };
   const contentWidth = pageSize.w - (margins.left + margins.right);
   const contentHeight = pageSize.h - (margins.top + margins.bottom);
   const columns = options.columns;
@@ -84608,8 +84700,8 @@ async function measureParagraphBlock(block, maxWidth) {
   const lines = [];
   const indent = block.attrs?.indent;
   const spacing = block.attrs?.spacing;
-  const indentLeft = sanitizePositive(indent?.left);
-  const indentRight = sanitizePositive(indent?.right);
+  const indentLeft = sanitizeIndent(indent?.left);
+  const indentRight = sanitizeIndent(indent?.right);
   const firstLine = indent?.firstLine ?? 0;
   const hanging = indent?.hanging ?? 0;
   const isWordLayoutList = Boolean(wordLayout?.marker);
@@ -84618,10 +84710,10 @@ async function measureParagraphBlock(block, maxWidth) {
   const clampedFirstLineOffset = Math.max(0, rawFirstLineOffset);
   const firstLineOffset = isWordLayoutList ? 0 : clampedFirstLineOffset;
   const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
+  const bodyContentWidth = contentWidth;
   let initialAvailableWidth;
   const textStartPx = wordLayout?.textStartPx;
-  const treatAsHanging = isWordLayoutList && indentLeft === 0 && hanging === 0 && typeof textStartPx === "number";
-  if (typeof textStartPx === "number" && textStartPx > indentLeft && !treatAsHanging) {
+  if (typeof textStartPx === "number" && textStartPx > indentLeft) {
     initialAvailableWidth = Math.max(1, maxWidth - textStartPx - indentRight);
   } else {
     initialAvailableWidth = Math.max(1, contentWidth - firstLineOffset);
@@ -84668,21 +84760,6 @@ async function measureParagraphBlock(block, maxWidth) {
       totalHeight: metrics.lineHeight
     };
   }
-  const isListLike = Boolean(block.attrs?.numId || wordLayout?.marker);
-  if (isListLike) {
-    console.log(
-      "[measureParagraph][list]",
-      JSON.stringify({
-        blockId: block.id,
-        maxWidth,
-        indentLeft,
-        indentRight,
-        textStartPx: textStartPx ?? null,
-        firstLineOffset: firstLineOffset ?? null,
-        initialAvailableWidth
-      })
-    );
-  }
   let currentLine = null;
   const getEffectiveWidth = (baseWidth) => {
     if (dropCapMeasure && lines.length < dropCapMeasure.lines && dropCapMeasure.mode === "drop") {
@@ -84828,7 +84905,7 @@ async function measureParagraphBlock(block, maxWidth) {
         lines.push(emptyLine);
       }
       const hadPreviousLine = lines.length > 0;
-      const nextLineMaxWidth = hadPreviousLine ? getEffectiveWidth(contentWidth) : getEffectiveWidth(initialAvailableWidth);
+      const nextLineMaxWidth = hadPreviousLine ? getEffectiveWidth(bodyContentWidth) : getEffectiveWidth(initialAvailableWidth);
       currentLine = {
         fromRun: runIndex,
         fromChar: 0,
@@ -84939,7 +85016,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 1,
           width: imageWidth,
           maxFontSize: imageHeight,
-          maxWidth: getEffectiveWidth(contentWidth),
+          maxWidth: getEffectiveWidth(bodyContentWidth),
           spaceCount: 0,
           segments: [
             {
@@ -85028,7 +85105,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 1,
           width: annotationWidth,
           maxFontSize: annotationHeight,
-          maxWidth: getEffectiveWidth(contentWidth),
+          maxWidth: getEffectiveWidth(bodyContentWidth),
           spaceCount: 0,
           segments: [
             {
@@ -85110,7 +85187,7 @@ async function measureParagraphBlock(block, maxWidth) {
               width: spacesWidth,
               maxFontSize: run2.fontSize,
               maxFontInfo: getFontInfoFromRun(run2),
-              maxWidth: getEffectiveWidth(contentWidth),
+              maxWidth: getEffectiveWidth(bodyContentWidth),
               segments: [{ runIndex, fromChar: spacesStartChar, toChar: spacesEndChar, width: spacesWidth }],
               spaceCount: spacesLength
             };
@@ -85173,7 +85250,7 @@ async function measureParagraphBlock(block, maxWidth) {
                 width: singleSpaceWidth,
                 maxFontSize: run2.fontSize,
                 maxFontInfo: getFontInfoFromRun(run2),
-                maxWidth: getEffectiveWidth(contentWidth),
+                maxWidth: getEffectiveWidth(bodyContentWidth),
                 segments: [{ runIndex, fromChar: spaceStartChar, toChar: spaceEndChar, width: singleSpaceWidth }],
                 spaceCount: 1
               };
@@ -85366,7 +85443,7 @@ async function measureParagraphBlock(block, maxWidth) {
             width: wordOnlyWidth,
             maxFontSize: run2.fontSize,
             maxFontInfo: getFontInfoFromRun(run2),
-            maxWidth: getEffectiveWidth(contentWidth),
+            maxWidth: getEffectiveWidth(bodyContentWidth),
             segments: [{ runIndex, fromChar: wordStartChar, toChar: wordEndNoSpace, width: wordOnlyWidth }],
             spaceCount: 0
           };
@@ -85931,6 +86008,7 @@ const resolveLineHeight = (spacing, baseLineHeight) => {
   return Math.max(baseLineHeight, raw);
 };
 const sanitizePositive = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0;
+const sanitizeIndent = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
 const sanitizeDecimalSeparator = (value) => {
   if (value === ",") return ",";
   return DEFAULT_DECIMAL_SEPARATOR;
@@ -90479,6 +90557,10 @@ resolveLayoutOptions_fn = function(blocks, sectionMetadata) {
   const pageSize = firstSection?.pageSize ?? defaults.pageSize;
   const margins = {
     ...defaults.margins,
+    ...firstSection?.margins?.top != null ? { top: firstSection.margins.top } : {},
+    ...firstSection?.margins?.right != null ? { right: firstSection.margins.right } : {},
+    ...firstSection?.margins?.bottom != null ? { bottom: firstSection.margins.bottom } : {},
+    ...firstSection?.margins?.left != null ? { left: firstSection.margins.left } : {},
     ...firstSection?.margins?.header != null ? { header: firstSection.margins.header } : {},
     ...firstSection?.margins?.footer != null ? { footer: firstSection.margins.footer } : {}
   };