postext 0.1.7 → 0.1.9

package/dist/parse.js

@@ -18,69 +18,178 @@ function stripInlineFormatting(text) {
         .trim();
 }
 /**
- * Strip non-bold inline formatting (images, links, italic, code) but keep text.
+ * Strip non-emphasis inline formatting (images, links, code) but keep bold/italic markers.
  */
-function stripNonBoldFormatting(text) {
+function stripNonEmphasisFormatting(text) {
     return text
         .replace(/!\[.*?\]\(.*?\)/g, '') // images
         .replace(/\[([^\]]+)\]\([^)]+\)/g, '$1') // links
         .replace(/`(.+?)`/g, '$1'); // inline code
 }
 /**
- * Parse inline formatting to produce spans with bold flag.
- * Strips non-bold formatting first, then extracts bold regions.
+ * Split a text region into italic/non-italic spans, carrying an ambient bold flag.
+ */
+function splitItalicSpans(text, bold, forcedItalic, out) {
+    if (forcedItalic) {
+        if (text.length > 0)
+            out.push({ text, bold, italic: true });
+        return;
+    }
+    const italicRe = /\*(.+?)\*|_(.+?)_/g;
+    let last = 0;
+    let m;
+    while ((m = italicRe.exec(text)) !== null) {
+        if (m.index > last) {
+            const before = text.slice(last, m.index);
+            if (before.length > 0)
+                out.push({ text: before, bold, italic: false });
+        }
+        const inner = m[1] ?? m[2];
+        if (inner.length > 0)
+            out.push({ text: inner, bold, italic: true });
+        last = m.index + m[0].length;
+    }
+    if (last < text.length) {
+        const rest = text.slice(last);
+        if (rest.length > 0)
+            out.push({ text: rest, bold, italic: false });
+    }
+}
+/**
+ * Parse inline formatting to produce spans with bold and italic flags.
+ * Recognizes ***bold italic***, **bold**, *italic* (and underscore equivalents).
  */
 function parseInlineFormatting(text) {
-    const cleaned = stripNonBoldFormatting(text);
+    const cleaned = stripNonEmphasisFormatting(text);
     const spans = [];
-    // Match **bold** and __bold__ patterns
-    const boldRe = /\*\*(.+?)\*\*|__(.+?)__/g;
+    // Triple markers (bold+italic) first, then double (bold) — longest first.
+    const boldRe = /\*\*\*(.+?)\*\*\*|___(.+?)___|\*\*(.+?)\*\*|__(.+?)__/g;
     let lastIndex = 0;
     let match;
     while ((match = boldRe.exec(cleaned)) !== null) {
-        // Text before the bold marker
         if (match.index > lastIndex) {
-            const before = stripItalicFormatting(cleaned.slice(lastIndex, match.index));
-            if (before.length > 0) {
-                spans.push({ text: before, bold: false });
-            }
+            splitItalicSpans(cleaned.slice(lastIndex, match.index), false, false, spans);
+        }
+        const triple = match[1] ?? match[2];
+        if (triple !== undefined) {
+            splitItalicSpans(triple, true, true, spans);
         }
-        // The bold text itself
-        const boldText = stripItalicFormatting(match[1] ?? match[2]);
-        if (boldText.length > 0) {
-            spans.push({ text: boldText, bold: true });
+        else {
+            const inner = match[3] ?? match[4];
+            splitItalicSpans(inner, true, false, spans);
         }
         lastIndex = match.index + match[0].length;
     }
-    // Remaining text after last bold
     if (lastIndex < cleaned.length) {
-        const remaining = stripItalicFormatting(cleaned.slice(lastIndex));
-        if (remaining.length > 0) {
-            spans.push({ text: remaining, bold: false });
-        }
+        splitItalicSpans(cleaned.slice(lastIndex), false, false, spans);
     }
-    // If no spans were produced (empty text), return a single empty span
     if (spans.length === 0) {
-        const trimmed = stripItalicFormatting(cleaned).trim();
+        const trimmed = cleaned.trim();
         if (trimmed.length > 0) {
-            spans.push({ text: trimmed, bold: false });
+            splitItalicSpans(trimmed, false, false, spans);
         }
     }
     return spans;
 }
 /**
- * Strip italic markers (* and _) from text.
+ * 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 stripItalicFormatting(text) {
-    return text
-        .replace(/\*(.+?)\*/g, '$1')
-        .replace(/_(.+?)_/g, '$1');
+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];
+        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]/;
 /**
- * Join spans into a single plain text string.
+ * 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 spansToText(spans) {
-    return spans.map((s) => s.text).join('').trim();
+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.
+ */
+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 };
 }
 /**
  * Merge consecutive blockquote lines into a single block, and consecutive
@@ -89,6 +198,18 @@ function spansToText(spans) {
 export function parseMarkdown(markdown) {
     const blocks = [];
     const rawLines = markdown.split('\n');
+    // Precompute starting offset of each raw line in the original markdown.
+    // lineOffsets[i] = offset of first char of rawLines[i]. Line terminator '\n'
+    // contributes exactly 1 character between consecutive lines.
+    const lineOffsets = new Array(rawLines.length);
+    {
+        let cur = 0;
+        for (let k = 0; k < rawLines.length; k++) {
+            lineOffsets[k] = cur;
+            cur += rawLines[k].length + 1; // +1 for the '\n' that was split away
+        }
+    }
+    const lineEndOffset = (k) => lineOffsets[k] + rawLines[k].length;
     let i = 0;
     while (i < rawLines.length) {
         const line = rawLines[i];
@@ -101,12 +222,20 @@ export function parseMarkdown(markdown) {
         // Heading
         const headingMatch = trimmed.match(HEADING_RE);
         if (headingMatch) {
-            const text = stripInlineFormatting(headingMatch[2]);
+            const rawText = stripInlineFormatting(headingMatch[2]);
+            const srcStart = lineOffsets[i];
+            const srcEnd = lineEndOffset(i);
+            const mapping = buildBlockMapping(markdown, srcStart, srcEnd, [
+                { text: rawText, bold: false, italic: false },
+            ]);
             blocks.push({
                 type: 'heading',
-                text,
-                spans: [{ text, bold: false }],
+                text: mapping.text,
+                spans: mapping.spans.length > 0 ? mapping.spans : [{ text: '', bold: false, italic: false }],
                 level: headingMatch[1].length,
+                sourceStart: srcStart,
+                sourceEnd: srcEnd,
+                sourceMap: mapping.sourceMap,
             });
             i++;
             continue;
@@ -114,36 +243,54 @@ export function parseMarkdown(markdown) {
         // Blockquote — collect consecutive > lines
         if (trimmed.startsWith('>')) {
             const quoteLines = [];
+            const startIdx = i;
+            let lastIdx = i;
             while (i < rawLines.length) {
                 const ql = rawLines[i].trim();
                 if (!ql.startsWith('>'))
                     break;
                 quoteLines.push(ql.replace(/^>\s?/, ''));
+                lastIdx = i;
                 i++;
             }
-            const spans = parseInlineFormatting(quoteLines.join(' '));
+            const rawSpans = parseInlineFormatting(quoteLines.join(' '));
+            const srcStart = lineOffsets[startIdx];
+            const srcEnd = lineEndOffset(lastIdx);
+            const mapping = buildBlockMapping(markdown, srcStart, srcEnd, rawSpans);
             blocks.push({
                 type: 'blockquote',
-                text: spansToText(spans),
-                spans,
+                text: mapping.text,
+                spans: mapping.spans,
+                sourceStart: srcStart,
+                sourceEnd: srcEnd,
+                sourceMap: mapping.sourceMap,
             });
             continue;
         }
         // Paragraph — collect consecutive non-blank, non-special lines
         const paraLines = [];
+        const startIdx = i;
+        let lastIdx = i;
         while (i < rawLines.length) {
             const pl = rawLines[i].trim();
             if (pl === '' || pl.match(HEADING_RE) || pl.startsWith('>'))
                 break;
             paraLines.push(pl);
+            lastIdx = i;
             i++;
         }
         if (paraLines.length > 0) {
-            const spans = parseInlineFormatting(paraLines.join(' '));
+            const rawSpans = parseInlineFormatting(paraLines.join(' '));
+            const srcStart = lineOffsets[startIdx];
+            const srcEnd = lineEndOffset(lastIdx);
+            const mapping = buildBlockMapping(markdown, srcStart, srcEnd, rawSpans);
             blocks.push({
                 type: 'paragraph',
-                text: spansToText(spans),
-                spans,
+                text: mapping.text,
+                spans: mapping.spans,
+                sourceStart: srcStart,
+                sourceEnd: srcEnd,
+                sourceMap: mapping.sourceMap,
             });
         }
     }

package/dist/parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}

package/dist/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAyC,MAAM,SAAS,CAAC;AAQpG,OAAO,EAQL,KAAK,WAAW,EAKjB,MAAM,OAAO,CAAC;AA+Of,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,aAAa,GACrB,WAAW,CA4Ob"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAyC,MAAM,SAAS,CAAC;AAQpG,OAAO,EAQL,KAAK,WAAW,EAKjB,MAAM,OAAO,CAAC;AA8Pf,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,aAAa,GACrB,WAAW,CAoUb"}

package/dist/pipeline.js

@@ -2,6 +2,8 @@ import { resolvePageConfig, resolveLayoutConfig, resolveBodyTextConfig, resolveH
 import { dimensionToPx } from './units';
 import { createBoundingBox, createVDTDocument, createVDTPage, createVDTColumn, createVDTBlock, } from './vdt';
 import { parseMarkdown } from './parse';
+import { computeHeadingNumbers } from './numbering';
+import { extractFrontmatter } from './frontmatter';
 import { buildFontString, measureBlock, measureRichBlock, initHyphenator } from './measure';
 // ---------------------------------------------------------------------------
 // Config resolution helpers
@@ -60,11 +62,14 @@ function resolveBodyStyle(resolved) {
     const fontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, weight);
     const boldWeight = resolved.bodyText.boldFontWeight.toString();
     const boldFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, boldWeight);
+    const italicFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, weight, 'italic');
+    const boldItalicFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, boldWeight, 'italic');
     const textAlign = resolved.bodyText.textAlign;
     const hyphenate = resolved.bodyText.hyphenation.enabled && textAlign === 'justify';
     const firstLineIndentPx = dimensionToPx(resolved.bodyText.firstLineIndent, dpi, fontSizePx);
     const hangingIndent = resolved.bodyText.hangingIndent;
-    return { fontString, boldFontString, fontSizePx, lineHeightPx, color: resolved.bodyText.color.hex, textAlign, hyphenate, marginTopPx: 0, marginBottomPx: 0, firstLineIndentPx, hangingIndent };
+    const marginBottomPx = resolved.bodyText.paragraphSpacing ? lineHeightPx : 0;
+    return { fontString, boldFontString, italicFontString, boldItalicFontString, fontSizePx, lineHeightPx, color: resolved.bodyText.color.hex, textAlign, hyphenate, marginTopPx: 0, marginBottomPx, firstLineIndentPx, hangingIndent };
 }
 function resolveHeadingStyle(level, resolved) {
     const dpi = resolved.page.dpi;
@@ -79,11 +84,16 @@ function resolveHeadingStyle(level, resolved) {
         lineHeightPx = dimensionToPx(lineHeightDim, dpi, fontSizePx);
     }
     const weight = headingConfig.fontWeight.toString();
-    const fontString = buildFontString(headingConfig.fontFamily, fontSizePx, weight);
+    const baseItalic = headingConfig.italic ? 'italic' : 'normal';
+    const flipItalic = headingConfig.italic ? 'normal' : 'italic';
+    const fontString = buildFontString(headingConfig.fontFamily, fontSizePx, weight, baseItalic);
+    const boldFontString = fontString;
+    const italicFontString = buildFontString(headingConfig.fontFamily, fontSizePx, weight, flipItalic);
+    const boldItalicFontString = italicFontString;
     const textAlign = resolved.headings.textAlign;
     const marginTopPx = dimensionToPx(headingConfig.marginTop, dpi, fontSizePx);
     const marginBottomPx = dimensionToPx(headingConfig.marginBottom, dpi, fontSizePx);
-    return { fontString, fontSizePx, lineHeightPx, color: headingConfig.color.hex, textAlign, hyphenate: false, marginTopPx, marginBottomPx, firstLineIndentPx: 0, hangingIndent: false };
+    return { fontString, boldFontString, italicFontString, boldItalicFontString, fontSizePx, lineHeightPx, color: headingConfig.color.hex, textAlign, hyphenate: false, marginTopPx, marginBottomPx, firstLineIndentPx: 0, hangingIndent: false };
 }
 function resolveBlockquoteStyle(resolved) {
     const dpi = resolved.page.dpi;
@@ -93,11 +103,14 @@ function resolveBlockquoteStyle(resolved) {
     const fontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, weight, 'italic');
     const boldWeight = resolved.bodyText.boldFontWeight.toString();
     const boldFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, boldWeight, 'italic');
+    // Inside a blockquote (already italic), `*text*` flips back to upright.
+    const italicFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, weight, 'normal');
+    const boldItalicFontString = buildFontString(resolved.bodyText.fontFamily, fontSizePx, boldWeight, 'normal');
     const textAlign = resolved.bodyText.textAlign;
     const hyphenate = resolved.bodyText.hyphenation.enabled && textAlign === 'justify';
     const firstLineIndentPx = dimensionToPx(resolved.bodyText.firstLineIndent, dpi, fontSizePx);
     const hangingIndent = resolved.bodyText.hangingIndent;
-    return { fontString, boldFontString, fontSizePx, lineHeightPx, color: '#666666', textAlign, hyphenate, marginTopPx: 0, marginBottomPx: 0, firstLineIndentPx, hangingIndent };
+    return { fontString, boldFontString, italicFontString, boldItalicFontString, fontSizePx, lineHeightPx, color: '#666666', textAlign, hyphenate, marginTopPx: 0, marginBottomPx: 0, firstLineIndentPx, hangingIndent };
 }
 // ---------------------------------------------------------------------------
 // Line position reset (for split blocks)
@@ -188,8 +201,17 @@ export function buildDocument(content, config) {
     // Create first page
     const firstPage = createPageWithColumns(0, resolved, contentArea, pageWidthPx, pageHeightPx);
     doc.pages.push(firstPage);
-    // Parse markdown
-    const contentBlocks = parseMarkdown(content.markdown);
+    // Extract frontmatter, then parse the remaining markdown body
+    const { metadata: frontmatterMeta, content: markdownBody, contentOffset: bodyOffset } = extractFrontmatter(content.markdown);
+    doc.metadata = { ...(content.metadata ?? {}), ...frontmatterMeta };
+    const contentBlocks = parseMarkdown(markdownBody);
+    const headingTemplates = {};
+    for (const lvl of resolved.headings.levels) {
+        if (lvl.numberingTemplate && lvl.numberingTemplate.length > 0) {
+            headingTemplates[lvl.level] = lvl.numberingTemplate;
+        }
+    }
+    const headingPrefixes = computeHeadingNumbers(contentBlocks, headingTemplates);
     // Resolve styles
     const bodyStyle = resolveBodyStyle(resolved);
     const blockquoteStyle = resolveBlockquoteStyle(resolved);
@@ -198,17 +220,29 @@ export function buildDocument(content, config) {
     let blockIdCounter = 0;
     let pendingSpacing = 0;
     for (let blockIdx = 0; blockIdx < contentBlocks.length; blockIdx++) {
-        const contentBlock = contentBlocks[blockIdx];
+        const rawBlock = contentBlocks[blockIdx];
         const id = `block-${blockIdCounter++}`;
         let style;
         let vdtType;
         let headingLevel;
-        switch (contentBlock.type) {
-            case 'heading':
-                style = resolveHeadingStyle(contentBlock.level ?? 1, resolved);
+        let numberPrefix;
+        let contentBlock = rawBlock;
+        switch (rawBlock.type) {
+            case 'heading': {
+                style = resolveHeadingStyle(rawBlock.level ?? 1, resolved);
                 vdtType = 'heading';
-                headingLevel = contentBlock.level;
+                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';
@@ -220,18 +254,60 @@ export function buildDocument(content, config) {
         }
         // Measure text — use rich measurement for blocks with bold spans
         const col = currentColumn(doc, cursor);
-        const hasRichSpans = contentBlock.spans.some((s) => s.bold);
+        const hasRichSpans = contentBlock.spans.some((s) => s.bold || s.italic);
         const measureOptions = {
             textAlign: style.textAlign,
             hyphenate: style.hyphenate,
             firstLineIndentPx: style.firstLineIndentPx,
             hangingIndent: style.hangingIndent,
         };
-        const measured = hasRichSpans && style.boldFontString
-            ? measureRichBlock(contentBlock.spans, style.fontString, style.boldFontString, col.bbox.width, style.lineHeightPx, measureOptions)
+        const measured = hasRichSpans && style.boldFontString && style.italicFontString && style.boldItalicFontString
+            ? measureRichBlock(contentBlock.spans, style.fontString, style.boldFontString, style.italicFontString, style.boldItalicFontString, col.bbox.width, style.lineHeightPx, measureOptions)
             : measureBlock(contentBlock.text, style.fontString, col.bbox.width, style.lineHeightPx, measureOptions);
         if (measured.lines.length === 0)
             continue;
+        // 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);
         // For headings, only snap to baseline grid if the next block is NOT a heading.
         // Consecutive headings flow without grid snapping; the last heading in the
         // group snaps so that the following body text realigns with the grid.
@@ -267,11 +343,24 @@ export function buildDocument(content, config) {
                 const blk = createVDTBlock(partId, vdtType, style.fontString, style.color, style.textAlign);
                 if (style.boldFontString)
                     blk.boldFontString = style.boldFontString;
-                if (partIndex === 0)
+                if (style.italicFontString)
+                    blk.italicFontString = style.italicFontString;
+                if (style.boldItalicFontString)
+                    blk.boldItalicFontString = style.boldItalicFontString;
+                if (partIndex === 0) {
                     blk.headingLevel = headingLevel;
+                    if (numberPrefix)
+                        blk.numberPrefix = numberPrefix;
+                }
                 blk.lines = resetLinePositions(remainingLines, style.lineHeightPx);
                 blk.dirty = false;
                 blk.snappedToGrid = shouldSnapToGrid && partIndex === 0;
+                if (remainingLines.length > 0) {
+                    blk.sourceStart = remainingLines[0].sourceStart;
+                    blk.sourceEnd = remainingLines[remainingLines.length - 1].sourceEnd;
+                }
+                blk.sourceMap = absoluteSourceMap;
+                blk.plainPrefixLen = prefixLen;
                 let h = totalRemainHeight;
                 if (shouldSnapToGrid && partIndex === 0) {
                     // Snap using the absolute position in the column so that the block
@@ -302,11 +391,24 @@ export function buildDocument(content, config) {
                 const blk = createVDTBlock(partId, vdtType, style.fontString, style.color, style.textAlign);
                 if (style.boldFontString)
                     blk.boldFontString = style.boldFontString;
-                if (partIndex === 0)
+                if (style.italicFontString)
+                    blk.italicFontString = style.italicFontString;
+                if (style.boldItalicFontString)
+                    blk.boldItalicFontString = style.boldItalicFontString;
+                if (partIndex === 0) {
                     blk.headingLevel = headingLevel;
+                    if (numberPrefix)
+                        blk.numberPrefix = numberPrefix;
+                }
                 blk.lines = resetLinePositions(splitLines, style.lineHeightPx);
                 blk.dirty = false;
                 blk.snappedToGrid = false;
+                if (splitLines.length > 0) {
+                    blk.sourceStart = splitLines[0].sourceStart;
+                    blk.sourceEnd = splitLines[splitLines.length - 1].sourceEnd;
+                }
+                blk.sourceMap = absoluteSourceMap;
+                blk.plainPrefixLen = prefixLen;
                 const splitHeight = linesPerAvailable * style.lineHeightPx;
                 placeBlockInColumn(blk, splitHeight, curCol, cursor);
                 doc.blocks.push(blk);
@@ -327,11 +429,21 @@ export function buildDocument(content, config) {
             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 (partIndex === 0)
                 blk.headingLevel = headingLevel;
             blk.lines = resetLinePositions(remainingLines, style.lineHeightPx);
             blk.dirty = false;
             blk.snappedToGrid = false;
+            if (remainingLines.length > 0) {
+                blk.sourceStart = remainingLines[0].sourceStart;
+                blk.sourceEnd = remainingLines[remainingLines.length - 1].sourceEnd;
+            }
+            blk.sourceMap = absoluteSourceMap;
+            blk.plainPrefixLen = prefixLen;
             placeBlockInColumn(blk, totalRemainHeight, curCol, cursor);
             doc.blocks.push(blk);
             pendingSpacing = style.marginBottomPx;