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

package/dist/chunks/{super-editor.es-DLfNMkAR.cjs → super-editor.es-BP3PKkwh.cjs}

@@ -42421,7 +42421,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.95") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.97") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -59639,7 +59639,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.95";
+const summaryVersion = "1.0.0-beta.97";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -60428,7 +60428,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-DJD7xO_i-CVT8OSh8.cjs")),
+      Promise.resolve().then(() => require("./index-Pvlqsxge-IH3eauKE.cjs")),
       Promise.resolve().then(() => require("./index-DRCvimau-H4Ck3S9a.cjs")),
       Promise.resolve().then(() => require("./index-C_x_N6Uh-Db3CUJMX.cjs")),
       Promise.resolve().then(() => require("./index-D_sWOSiG-BtDZzJ6I.cjs")),
@@ -60633,7 +60633,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.95");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.97");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -62957,12 +62957,12 @@ var SectionType = /* @__PURE__ */ ((SectionType2) => {
 })(SectionType || {});
 const DEFAULT_PARAGRAPH_SECTION_TYPE = "nextPage";
 const DEFAULT_BODY_SECTION_TYPE = "continuous";
-const TWIPS_PER_INCH$3 = 1440;
-const PX_PER_INCH$2 = 96;
+const TWIPS_PER_INCH$4 = 1440;
+const PX_PER_INCH$3 = 96;
 const DEFAULT_COLUMN_GAP_INCHES = 0.5;
 function twipsToPixels$1(twips) {
   const n = Number(twips);
-  return Number.isFinite(n) ? n / TWIPS_PER_INCH$3 * PX_PER_INCH$2 : void 0;
+  return Number.isFinite(n) ? n / TWIPS_PER_INCH$4 * PX_PER_INCH$3 : void 0;
 }
 function parseColumnCount(rawValue) {
   if (rawValue == null) return 1;
@@ -62972,7 +62972,7 @@ function parseColumnCount(rawValue) {
 function parseColumnGap(gapTwips) {
   if (gapTwips == null) return DEFAULT_COLUMN_GAP_INCHES;
   const gap = Number(gapTwips);
-  return Number.isFinite(gap) ? gap / TWIPS_PER_INCH$3 : DEFAULT_COLUMN_GAP_INCHES;
+  return Number.isFinite(gap) ? gap / TWIPS_PER_INCH$4 : DEFAULT_COLUMN_GAP_INCHES;
 }
 function extractNormalizedMargins(attrs) {
   const sectionMargins = attrs.sectionMargins;
@@ -63056,7 +63056,7 @@ function extractColumns(elements) {
   const gapInches = parseColumnGap(cols.attributes["w:space"]);
   return {
     count,
-    gap: gapInches * PX_PER_INCH$2
+    gap: gapInches * PX_PER_INCH$3
   };
 }
 function extractVerticalAlign(elements) {
@@ -63292,8 +63292,8 @@ function analyzeSectionRanges(doc2, bodySectPr) {
   }
   return ranges;
 }
-const TWIPS_PER_INCH$2 = 1440;
-const PX_PER_INCH$1 = 96;
+const TWIPS_PER_INCH$3 = 1440;
+const PX_PER_INCH$2 = 96;
 const PX_PER_PT = 96 / 72;
 SectionType.NEXT_PAGE;
 SectionType.CONTINUOUS;
@@ -63432,7 +63432,7 @@ const applyTrackedChangesModeToRuns = (runs, config2, hyperlinkConfig, applyMark
   }
   return filtered;
 };
-const twipsToPx$1 = (value) => value / TWIPS_PER_INCH$2 * PX_PER_INCH$1;
+const twipsToPx$2 = (value) => value / TWIPS_PER_INCH$3 * PX_PER_INCH$2;
 const ptToPx = (pt) => {
   if (pt == null || !Number.isFinite(pt)) return void 0;
   return pt * PX_PER_PT;
@@ -64942,8 +64942,8 @@ const normalizeParagraphSpacing = (value) => {
   const beforeAutospacing = toBooleanFlag(source.beforeAutospacing ?? source.beforeAutoSpacing);
   const afterAutospacing = toBooleanFlag(source.afterAutospacing ?? source.afterAutoSpacing);
   const contextualSpacing = toBooleanFlag(source.contextualSpacing);
-  const before = beforeRaw != null ? twipsToPx$1(beforeRaw) : pickNumber(source.lineSpaceBefore);
-  const after = afterRaw != null ? twipsToPx$1(afterRaw) : pickNumber(source.lineSpaceAfter);
+  const before = beforeRaw != null ? twipsToPx$2(beforeRaw) : pickNumber(source.lineSpaceBefore);
+  const after = afterRaw != null ? twipsToPx$2(afterRaw) : pickNumber(source.lineSpaceAfter);
   const line = normalizeLineValue(lineRaw, lineRule);
   if (before != null) spacing.before = before;
   if (after != null) spacing.after = after;
@@ -64973,9 +64973,9 @@ const normalizeLineValue = (value, lineRule) => {
     if (value > 0 && value <= MAX_AUTO_LINE_MULTIPLIER) {
       return value;
     }
-    return twipsToPx$1(value);
+    return twipsToPx$2(value);
   }
-  return twipsToPx$1(value);
+  return twipsToPx$2(value);
 };
 const normalizeLineRule = (value) => {
   if (value === "auto" || value === "exact" || value === "atLeast") {
@@ -65012,7 +65012,7 @@ const normalizeParagraphIndent = (value) => {
     if (Math.abs(num) <= TWIPS_THRESHOLD$1) {
       return num;
     }
-    return twipsToPx$1(Number(num));
+    return twipsToPx$2(Number(num));
   };
   const left2 = convert(pickNumber(source.left));
   const right2 = convert(pickNumber(source.right));
@@ -65592,9 +65592,9 @@ const buildFontCss = (run2) => {
   const family = run2.fontFamily ?? "Times New Roman";
   return `${style2}${weight}${size2} ${family}`;
 };
-const TWIPS_PER_INCH$1 = 1440;
+const TWIPS_PER_INCH$2 = 1440;
 const PIXELS_PER_INCH = 96;
-const TWIPS_PER_PIXEL = Math.round(TWIPS_PER_INCH$1 / PIXELS_PER_INCH);
+const TWIPS_PER_PIXEL = Math.round(TWIPS_PER_INCH$2 / PIXELS_PER_INCH);
 const PIXELS_PER_TWIP = 1 / TWIPS_PER_PIXEL;
 const toFiniteNumber = (value) => {
   if (value == null) return null;
@@ -66618,7 +66618,7 @@ const extractMarkerRun = (lvl) => {
   }
   const spacingTwips = parseNumberAttr(getAttribute(findChild(rPr, "w:spacing"), "w:val"));
   if (spacingTwips != null && Number.isFinite(spacingTwips)) {
-    run2.letterSpacing = twipsToPx$1(spacingTwips);
+    run2.letterSpacing = twipsToPx$2(spacingTwips);
   }
   return Object.keys(run2).length ? run2 : void 0;
 };
@@ -66693,6 +66693,13 @@ const isTruthy = (value) => {
   }
   return false;
 };
+const safeGetProperty = (obj, key2) => {
+  if (!obj || typeof obj !== "object") {
+    return void 0;
+  }
+  const record = obj;
+  return record[key2];
+};
 const isExplicitFalse = (value) => {
   if (value === false || value === 0) return true;
   if (typeof value === "string") {
@@ -66835,10 +66842,19 @@ const buildNumberingPath = (numId, ilvl, counterValue, listCounterContext) => {
 const convertIndentTwipsToPx = (indent) => {
   if (!indent) return void 0;
   const result = {};
-  if (isFiniteNumber(indent.left)) result.left = twipsToPx$1(Number(indent.left));
-  if (isFiniteNumber(indent.right)) result.right = twipsToPx$1(Number(indent.right));
-  if (isFiniteNumber(indent.firstLine)) result.firstLine = twipsToPx$1(Number(indent.firstLine));
-  if (isFiniteNumber(indent.hanging)) result.hanging = twipsToPx$1(Number(indent.hanging));
+  const toNum = (v2) => {
+    if (typeof v2 === "string" && v2.trim() !== "" && isFinite(Number(v2))) return Number(v2);
+    if (isFiniteNumber(v2)) return Number(v2);
+    return void 0;
+  };
+  const left2 = toNum(indent.left);
+  const right2 = toNum(indent.right);
+  const firstLine = toNum(indent.firstLine);
+  const hanging = toNum(indent.hanging);
+  if (left2 != null) result.left = twipsToPx$2(left2);
+  if (right2 != null) result.right = twipsToPx$2(right2);
+  if (firstLine != null) result.firstLine = twipsToPx$2(firstLine);
+  if (hanging != null) result.hanging = twipsToPx$2(hanging);
   return Object.keys(result).length > 0 ? result : void 0;
 };
 const toAdapterNumberingProps = (value) => {
@@ -66863,7 +66879,7 @@ const toResolvedTabStops = (tabs) => {
     if (!stop || typeof stop.pos !== "number") continue;
     const alignment2 = normalizeResolvedTabAlignment(stop.val);
     if (!alignment2) continue;
-    const position = twipsToPx$1(stop.pos);
+    const position = twipsToPx$2(stop.pos);
     if (!Number.isFinite(position)) continue;
     const resolvedStop = {
       position,
@@ -67185,8 +67201,9 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.spacing.afterAutospacing = normalizedSpacing.afterAutospacing;
     }
   }
-  if (normalizedSpacing?.contextualSpacing != null) {
-    paragraphAttrs.contextualSpacing = normalizedSpacing.contextualSpacing;
+  const contextualSpacingValue = normalizedSpacing?.contextualSpacing ?? safeGetProperty(paragraphProps, "contextualSpacing") ?? safeGetProperty(attrs, "contextualSpacing");
+  if (contextualSpacingValue != null) {
+    paragraphAttrs.contextualSpacing = isTruthy(contextualSpacingValue);
   }
   const hasExplicitIndent = Boolean(normalizedIndent);
   const hasNumberingIndent = Boolean(computed2.numbering?.indent?.left || computed2.numbering?.indent?.hanging);
@@ -67238,7 +67255,7 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.tabs = normalizedTabs;
     }
   }
-  const asString = (value) => {
+  const asString2 = (value) => {
     return typeof value === "string" ? value : void 0;
   };
   const normalizeFramePr = (value) => {
@@ -67261,7 +67278,7 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   };
   const framePr = normalizeFramePr(attrs.framePr) ?? normalizeFramePr(attrs.paragraphProperties?.framePr) ?? extractFramePrFromElements(attrs.paragraphProperties);
   if (framePr) {
-    const rawXAlign = asString(framePr["w:xAlign"] ?? framePr.xAlign);
+    const rawXAlign = asString2(framePr["w:xAlign"] ?? framePr.xAlign);
     const xAlign = typeof rawXAlign === "string" ? rawXAlign.toLowerCase() : void 0;
     if (xAlign === "left" || xAlign === "right" || xAlign === "center") {
       paragraphAttrs.floatAlignment = xAlign;
@@ -67271,7 +67288,7 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.dropCap = dropCap;
       const dropCapMode = typeof dropCap === "string" ? dropCap.toLowerCase() : "drop";
       const linesValue = pickNumber(framePr["w:lines"] ?? framePr.lines);
-      const wrapValue = asString(framePr["w:wrap"] ?? framePr.wrap);
+      const wrapValue = asString2(framePr["w:wrap"] ?? framePr.wrap);
       const dropCapRunInfo = extractDropCapRunFromParagraph(para);
       if (dropCapRunInfo) {
         const descriptor = {
@@ -67289,23 +67306,23 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       }
     }
     const frame = {};
-    const wrap2 = asString(framePr["w:wrap"] ?? framePr.wrap);
+    const wrap2 = asString2(framePr["w:wrap"] ?? framePr.wrap);
     if (wrap2) frame.wrap = wrap2;
     if (xAlign) {
       frame.xAlign = xAlign;
     }
-    const rawYAlign = asString(framePr["w:yAlign"] ?? framePr.yAlign);
+    const rawYAlign = asString2(framePr["w:yAlign"] ?? framePr.yAlign);
     if (rawYAlign) {
       frame.yAlign = rawYAlign;
     }
-    const hAnchor = asString(framePr["w:hAnchor"] ?? framePr.hAnchor);
+    const hAnchor = asString2(framePr["w:hAnchor"] ?? framePr.hAnchor);
     if (hAnchor) frame.hAnchor = hAnchor;
-    const vAnchor = asString(framePr["w:vAnchor"] ?? framePr.vAnchor);
+    const vAnchor = asString2(framePr["w:vAnchor"] ?? framePr.vAnchor);
     if (vAnchor) frame.vAnchor = vAnchor;
     const xTwips = pickNumber(framePr["w:x"] ?? framePr.x);
-    if (xTwips != null) frame.x = twipsToPx$1(xTwips);
+    if (xTwips != null) frame.x = twipsToPx$2(xTwips);
     const yTwips = pickNumber(framePr["w:y"] ?? framePr.y);
-    if (yTwips != null) frame.y = twipsToPx$1(yTwips);
+    if (yTwips != null) frame.y = twipsToPx$2(yTwips);
     if (Object.keys(frame).length > 0) {
       paragraphAttrs.frame = frame;
     }
@@ -67393,7 +67410,29 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
         }
       }
     }
-    const wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
+    let wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
+    if (!wordLayout && enrichedNumberingProps.resolvedLevelIndent) {
+      const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
+      const firstLinePx = resolvedIndentPx?.firstLine ?? 0;
+      if (firstLinePx > 0) {
+        wordLayout = {
+          // Treat as first-line-indent mode: text starts after the marker+firstLine offset.
+          firstLineIndentMode: true,
+          textStartPx: firstLinePx
+        };
+      }
+    }
+    if (wordLayout && (!wordLayout.textStartPx || !Number.isFinite(wordLayout.textStartPx)) && enrichedNumberingProps.resolvedLevelIndent) {
+      const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
+      const firstLinePx = resolvedIndentPx?.firstLine ?? 0;
+      if (firstLinePx > 0) {
+        wordLayout = {
+          ...wordLayout,
+          firstLineIndentMode: wordLayout.firstLineIndentMode ?? true,
+          textStartPx: firstLinePx
+        };
+      }
+    }
     if (wordLayout) {
       if (wordLayout.marker) {
         if (listRendering?.markerText) {
@@ -69304,7 +69343,7 @@ const measurementToPx = (value) => {
   const entry = value;
   if (typeof entry.value !== "number") return void 0;
   if (!entry.type || entry.type === "px" || entry.type === "pixel") return entry.value;
-  if (entry.type === "dxa") return twipsToPx$1(entry.value);
+  if (entry.type === "dxa") return twipsToPx$2(entry.value);
   return void 0;
 };
 const normalizeTableWidth = (value) => {
@@ -69316,7 +69355,7 @@ const normalizeTableWidth = (value) => {
     return { width: raw, type: measurement.type ?? "px" };
   }
   if (measurement.type === "dxa") {
-    return { width: twipsToPx$1(raw), type: "px" };
+    return { width: twipsToPx$2(raw), type: "px" };
   }
   return { width: raw, type: measurement.type };
 };
@@ -69344,13 +69383,13 @@ const extractTableStyleParagraphProps = (styleId, docx) => {
     const line = parseIntSafe$1(attrs["w:line"]);
     const rawLineRule = attrs["w:lineRule"];
     const lineRule = rawLineRule === "auto" || rawLineRule === "exact" || rawLineRule === "atLeast" ? rawLineRule : void 0;
-    if (before != null) spacing.before = twipsToPx$1(before);
-    if (after != null) spacing.after = twipsToPx$1(after);
+    if (before != null) spacing.before = twipsToPx$2(before);
+    if (after != null) spacing.after = twipsToPx$2(after);
     if (line != null) {
       if (lineRule === "auto") {
         spacing.line = line / 240;
       } else {
-        spacing.line = twipsToPx$1(line);
+        spacing.line = twipsToPx$2(line);
       }
     }
     if (lineRule) spacing.lineRule = lineRule;
@@ -69376,7 +69415,7 @@ const normalizeRowHeight = (rowProps) => {
   if (rawValue == null) return void 0;
   const rawRule = heightObj.rule ?? heightObj.hRule;
   const rule = rawRule === "exact" || rawRule === "atLeast" || rawRule === "auto" ? rawRule : "atLeast";
-  const valuePx = twipsToPx$1(rawValue);
+  const valuePx = twipsToPx$2(rawValue);
   return {
     value: valuePx,
     rule
@@ -69626,10 +69665,10 @@ function extractFloatingTableAnchorWrap(node) {
     anchor.alignV = floatingProps.tblpYSpec;
   }
   if (floatingProps.tblpX !== void 0) {
-    anchor.offsetH = twipsToPx$1(floatingProps.tblpX);
+    anchor.offsetH = twipsToPx$2(floatingProps.tblpX);
   }
   if (floatingProps.tblpY !== void 0) {
-    anchor.offsetV = twipsToPx$1(floatingProps.tblpY);
+    anchor.offsetV = twipsToPx$2(floatingProps.tblpY);
   }
   const hasDistances = floatingProps.leftFromText !== void 0 || floatingProps.rightFromText !== void 0 || floatingProps.topFromText !== void 0 || floatingProps.bottomFromText !== void 0;
   const wrap2 = {
@@ -69640,16 +69679,16 @@ function extractFloatingTableAnchorWrap(node) {
   };
   if (hasDistances) {
     if (floatingProps.topFromText !== void 0) {
-      wrap2.distTop = twipsToPx$1(floatingProps.topFromText);
+      wrap2.distTop = twipsToPx$2(floatingProps.topFromText);
     }
     if (floatingProps.bottomFromText !== void 0) {
-      wrap2.distBottom = twipsToPx$1(floatingProps.bottomFromText);
+      wrap2.distBottom = twipsToPx$2(floatingProps.bottomFromText);
     }
     if (floatingProps.leftFromText !== void 0) {
-      wrap2.distLeft = twipsToPx$1(floatingProps.leftFromText);
+      wrap2.distLeft = twipsToPx$2(floatingProps.leftFromText);
     }
     if (floatingProps.rightFromText !== void 0) {
-      wrap2.distRight = twipsToPx$1(floatingProps.rightFromText);
+      wrap2.distRight = twipsToPx$2(floatingProps.rightFromText);
     }
   }
   return { anchor, wrap: wrap2 };
@@ -76822,7 +76861,7 @@ const _DomPainter = class _DomPainter2 {
     }
     const runsForLine = sliceRunsForLine(block, line);
     const trackedConfig = this.resolveTrackedChangesConfig(block);
-    const textSlices = runsForLine.length > 0 ? runsForLine.filter((r2) => (r2.kind === "text" || r2.kind === void 0) && "text" in r2 && r2.text != null).map((r2) => r2.text) : gatherTextSlicesForLine(block, line);
+    runsForLine.length > 0 ? runsForLine.filter((r2) => (r2.kind === "text" || r2.kind === void 0) && "text" in r2 && r2.text != null).map((r2) => r2.text) : gatherTextSlicesForLine(block, line);
     if (runsForLine.length === 0) {
       const span = this.doc.createElement("span");
       span.innerHTML = "&nbsp;";
@@ -76869,19 +76908,7 @@ const _DomPainter = class _DomPainter2 {
       });
     }
     const hasExplicitPositioning = line.segments?.some((seg) => seg.x !== void 0);
-    const availableWidth = availableWidthOverride ?? line.maxWidth ?? line.width;
-    const shouldJustify = !skipJustify && effectiveAlignment === "justify" && !hasExplicitPositioning;
-    if (shouldJustify) {
-      const spaceCount = textSlices.reduce(
-        (sum, s2) => sum + Array.from(s2).filter((ch) => ch === " " || ch === " ").length,
-        0
-      );
-      const slack = availableWidth - line.width;
-      if (spaceCount > 0 && slack !== 0) {
-        const spacingPerSpace = slack / spaceCount;
-        el.style.wordSpacing = `${spacingPerSpace}px`;
-      }
-    }
+    availableWidthOverride ?? line.maxWidth ?? line.width;
     if (hasExplicitPositioning && line.segments) {
       const paraIndent = block.attrs?.indent;
       const indentLeft = paraIndent?.left ?? 0;
@@ -79044,6 +79071,32 @@ const extractBlockPmRange = (block) => {
     pmEnd: end2 ?? (start2 != null ? start2 + 1 : void 0)
   };
 };
+const getParagraphAttrs = (block) => {
+  if (!block.attrs || typeof block.attrs !== "object") {
+    return void 0;
+  }
+  return block.attrs;
+};
+const asString = (value) => {
+  return typeof value === "string" ? value : void 0;
+};
+const asBoolean = (value) => {
+  if (value === true || value === 1) return true;
+  if (typeof value === "string") {
+    const normalized = value.toLowerCase();
+    return normalized === "true" || normalized === "1" || normalized === "on";
+  }
+  return false;
+};
+const asSafeNumber = (value) => {
+  if (typeof value !== "number") {
+    return 0;
+  }
+  if (!Number.isFinite(value) || value < 0) {
+    return 0;
+  }
+  return value;
+};
 function calculateFirstLineIndent(block, measure) {
   const wordLayout = block.attrs?.wordLayout;
   if (!wordLayout?.firstLineIndentMode) {
@@ -79061,7 +79114,8 @@ function calculateFirstLineIndent(block, measure) {
 function layoutParagraphBlock(ctx2, anchors) {
   const { block, measure, columnWidth, ensurePage, advanceColumn, columnX, floatManager } = ctx2;
   const remeasureParagraph2 = ctx2.remeasureParagraph;
-  const frame = block.attrs?.frame;
+  const blockAttrs = getParagraphAttrs(block);
+  const frame = blockAttrs?.frame;
   if (anchors?.anchoredDrawings?.length) {
     for (const entry of anchors.anchoredDrawings) {
       if (anchors.placedAnchoredIds.has(entry.block.id)) continue;
@@ -79186,9 +79240,10 @@ function layoutParagraphBlock(ctx2, anchors) {
     didRemeasureForColumnWidth = true;
   }
   let fromLine = 0;
-  const spacing = block.attrs?.spacing ?? {};
-  const styleId = block.attrs?.styleId;
-  const contextualSpacing = Boolean(block.attrs?.contextualSpacing);
+  const attrs = getParagraphAttrs(block);
+  const spacing = attrs?.spacing ?? {};
+  const styleId = asString(attrs?.styleId);
+  const contextualSpacing = asBoolean(attrs?.contextualSpacing);
   let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
   const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
   let appliedSpacingBefore = spacingBefore === 0;
@@ -79269,14 +79324,13 @@ function layoutParagraphBlock(ctx2, anchors) {
   while (fromLine < lines.length) {
     let state2 = ensurePage();
     if (state2.trailingSpacing == null) state2.trailingSpacing = 0;
-    if (contextualSpacing) {
-      const prevStyle = state2.lastParagraphStyleId;
-      if (styleId && prevStyle && prevStyle === styleId) {
-        spacingBefore = 0;
-      }
-    }
     if (contextualSpacing && state2.lastParagraphStyleId && styleId && state2.lastParagraphStyleId === styleId) {
       spacingBefore = 0;
+      const prevTrailing = asSafeNumber(state2.trailingSpacing);
+      if (prevTrailing > 0) {
+        state2.cursorY -= prevTrailing;
+        state2.trailingSpacing = 0;
+      }
     }
     if (!appliedSpacingBefore && spacingBefore > 0) {
       while (!appliedSpacingBefore) {
@@ -82176,7 +82230,13 @@ function getCtx() {
   return ctx$1;
 }
 function isTextRun(run2) {
-  return run2.kind === "tab" ? false : true;
+  if (run2.kind === "tab" || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation") {
+    return false;
+  }
+  if ("src" in run2) {
+    return false;
+  }
+  return true;
 }
 function fontString(run2) {
   const textRun = isTextRun(run2) ? run2 : null;
@@ -82189,6 +82249,42 @@ function fontString(run2) {
 function runText(run2) {
   return "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
 }
+const DEFAULT_TAB_INTERVAL_TWIPS$1 = 720;
+const TWIPS_PER_INCH$1 = 1440;
+const PX_PER_INCH$1 = 96;
+const TWIPS_PER_PX$1 = TWIPS_PER_INCH$1 / PX_PER_INCH$1;
+const TAB_EPSILON$1 = 0.1;
+const WIDTH_FUDGE_PX = 0.5;
+const twipsToPx$1 = (twips) => twips / TWIPS_PER_PX$1;
+const pxToTwips$1 = (px) => Math.round(px * TWIPS_PER_PX$1);
+const buildTabStopsPx$1 = (indent, tabs, tabIntervalTwips) => {
+  const paragraphIndentTwips = {
+    left: pxToTwips$1(Math.max(0, indent?.left ?? 0)),
+    right: pxToTwips$1(Math.max(0, indent?.right ?? 0)),
+    firstLine: pxToTwips$1(Math.max(0, indent?.firstLine ?? 0)),
+    hanging: pxToTwips$1(Math.max(0, indent?.hanging ?? 0))
+  };
+  const stops = computeTabStops$1({
+    explicitStops: tabs ?? [],
+    defaultTabInterval: tabIntervalTwips ?? DEFAULT_TAB_INTERVAL_TWIPS$1,
+    paragraphIndent: paragraphIndentTwips
+  });
+  return stops.map((stop) => ({
+    pos: twipsToPx$1(stop.pos),
+    val: stop.val,
+    leader: stop.leader
+  }));
+};
+const getNextTabStopPx$1 = (currentX, tabStops, startIndex) => {
+  let index2 = startIndex;
+  while (index2 < tabStops.length && tabStops[index2].pos <= currentX + TAB_EPSILON$1) {
+    index2 += 1;
+  }
+  if (index2 < tabStops.length) {
+    return { target: tabStops[index2].pos, nextIndex: index2 + 1 };
+  }
+  return { target: currentX + twipsToPx$1(DEFAULT_TAB_INTERVAL_TWIPS$1), nextIndex: index2 };
+};
 function measureRunSliceWidth(run2, fromChar, toChar) {
   const context = getCtx();
   const text = runText(run2).slice(fromChar, toChar);
@@ -82212,13 +82308,38 @@ function lineHeightForRuns(runs, fromRun, toRun) {
   return maxSize2 * 1.2;
 }
 function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
+  if (!Number.isFinite(maxWidth) || maxWidth <= 0) {
+    throw new Error(`remeasureParagraph: maxWidth must be a positive number, got ${maxWidth}`);
+  }
+  if (!Number.isFinite(firstLineIndent)) {
+    throw new Error(`remeasureParagraph: firstLineIndent must be a finite number, got ${firstLineIndent}`);
+  }
+  if (!block) {
+    throw new Error("remeasureParagraph: block must be defined");
+  }
+  if (!Array.isArray(block.runs)) {
+    throw new Error(`remeasureParagraph: block.runs must be an array, got ${typeof block.runs}`);
+  }
   const runs = block.runs ?? [];
   const lines = [];
+  const attrs = block.attrs;
+  const indent = attrs?.indent;
+  const wordLayout = attrs?.wordLayout;
+  const indentLeft = Math.max(0, indent?.left ?? 0);
+  const indentRight = Math.max(0, indent?.right ?? 0);
+  const indentFirstLine = Math.max(0, indent?.firstLine ?? 0);
+  const indentHanging = Math.max(0, indent?.hanging ?? 0);
+  const rawFirstLineOffset = Math.max(0, firstLineIndent || indentFirstLine - indentHanging);
+  const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
+  const textStartPx = wordLayout?.textStartPx;
+  const treatAsHanging = textStartPx && indentLeft === 0 && indentHanging === 0;
+  const firstLineWidth = typeof textStartPx === "number" && textStartPx > indentLeft && !treatAsHanging ? Math.max(1, maxWidth - textStartPx - indentRight) : Math.max(1, contentWidth - rawFirstLineOffset);
+  const tabStops = buildTabStopsPx$1(indent, attrs?.tabs, attrs?.tabIntervalTwips);
   let currentRun = 0;
   let currentChar = 0;
   while (currentRun < runs.length) {
     const isFirstLine = lines.length === 0;
-    const effectiveMaxWidth = isFirstLine ? maxWidth - firstLineIndent : maxWidth;
+    const effectiveMaxWidth = Math.max(1, isFirstLine ? firstLineWidth : contentWidth);
     const startRun = currentRun;
     const startChar = currentChar;
     let width = 0;
@@ -82226,13 +82347,26 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
     let lastBreakChar = -1;
     let endRun = currentRun;
     let endChar = currentChar;
+    let tabStopCursor = 0;
+    let didBreakInThisLine = false;
     for (let r2 = currentRun; r2 < runs.length; r2 += 1) {
       const run2 = runs[r2];
+      if (run2.kind === "tab") {
+        const { target, nextIndex } = getNextTabStopPx$1(width, tabStops, tabStopCursor);
+        const tabAdvance = Math.max(0, target - width);
+        width += tabAdvance;
+        tabStopCursor = nextIndex;
+        endRun = r2;
+        endChar = 1;
+        lastBreakRun = r2;
+        lastBreakChar = 1;
+        continue;
+      }
       const text = runText(run2);
       const start2 = r2 === currentRun ? currentChar : 0;
       for (let c2 = start2; c2 < text.length; c2 += 1) {
         const w2 = measureRunSliceWidth(run2, c2, c2 + 1);
-        if (width + w2 > effectiveMaxWidth && width > 0) {
+        if (width + w2 > effectiveMaxWidth - WIDTH_FUDGE_PX && width > 0) {
           if (lastBreakRun >= 0) {
             endRun = lastBreakRun;
             endChar = lastBreakChar;
@@ -82240,6 +82374,7 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
             endRun = r2;
             endChar = c2;
           }
+          didBreakInThisLine = true;
           break;
         }
         width += w2;
@@ -82251,9 +82386,7 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
           lastBreakChar = c2 + 1;
         }
       }
-      if (endRun !== r2 || endRun === r2 && (r2 === lastBreakRun ? endChar === lastBreakChar : false)) {
-        break;
-      }
+      if (didBreakInThisLine) break;
     }
     if (startRun === endRun && startChar === endChar) {
       endRun = startRun;
@@ -82267,11 +82400,15 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       width,
       ascent: 0,
       descent: 0,
-      lineHeight: lineHeightForRuns(runs, startRun, endRun)
+      lineHeight: lineHeightForRuns(runs, startRun, endRun),
+      maxWidth: effectiveMaxWidth
     };
     lines.push(line);
     currentRun = endRun;
     currentChar = endChar;
+    if (currentRun >= runs.length) {
+      break;
+    }
     if (currentChar >= runText(runs[currentRun]).length) {
       currentRun += 1;
       currentChar = 0;
@@ -84484,7 +84621,7 @@ async function measureBlock(block, constraints) {
 async function measureParagraphBlock(block, maxWidth) {
   const ctx2 = getCanvasContext();
   const wordLayout = block.attrs?.wordLayout;
-  const WIDTH_FUDGE_PX = 0.5;
+  const WIDTH_FUDGE_PX2 = 0.5;
   const lines = [];
   const indent = block.attrs?.indent;
   const spacing = block.attrs?.spacing;
@@ -84500,7 +84637,8 @@ async function measureParagraphBlock(block, maxWidth) {
   const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
   let initialAvailableWidth;
   const textStartPx = wordLayout?.textStartPx;
-  if (typeof textStartPx === "number" && textStartPx > indentLeft) {
+  const treatAsHanging = isWordLayoutList && indentLeft === 0 && hanging === 0 && typeof textStartPx === "number";
+  if (typeof textStartPx === "number" && textStartPx > indentLeft && !treatAsHanging) {
     initialAvailableWidth = Math.max(1, maxWidth - textStartPx - indentRight);
   } else {
     initialAvailableWidth = Math.max(1, contentWidth - firstLineOffset);
@@ -84547,6 +84685,21 @@ 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") {
@@ -84954,7 +85107,7 @@ async function measureParagraphBlock(block, maxWidth) {
           };
         } else {
           const boundarySpacing = currentLine.width > 0 ? run2.letterSpacing ?? 0 : 0;
-          if (currentLine.width + boundarySpacing + spacesWidth > currentLine.maxWidth - WIDTH_FUDGE_PX && currentLine.width > 0) {
+          if (currentLine.width + boundarySpacing + spacesWidth > currentLine.maxWidth - WIDTH_FUDGE_PX2 && currentLine.width > 0) {
             const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
             const { spaceCount: _sc, ...lineBase } = currentLine;
             const completedLine = {
@@ -85020,7 +85173,7 @@ async function measureParagraphBlock(block, maxWidth) {
             };
           } else {
             const boundarySpacing2 = currentLine.width > 0 ? run2.letterSpacing ?? 0 : 0;
-            if (currentLine.width + boundarySpacing2 + singleSpaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX && currentLine.width > 0) {
+            if (currentLine.width + boundarySpacing2 + singleSpaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX2 && currentLine.width > 0) {
               const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
               const { spaceCount: _sc, ...lineBase } = currentLine;
               const completedLine = { ...lineBase, ...metrics };
@@ -85078,7 +85231,7 @@ async function measureParagraphBlock(block, maxWidth) {
           const hasTabOnlyLine = currentLine && currentLine.segments.length === 0 && currentLine.width > 0;
           const remainingWidthAfterTab = hasTabOnlyLine ? currentLine.maxWidth - currentLine.width : lineMaxWidth;
           const chunkWidth = hasTabOnlyLine ? Math.max(remainingWidthAfterTab, lineMaxWidth * 0.25) : lineMaxWidth;
-          const chunks = breakWordIntoChunks(word, chunkWidth - WIDTH_FUDGE_PX, font, ctx2, run2);
+          const chunks = breakWordIntoChunks(word, chunkWidth - WIDTH_FUDGE_PX2, font, ctx2, run2);
           let chunkCharOffset = wordStartChar;
           for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
             const chunk = chunks[chunkIndex];
@@ -85100,7 +85253,7 @@ async function measureParagraphBlock(block, maxWidth) {
               });
               if (isLastChunk) {
                 const ls = run2.letterSpacing ?? 0;
-                if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX) {
+                if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX2) {
                   currentLine.toChar = wordEndWithSpace;
                   currentLine.width = roundValue(currentLine.width + spaceWidth + ls);
                   charPosInRun = wordEndWithSpace;
@@ -85132,7 +85285,7 @@ async function measureParagraphBlock(block, maxWidth) {
                 spaceCount: 0
               };
               const ls = run2.letterSpacing ?? 0;
-              if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX) {
+              if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX2) {
                 currentLine.toChar = wordEndWithSpace;
                 currentLine.width = roundValue(currentLine.width + spaceWidth + ls);
                 charPosInRun = wordEndWithSpace;
@@ -85174,7 +85327,7 @@ async function measureParagraphBlock(block, maxWidth) {
             spaceCount: 0
           };
           const ls = run2.letterSpacing ?? 0;
-          if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX) {
+          if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX2) {
             currentLine.toChar = wordEndWithSpace;
             currentLine.width = roundValue(currentLine.width + spaceWidth + ls);
             charPosInRun = wordEndWithSpace;
@@ -85189,7 +85342,7 @@ async function measureParagraphBlock(block, maxWidth) {
         const justifyAlignment = block.attrs?.alignment === "justify";
         const totalWidthWithWord = currentLine.width + boundarySpacing + wordCommitWidth + // Safe cast: only TextRuns produce word segments from split(), other run types are handled earlier
         (isLastWord ? 0 : run2.letterSpacing ?? 0);
-        const availableWidth = currentLine.maxWidth - WIDTH_FUDGE_PX;
+        const availableWidth = currentLine.maxWidth - WIDTH_FUDGE_PX2;
         let shouldBreak = currentLine.width + boundarySpacing + wordOnlyWidth > availableWidth && currentLine.width > 0 && !isTocEntry;
         let compressedWidth = null;
         if (shouldBreak && justifyAlignment) {
@@ -85234,7 +85387,7 @@ async function measureParagraphBlock(block, maxWidth) {
             segments: [{ runIndex, fromChar: wordStartChar, toChar: wordEndNoSpace, width: wordOnlyWidth }],
             spaceCount: 0
           };
-          if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX) {
+          if (!isLastWord && currentLine.width + spaceWidth <= currentLine.maxWidth - WIDTH_FUDGE_PX2) {
             currentLine.toChar = wordEndWithSpace;
             currentLine.width = roundValue(currentLine.width + spaceWidth + (run2.letterSpacing ?? 0));
             charPosInRun = wordEndWithSpace;
@@ -85244,7 +85397,7 @@ async function measureParagraphBlock(block, maxWidth) {
           }
         } else {
           currentLine.toRun = runIndex;
-          if (!isLastWord && currentLine.width + boundarySpacing + wordOnlyWidth + spaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX) {
+          if (!isLastWord && currentLine.width + boundarySpacing + wordOnlyWidth + spaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX2) {
             currentLine.toChar = wordEndNoSpace;
             currentLine.width = roundValue(currentLine.width + boundarySpacing + wordOnlyWidth);
             currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);