postext 0.3.6 → 0.3.7

package/dist/parse/sourceMapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourceMapping.d.ts","sourceRoot":"","sources":["../../src/parse/sourceMapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AA+F1C;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EAAE,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CA0B5D"}

package/dist/parse/sourceMapping.js

@@ -0,0 +1,130 @@
+import { MATH_PLACEHOLDER } from './inlineMath';
+/**
+ * Build a per-character map from plain text to absolute source offsets.
+ * Greedy matches each plain char against the raw source (delimited by
+ * [blockSrcStart, blockSrcEnd)), skipping markdown markers and treating
+ * newlines/tabs as spaces for paragraph line joins.
+ */
+function computeSourceMap(markdown, blockSrcStart, blockSrcEnd, plainText) {
+    const map = new Array(plainText.length);
+    let r = blockSrcStart;
+    for (let p = 0; p < plainText.length; p++) {
+        const ch = plainText[p];
+        // Math placeholder: the plain char represents `$...$` in the markdown.
+        // Advance to the opening `$`, map to it, then skip past the closing `$`
+        // so subsequent plain chars can keep aligning with the source.
+        if (ch === MATH_PLACEHOLDER) {
+            while (r < blockSrcEnd && markdown[r] !== '$')
+                r++;
+            if (r >= blockSrcEnd) {
+                map[p] = blockSrcEnd;
+                continue;
+            }
+            map[p] = r;
+            let j = r + 1;
+            while (j < blockSrcEnd) {
+                if (markdown[j] === '\\' && markdown[j + 1] === '$') {
+                    j += 2;
+                    continue;
+                }
+                if (markdown[j] === '$') {
+                    j++;
+                    break;
+                }
+                if (markdown[j] === '\n')
+                    break;
+                j++;
+            }
+            r = j;
+            continue;
+        }
+        const isSpace = ch === ' ';
+        while (r < blockSrcEnd) {
+            const rc = markdown[r];
+            if (rc === ch)
+                break;
+            if (isSpace && (rc === '\n' || rc === '\t'))
+                break;
+            r++;
+        }
+        if (r >= blockSrcEnd) {
+            map[p] = blockSrcEnd;
+        }
+        else {
+            map[p] = r;
+            r++;
+        }
+    }
+    return map;
+}
+const COLLAPSIBLE_WS_RE = /[ \t\n\r\f]/;
+/**
+ * Collapse runs of `[ \t\n\r\f]` to a single space and strip leading/trailing
+ * whitespace across spans. Mirrors pretext's `normalizeWhitespaceNormal` so
+ * that `spans` and the block's plain text stay aligned with what the layout
+ * engine actually renders — otherwise cursor/selection mapping drifts by one
+ * character per collapsed whitespace character.
+ */
+function normalizeWhitespaceInSpans(spans) {
+    const out = [];
+    let inSpace = true; // start true to strip leading whitespace
+    for (const span of spans) {
+        let result = '';
+        for (const ch of span.text) {
+            if (COLLAPSIBLE_WS_RE.test(ch)) {
+                if (!inSpace) {
+                    result += ' ';
+                    inSpace = true;
+                }
+            }
+            else {
+                result += ch;
+                inSpace = false;
+            }
+        }
+        out.push({ ...span, text: result });
+    }
+    // Strip trailing space from the last span that contributed content
+    for (let i = out.length - 1; i >= 0; i--) {
+        const text = out[i].text;
+        if (text.length === 0)
+            continue;
+        if (text.endsWith(' ')) {
+            out[i] = { ...out[i], text: text.slice(0, -1) };
+        }
+        break;
+    }
+    return out.filter((s) => s.text.length > 0);
+}
+/**
+ * Build normalized text, spans, and sourceMap for a block. The plain text is
+ * whitespace-normalized to match pretext's internal normalization so that the
+ * per-character `sourceMap` aligns with rendered line segments.
+ */
+export function buildBlockMapping(markdown, blockSrcStart, blockSrcEnd, rawSpans) {
+    const rawText = rawSpans.map((s) => s.text).join('');
+    const rawSourceMap = computeSourceMap(markdown, blockSrcStart, blockSrcEnd, rawText);
+    const spans = normalizeWhitespaceInSpans(rawSpans);
+    const text = spans.map((s) => s.text).join('');
+    // Walk the raw text building the same normalization, and project each kept
+    // normalized character onto the rawSourceMap to obtain the source offset.
+    const sourceMap = [];
+    let inSpace = true;
+    for (let i = 0; i < rawText.length; i++) {
+        const ch = rawText[i];
+        if (COLLAPSIBLE_WS_RE.test(ch)) {
+            if (!inSpace) {
+                sourceMap.push(rawSourceMap[i] ?? blockSrcEnd);
+                inSpace = true;
+            }
+        }
+        else {
+            sourceMap.push(rawSourceMap[i] ?? blockSrcEnd);
+            inSpace = false;
+        }
+    }
+    if (sourceMap.length > text.length)
+        sourceMap.length = text.length;
+    return { text, spans, sourceMap };
+}
+//# sourceMappingURL=sourceMapping.js.map

package/dist/parse/sourceMapping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sourceMapping.js","sourceRoot":"","sources":["../../src/parse/sourceMapping.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;GAKG;AACH,SAAS,gBAAgB,CACvB,QAAgB,EAChB,aAAqB,EACrB,WAAmB,EACnB,SAAiB;IAEjB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAS,SAAS,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,aAAa,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC;QACzB,uEAAuE;QACvE,wEAAwE;QACxE,+DAA+D;QAC/D,IAAI,EAAE,KAAK,gBAAgB,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG;gBAAE,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;gBACrB,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;gBACrB,SAAS;YACX,CAAC;YACD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,CAAC,GAAG,WAAW,EAAE,CAAC;gBACvB,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBAAC,CAAC,IAAI,CAAC,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBAC1E,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBAAC,CAAC,EAAE,CAAC;oBAAC,MAAM;gBAAC,CAAC;gBACxC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;oBAAE,MAAM;gBAChC,CAAC,EAAE,CAAC;YACN,CAAC;YACD,CAAC,GAAG,CAAC,CAAC;YACN,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,KAAK,GAAG,CAAC;QAC3B,OAAO,CAAC,GAAG,WAAW,EAAE,CAAC;YACvB,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;YACxB,IAAI,EAAE,KAAK,EAAE;gBAAE,MAAM;YACrB,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,CAAC;gBAAE,MAAM;YACnD,CAAC,EAAE,CAAC;QACN,CAAC;QACD,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YACrB,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACX,CAAC,EAAE,CAAC;QACN,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC;;;;;;GAMG;AACH,SAAS,0BAA0B,CAAC,KAAmB;IACrD,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,yCAAyC;IAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,GAAG,CAAC;oBACd,OAAO,GAAG,IAAI,CAAC;gBACjB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,EAAE,CAAC;gBACb,OAAO,GAAG,KAAK,CAAC;YAClB,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,mEAAmE;IACnE,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,CAAC;QACD,MAAM;IACR,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,aAAqB,EACrB,WAAmB,EACnB,QAAsB;IAEtB,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAErF,MAAM,KAAK,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE/C,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;QACvB,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC;gBAC/C,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC;YAC/C,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM;QAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAEnE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AACpC,CAAC"}

package/dist/{parse.d.ts → parse/types.d.ts}

@@ -18,7 +18,7 @@ export interface InlineSpan {
     math?: MathMeta;
     /** Resolved math render — populated by the pipeline before measurement
      *  so the parser remains free of MathJax dependencies. */
-    mathRender?: import('./math/types').MathRender;
+    mathRender?: import('../math/types').MathRender;
 }
 /** Convenience discriminants for inline span iteration. */
 export type TextSpan = InlineSpan & {
@@ -66,27 +66,4 @@ export interface ContentBlock {
      */
     sourceMap: number[];
 }
-/** Object Replacement Character — atomic plain-text placeholder for a math
- *  span. One code unit per formula so `sourceMap` stays 1-to-1. */
-export declare const MATH_PLACEHOLDER = "\uFFFC";
-/**
- * Memoized wrapper around parseMarkdown: returns the cached result when the
- * input string is byte-for-byte identical to the previous call. This avoids
- * reparsing the whole document on each keystroke when upstream recomputes
- * only because a sibling state changed.
- */
-export declare function parseMarkdownMemo(markdown: string): ContentBlock[];
-export declare function parseMarkdownWithIssuesMemo(markdown: string): {
-    blocks: ContentBlock[];
-    issues: ParseIssue[];
-};
-export declare function parseMarkdown(markdown: string): ContentBlock[];
-/**
- * Merge consecutive blockquote lines into a single block, and consecutive
- * non-blank, non-special lines into paragraphs.
- */
-export declare function parseMarkdownWithIssues(markdown: string): {
-    blocks: ContentBlock[];
-    issues: ParseIssue[];
-};
-//# sourceMappingURL=parse.d.ts.map
+//# sourceMappingURL=types.d.ts.map

package/dist/parse/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/parse/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,WAAW,GACX,YAAY,GACZ,UAAU,GACV,aAAa,CAAC;AAElB;;sEAEsE;AACtE,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB;uEACmE;IACnE,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;8DAC0D;IAC1D,UAAU,CAAC,EAAE,OAAO,eAAe,EAAE,UAAU,CAAC;CACjD;AAED,2DAA2D;AAC3D,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvD,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC;IACtB,iEAAiE;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB;mCAC+B;IAC/B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB"}

package/dist/parse/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/parse/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/parse/types.ts"],"names":[],"mappings":""}

package/dist/pipeline/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/pipeline/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9D,OAAO,EAIL,KAAK,WAAW,EAEjB,MAAM,QAAQ,CAAC;AAKhB,OAAO,KAAK,EAAE,gBAAgB,EAAiB,MAAM,YAAY,CAAC;AAuBlE,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;CAC9B;AAED,qBAAa,mBAAoB,SAAQ,KAAK;;CAK7C;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,aAAa,EACtB,KAAK,CAAC,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,WAAW,CAmtBb"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/pipeline/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9D,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,QAAQ,CAAC;AAKhB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA4BnD,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;CAC9B;AAED,qBAAa,mBAAoB,SAAQ,KAAK;;CAK7C;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,aAAa,EACtB,KAAK,CAAC,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,WAAW,CAifb"}

package/dist/pipeline/build.js

@@ -1,15 +1,17 @@
 import { dimensionToPx } from '../units';
-import { createBoundingBox, createVDTDocument, createVDTBlock, } from '../vdt';
+import { createVDTDocument, createVDTBlock, } from '../vdt';
 import { parseMarkdownMemo } from '../parse';
 import { computeHeadingNumbers } from '../numbering';
 import { extractFrontmatter } from '../frontmatter';
-import { measureBlock, measureRichBlock, cachedMeasureBlock, cachedMeasureRichBlock, initHyphenator } from '../measure';
+import { initHyphenator } from '../measure';
 import { resolveAllConfig, computeBaselineGrid } from './config';
-import { resolveBodyStyle, resolveHeadingStyle, resolveBlockquoteStyle, resolveMathDisplayStyle } from './styles';
-import { renderMath, isMathReady } from '../math';
-import { computeLevelIndentsPx, computeOrderedLevelIndentsPx, computeOrderedListRunMetrics, resolveUnorderedListItemStyle, resolveOrderedListItemStyle, } from './lists';
+import { resolveBodyStyle, resolveBlockquoteStyle } from './styles';
+import { computeLevelIndentsPx, computeOrderedLevelIndentsPx, computeOrderedListRunMetrics, } from './lists';
 import { resetLinePositions, createPageWithColumns, currentColumn, advanceToNextColumn, placeBlockInColumn, } from './placement';
 import { chooseParagraphSplit } from './orphanWidow';
+import { applyStyleAttrs, computeMeasureViewport, computePageMetrics, enrichMathSpans, rollbackTrailingBlocks, stampSourceRanges, } from './buildHelpers';
+import { resolveBlockKind } from './buildBlockKind';
+import { runMeasurement } from './buildMeasurement';
 export class BuildCancelledError extends Error {
     constructor() {
         super('Build cancelled');
@@ -27,26 +29,7 @@ export function buildDocument(content, config, cache, options) {
     const baselineGrid = computeBaselineGrid(resolved);
     // Create document
     const doc = createVDTDocument(resolved, baselineGrid);
-    // Page dimensions in px (trim size)
-    const trimWidthPx = dimensionToPx(resolved.page.width, dpi);
-    const trimHeightPx = dimensionToPx(resolved.page.height, dpi);
-    // Cut lines expansion: canvas grows to fit bleed + mark offset + mark length
-    let trimOffset = 0;
-    if (resolved.page.cutLines.enabled) {
-        const bleedPx = dimensionToPx(resolved.page.cutLines.bleed, dpi);
-        const markOffsetPx = dimensionToPx(resolved.page.cutLines.markOffset, dpi);
-        const markLengthPx = dimensionToPx(resolved.page.cutLines.markLength, dpi);
-        trimOffset = bleedPx + markOffsetPx + markLengthPx;
-    }
-    const pageWidthPx = trimWidthPx + trimOffset * 2;
-    const pageHeightPx = trimHeightPx + trimOffset * 2;
-    // Margins in px
-    const marginTop = dimensionToPx(resolved.page.margins.top, dpi);
-    const marginBottom = dimensionToPx(resolved.page.margins.bottom, dpi);
-    const marginLeft = dimensionToPx(resolved.page.margins.left, dpi);
-    const marginRight = dimensionToPx(resolved.page.margins.right, dpi);
-    // Content area (offset by trimOffset so content sits inside the trim area)
-    const contentArea = createBoundingBox(marginLeft + trimOffset, marginTop + trimOffset, trimWidthPx - marginLeft - marginRight, trimHeightPx - marginTop - marginBottom);
+    const { pageWidthPx, pageHeightPx, trimOffset, contentArea } = computePageMetrics(resolved);
     doc.trimOffset = trimOffset;
     // Create first page
     const firstPage = createPageWithColumns(0, resolved, contentArea, pageWidthPx, pageHeightPx);
@@ -77,110 +60,26 @@ export function buildDocument(content, config, cache, options) {
             throw new BuildCancelledError();
         const rawBlock = contentBlocks[blockIdx];
         const id = `block-${blockIdCounter++}`;
-        let style;
-        let vdtType;
-        let headingLevel;
-        let numberPrefix;
-        let contentBlock = rawBlock;
-        let listBullet;
-        let listDepth;
-        let listKind;
-        let bulletXOffsetInColumn = 0;
-        let strikethroughText = false;
-        switch (rawBlock.type) {
-            case 'heading': {
-                style = resolveHeadingStyle(rawBlock.level ?? 1, resolved);
-                vdtType = 'heading';
-                headingLevel = rawBlock.level;
-                numberPrefix = headingPrefixes[blockIdx];
-                if (numberPrefix) {
-                    const sep = `${numberPrefix} `;
-                    const firstSpan = rawBlock.spans[0];
-                    const newSpans = firstSpan
-                        ? [{ text: sep + firstSpan.text, bold: firstSpan.bold, italic: firstSpan.italic }, ...rawBlock.spans.slice(1)]
-                        : [{ text: sep, bold: false, italic: false }];
-                    contentBlock = { ...rawBlock, text: sep + rawBlock.text, spans: newSpans };
-                }
-                break;
-            }
-            case 'blockquote':
-                style = blockquoteStyle;
-                vdtType = 'blockquote';
-                break;
-            case 'mathDisplay': {
-                style = resolveMathDisplayStyle(resolved);
-                vdtType = 'mathDisplay';
-                break;
-            }
-            case 'listItem': {
-                const depth = rawBlock.depth ?? 1;
-                const kind = rawBlock.listKind ?? 'unordered';
-                let resolvedList;
-                if (kind === 'ordered') {
-                    const metric = orderedMetrics.perBlock.get(blockIdx) ??
-                        { numberText: '', numberWidthPx: 0, maxNumberWidthPx: 0 };
-                    resolvedList = resolveOrderedListItemStyle(depth, resolved, orderedLevelIndentsPx, metric);
-                }
-                else {
-                    resolvedList = resolveUnorderedListItemStyle(depth, resolved, listLevelIndentsPx, rawBlock.checked ?? false, kind === 'task');
-                }
-                style = resolvedList.text;
-                listBullet = resolvedList.bullet;
-                listDepth = depth;
-                listKind = kind;
-                bulletXOffsetInColumn = resolvedList.bulletXOffsetInColumn;
-                strikethroughText = resolvedList.strikethroughText;
-                vdtType = 'listItem';
-                break;
-            }
-            default:
-                style = bodyStyle;
-                vdtType = 'paragraph';
-                break;
-        }
+        const kind = resolveBlockKind(rawBlock, {
+            resolved,
+            bodyStyle,
+            blockquoteStyle,
+            headingPrefixes,
+            blockIdx,
+            listLevelIndentsPx,
+            orderedLevelIndentsPx,
+            orderedMetrics,
+        });
+        const { style, vdtType, headingLevel, numberPrefix, listBullet, listDepth, listKind, bulletXOffsetInColumn, strikethroughText } = kind;
+        let contentBlock = kind.contentBlock;
         // Measure text — use rich measurement for blocks with bold spans
         const col = currentColumn(doc, cursor);
-        // Resolve inline math: renderMath each `span.math` and attach mathRender.
-        // When math is disabled, drop the math metadata so spans fall back to
-        // the raw TeX (visible as literal `$...$`).
+        // Resolve inline math on spans (no-op when the block has no math).
         const mathEnabled = resolved.math.enabled;
-        if (contentBlock.spans.some((s) => s.math)) {
-            const mathFontSizePx = style.fontSizePx * resolved.math.fontSizeScale;
-            const mathColor = resolved.math.color?.hex ?? style.color;
-            const enrichedSpans = contentBlock.spans.map((s) => {
-                if (!s.math)
-                    return s;
-                if (!mathEnabled) {
-                    return { text: `$${s.math.tex}$`, bold: s.bold, italic: s.italic };
-                }
-                const render = isMathReady()
-                    ? renderMath(s.math.tex, false, mathFontSizePx, { lineBoxPx: style.lineHeightPx, color: mathColor })
-                    : undefined;
-                return { ...s, mathRender: render };
-            });
-            contentBlock = { ...contentBlock, spans: enrichedSpans };
-        }
+        contentBlock = enrichMathSpans(contentBlock, style, resolved);
         const hasRichSpans = contentBlock.spans.some((s) => s.bold || s.italic || s.mathRender);
         // List items reserve horizontal space for indent + bullet + gap.
-        let measureMaxWidth = col.bbox.width;
-        let lineXShift = 0;
-        let measureFirstLineIndent = style.firstLineIndentPx;
-        let measureHangingIndent = style.hangingIndent;
-        if (listBullet) {
-            const textGap = listBullet.bulletWidthPx + listBullet.gapPx;
-            if (listBullet.hangingIndent) {
-                measureMaxWidth = Math.max(1, col.bbox.width - listBullet.indentPx - textGap);
-                lineXShift = listBullet.indentPx + textGap;
-                measureFirstLineIndent = 0;
-                measureHangingIndent = false;
-            }
-            else {
-                measureMaxWidth = Math.max(1, col.bbox.width - listBullet.indentPx);
-                lineXShift = listBullet.indentPx;
-                measureFirstLineIndent = textGap;
-                measureHangingIndent = false;
-            }
-        }
+        const { measureMaxWidth, lineXShift, measureFirstLineIndent, measureHangingIndent, } = computeMeasureViewport(col.bbox.width, style, listBullet);
         const runtActive = resolved.bodyText.avoidRunts
             && (vdtType === 'paragraph'
                 || (vdtType === 'listItem' && resolved.bodyText.avoidRuntsInLists));
@@ -195,50 +94,10 @@ export function buildDocument(content, config, cache, options) {
             runtPenalty: runtActive ? resolved.bodyText.runtPenalty : 0,
             runtMinCharacters: runtActive ? resolved.bodyText.runtMinCharacters : 0,
         };
-        const useRich = hasRichSpans && style.boldFontString && style.italicFontString && style.boldItalicFontString;
-        // Math display block: bypass text layout entirely. Produce a single
-        // VDTLine whose bbox is the math render's pixel box, centred later.
-        let mathDisplayRender;
-        let measured;
-        if (vdtType === 'mathDisplay') {
-            const tex = rawBlock.tex ?? '';
-            if (!mathEnabled) {
-                // Fallback: render the literal TeX as a paragraph-like run.
-                measured = useRich
-                    ? measureRichBlock([{ text: `$$${tex}$$`, bold: false, italic: false }], style.fontString, style.fontString, style.fontString, style.fontString, measureMaxWidth, style.lineHeightPx, measureOptions)
-                    : measureBlock(`$$${tex}$$`, style.fontString, measureMaxWidth, style.lineHeightPx, measureOptions);
-            }
-            else {
-                // `renderMath` internally returns a cheap placeholder when MathJax
-                // isn't initialised yet — no need to gate the call here. When the
-                // real engine lands later, `CanvasPreview` bumps `resizeKey` and the
-                // pipeline rebuilds with the genuine render.
-                const render = renderMath(tex, true, style.fontSizePx, { color: style.color });
-                mathDisplayRender = render;
-                const width = Math.min(render.widthPx, measureMaxWidth);
-                const height = render.heightPx;
-                measured = {
-                    lines: [{
-                            text: '',
-                            bbox: { x: 0, y: 0, width, height },
-                            baseline: render.ascentPx,
-                            hyphenated: false,
-                            segments: [{ kind: 'math', text: '\uFFFC', width, mathRender: render }],
-                            isLastLine: true,
-                        }],
-                    totalHeight: height,
-                };
-            }
-        }
-        else {
-            measured = cache
-                ? (useRich
-                    ? cachedMeasureRichBlock(contentBlock.spans, style.fontString, style.boldFontString, style.italicFontString, style.boldItalicFontString, measureMaxWidth, style.lineHeightPx, measureOptions, cache)
-                    : cachedMeasureBlock(contentBlock.text, style.fontString, measureMaxWidth, style.lineHeightPx, measureOptions, cache))
-                : (useRich
-                    ? measureRichBlock(contentBlock.spans, style.fontString, style.boldFontString, style.italicFontString, style.boldItalicFontString, measureMaxWidth, style.lineHeightPx, measureOptions)
-                    : measureBlock(contentBlock.text, style.fontString, measureMaxWidth, style.lineHeightPx, measureOptions));
-        }
+        const useRich = !!(hasRichSpans && style.boldFontString && style.italicFontString && style.boldItalicFontString);
+        const { measured, mathDisplayRender } = runMeasurement({
+            vdtType, rawBlock, contentBlock, style, measureMaxWidth, measureOptions, mathEnabled, useRich, cache,
+        });
         if (measured.lines.length === 0)
             continue;
         if (lineXShift > 0) {
@@ -248,46 +107,7 @@ export function buildDocument(content, config, cache, options) {
         }
         // Per-line source-range mapping using the block's plain→source map.
         // Accounts for heading numbering prefix which prepends chars with no source.
-        const blockSrcStart = rawBlock.sourceStart + bodyOffset;
-        const blockSrcEnd = rawBlock.sourceEnd + bodyOffset;
-        const srcMap = rawBlock.sourceMap;
-        const prefixLen = contentBlock.text.length - rawBlock.text.length;
-        const plainToSrc = (p) => {
-            const idx = p - prefixLen;
-            if (idx <= 0)
-                return blockSrcStart;
-            if (idx >= srcMap.length)
-                return blockSrcEnd;
-            return srcMap[idx] + bodyOffset;
-        };
-        let cumPlain = 0;
-        const lastLineIdx = measured.lines.length - 1;
-        for (let li = 0; li < measured.lines.length; li++) {
-            const line = measured.lines[li];
-            // If segments are present, prefer their aggregate text length for a more
-            // accurate plain-char count (excludes trailing hyphen for hyphenated lines).
-            let lineLen;
-            if (line.segments && line.segments.length > 0) {
-                lineLen = line.segments.reduce((s, seg) => s + seg.text.length, 0);
-                if (line.hyphenated) {
-                    const last = line.segments[line.segments.length - 1];
-                    if (last.text.endsWith('-'))
-                        lineLen -= 1;
-                }
-            }
-            else {
-                lineLen = line.text.length - (line.hyphenated ? 1 : 0);
-            }
-            line.plainStart = cumPlain;
-            line.plainEnd = cumPlain + lineLen;
-            // Advance past the separator space that was consumed to break the line
-            // (skip when hyphenated — break was at a soft hyphen — or on the last line).
-            const skipSeparator = !line.hyphenated && li !== lastLineIdx ? 1 : 0;
-            cumPlain = line.plainEnd + skipSeparator;
-            line.sourceStart = plainToSrc(line.plainStart);
-            line.sourceEnd = plainToSrc(line.plainEnd);
-        }
-        const absoluteSourceMap = srcMap.map((o) => o + bodyOffset);
+        const { prefixLen, absoluteSourceMap } = stampSourceRanges(measured, rawBlock, contentBlock, bodyOffset);
         const finalizeListItem = (blk, isFirstPart) => {
             if (!listBullet)
                 return;
@@ -395,16 +215,7 @@ export function buildDocument(content, config, cache, options) {
                             curCol.availableHeight -= spacingBefore;
                         const splitLines = remainingLines.slice(0, splitAt);
                         const blk = createVDTBlock(id, vdtType, style.fontString, style.color, style.textAlign);
-                        if (style.boldFontString)
-                            blk.boldFontString = style.boldFontString;
-                        if (style.italicFontString)
-                            blk.italicFontString = style.italicFontString;
-                        if (style.boldItalicFontString)
-                            blk.boldItalicFontString = style.boldItalicFontString;
-                        if (style.boldColor)
-                            blk.boldColor = style.boldColor;
-                        if (style.italicColor)
-                            blk.italicColor = style.italicColor;
+                        applyStyleAttrs(blk, style);
                         blk.headingLevel = headingLevel;
                         if (numberPrefix)
                             blk.numberPrefix = numberPrefix;
@@ -491,21 +302,8 @@ export function buildDocument(content, config, cache, options) {
                     if (remainAfterHeading < minSpaceAfter) {
                         // Roll back any immediately-preceding heading blocks in this
                         // column so they travel with this one.
-                        let rollbackCount = 0;
-                        for (let j = curCol.blocks.length - 1; j >= 0; j--) {
-                            if (curCol.blocks[j].type === 'heading')
-                                rollbackCount++;
-                            else
-                                break;
-                        }
+                        const rollbackCount = rollbackTrailingBlocks(curCol, doc.blocks, (b) => b.type === 'heading');
                         if (rollbackCount > 0) {
-                            const popped = curCol.blocks.splice(curCol.blocks.length - rollbackCount);
-                            for (const p of popped) {
-                                const idx = doc.blocks.indexOf(p);
-                                if (idx !== -1)
-                                    doc.blocks.splice(idx, 1);
-                                curCol.availableHeight += p.bbox.height;
-                            }
                             // Rewind so the for-loop's blockIdx++ lands on the first
                             // rolled-back heading.
                             blockIdx -= rollbackCount + 1;
@@ -524,16 +322,7 @@ export function buildDocument(content, config, cache, options) {
                 }
                 const partId = partIndex === 0 ? id : `${id}-cont-${partIndex}`;
                 const blk = createVDTBlock(partId, vdtType, style.fontString, style.color, style.textAlign);
-                if (style.boldFontString)
-                    blk.boldFontString = style.boldFontString;
-                if (style.italicFontString)
-                    blk.italicFontString = style.italicFontString;
-                if (style.boldItalicFontString)
-                    blk.boldItalicFontString = style.boldItalicFontString;
-                if (style.boldColor)
-                    blk.boldColor = style.boldColor;
-                if (style.italicColor)
-                    blk.italicColor = style.italicColor;
+                applyStyleAttrs(blk, style);
                 if (partIndex === 0) {
                     blk.headingLevel = headingLevel;
                     if (numberPrefix)
@@ -613,16 +402,7 @@ export function buildDocument(content, config, cache, options) {
                     const partId = partIndex === 0 ? id : `${id}-cont-${partIndex}`;
                     const splitLines = remainingLines.slice(0, choice.splitAt);
                     const blk = createVDTBlock(partId, vdtType, style.fontString, style.color, style.textAlign);
-                    if (style.boldFontString)
-                        blk.boldFontString = style.boldFontString;
-                    if (style.italicFontString)
-                        blk.italicFontString = style.italicFontString;
-                    if (style.boldItalicFontString)
-                        blk.boldItalicFontString = style.boldItalicFontString;
-                    if (style.boldColor)
-                        blk.boldColor = style.boldColor;
-                    if (style.italicColor)
-                        blk.italicColor = style.italicColor;
+                    applyStyleAttrs(blk, style);
                     if (partIndex === 0) {
                         blk.headingLevel = headingLevel;
                         if (numberPrefix)
@@ -656,21 +436,8 @@ export function buildDocument(content, config, cache, options) {
                 // pull those headings along so they don't remain stranded as orphans
                 // at the column's bottom. Mirrors the rollback inside the "fits" path.
                 if (vdtType === 'heading' && resolved.headings.keepWithNext) {
-                    let rollbackCount = 0;
-                    for (let j = curCol.blocks.length - 1; j >= 0; j--) {
-                        if (curCol.blocks[j].type === 'heading')
-                            rollbackCount++;
-                        else
-                            break;
-                    }
+                    const rollbackCount = rollbackTrailingBlocks(curCol, doc.blocks, (b) => b.type === 'heading');
                     if (rollbackCount > 0) {
-                        const popped = curCol.blocks.splice(curCol.blocks.length - rollbackCount);
-                        for (const p of popped) {
-                            const idx = doc.blocks.indexOf(p);
-                            if (idx !== -1)
-                                doc.blocks.splice(idx, 1);
-                            curCol.availableHeight += p.bbox.height;
-                        }
                         blockIdx -= rollbackCount + 1;
                         pendingSpacing = 0;
                         advanceToNextColumn(doc, cursor, resolved, contentArea, pageWidthPx, pageHeightPx);
@@ -684,16 +451,7 @@ export function buildDocument(content, config, cache, options) {
             // Empty column but block still doesn't fit (block taller than page) — place anyway
             const partId = partIndex === 0 ? id : `${id}-cont-${partIndex}`;
             const blk = createVDTBlock(partId, vdtType, style.fontString, style.color, style.textAlign);
-            if (style.boldFontString)
-                blk.boldFontString = style.boldFontString;
-            if (style.italicFontString)
-                blk.italicFontString = style.italicFontString;
-            if (style.boldItalicFontString)
-                blk.boldItalicFontString = style.boldItalicFontString;
-            if (style.boldColor)
-                blk.boldColor = style.boldColor;
-            if (style.italicColor)
-                blk.italicColor = style.italicColor;
+            applyStyleAttrs(blk, style);
             if (partIndex === 0)
                 blk.headingLevel = headingLevel;
             blk.lines = resetLinePositions(remainingLines, style.lineHeightPx);