pretext-pdf 0.5.3 → 0.8.1

package/dist/render-blocks.js

@@ -4,7 +4,7 @@
  */
 import { rgb, degrees } from '@cantoo/pdf-lib';
 import { PretextPdfError } from './errors.js';
-import { drawJustifiedLine, addLinkAnnotation, addStickyNoteAnnotation, drawTextDecoration, toPdfY, resolveX, resolveTokens, hexToRgb, drawTabularText, } from './render-utils.js';
+import { drawJustifiedLine, addLinkAnnotation, addStickyNoteAnnotation, drawTextDecoration, toPdfY, resolveX, resolveTokens, hexToRgb, drawTabularText, LINE_HEIGHT_BODY, LINE_HEIGHT_COMPACT, } from './render-utils.js';
 import { buildFontKey } from './measure.js';
 // ─── Text block rendering (paragraph + heading) ───────────────────────────────
 export function renderTextBlock(pdfPage, pagedBlock, geo, fontMap, pdfDoc) {
@@ -47,10 +47,14 @@ export function renderTextBlock(pdfPage, pagedBlock, geo, fontMap, pdfDoc) {
             borderWidth: 0,
         });
     }
-    // Multi-column layout
+    // Multi-column layout — mirrors single-column features (smallCaps, letterSpacing, justify, decoration)
     const columnData = measuredBlock.columnData;
     if (columnData) {
-        const { columnCount, columnGap, columnWidth, linesPerColumn } = columnData;
+        const { columnGap, columnWidth, linesPerColumn } = columnData;
+        const hasSmallCaps = textElement?.smallCaps === true;
+        const mcFontSize = hasSmallCaps ? measuredBlock.fontSize * 0.8 : measuredBlock.fontSize;
+        const hasTabular = textElement?.tabularNumbers === true;
+        const letterSpacing = (textElement?.letterSpacing ?? 0) > 0 ? textElement.letterSpacing : 0;
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i];
             if (line.text === '')
@@ -61,22 +65,53 @@ export function renderTextBlock(pdfPage, pagedBlock, geo, fontMap, pdfDoc) {
             const absoluteYFromTop = lineYFromTop + geo.margins.top + geo.headerHeight;
             const pdfY = toPdfY(absoluteYFromTop, fontHeight, geo.pageHeight);
             const colX = geo.margins.left + colIdx * (columnWidth + columnGap);
-            const trimmedText = line.text.trimEnd();
-            const alignWidth = pdfFont.widthOfTextAtSize(trimmedText, measuredBlock.fontSize);
-            const x = resolveX(align, colX, columnWidth, alignWidth);
-            pdfPage.drawText(trimmedText, {
-                x,
-                y: pdfY,
-                size: measuredBlock.fontSize,
-                font: pdfFont,
-                color: rgb(r, g, b),
-            });
-            // Phase 8G: Wire paragraph.url and heading.url for clickable links (multi-column)
+            let trimmedText = line.text.trimEnd();
+            if (hasSmallCaps)
+                trimmedText = trimmedText.toUpperCase();
+            // Last line of each column should not be force-justified (left-align instead)
+            const isLastLineInCol = lineInCol === linesPerColumn - 1 || i === lines.length - 1;
+            let drawX;
+            if (alignRaw === 'justify' && letterSpacing === 0 && !hasTabular) {
+                drawJustifiedLine(pdfPage, trimmedText, isLastLineInCol, colX, pdfY, columnWidth, mcFontSize, pdfFont, rgb(r, g, b));
+                drawX = colX;
+            }
+            else if (letterSpacing > 0) {
+                const alignWidth = pdfFont.widthOfTextAtSize(trimmedText, mcFontSize) + letterSpacing * (trimmedText.length - 1);
+                drawX = resolveX(align, colX, columnWidth, alignWidth);
+                let cx = drawX;
+                for (const ch of trimmedText) {
+                    pdfPage.drawText(ch, { x: cx, y: pdfY, size: mcFontSize, font: pdfFont, color: rgb(r, g, b) });
+                    cx += pdfFont.widthOfTextAtSize(ch, mcFontSize) + letterSpacing;
+                }
+            }
+            else if (hasTabular) {
+                const alignWidth = pdfFont.widthOfTextAtSize(trimmedText, mcFontSize);
+                drawX = resolveX(align, colX, columnWidth, alignWidth);
+                drawTabularText(pdfPage, trimmedText, drawX, pdfY, mcFontSize, pdfFont, rgb(r, g, b));
+            }
+            else {
+                const alignWidth = pdfFont.widthOfTextAtSize(trimmedText, mcFontSize);
+                drawX = resolveX(align, colX, columnWidth, alignWidth);
+                pdfPage.drawText(trimmedText, { x: drawX, y: pdfY, size: mcFontSize, font: pdfFont, color: rgb(r, g, b) });
+            }
+            // Text decoration (underline, strikethrough)
+            if ((element.type === 'paragraph' || element.type === 'heading') && (element.underline || element.strikethrough)) {
+                const lineWidth = pdfFont.widthOfTextAtSize(trimmedText, mcFontSize) + (letterSpacing > 0 ? letterSpacing * (trimmedText.length - 1) : 0);
+                drawTextDecoration(pdfPage, drawX, lineWidth, pdfY, mcFontSize, pdfFont, [r, g, b], { underline: element.underline ?? false, strikethrough: element.strikethrough ?? false });
+            }
+            // Hyperlink annotation
             if ((element.type === 'paragraph' || element.type === 'heading') && element.url) {
-                const lineWidth = pdfFont.widthOfTextAtSize(trimmedText, measuredBlock.fontSize);
-                addLinkAnnotation(pdfDoc, pdfPage, x, pdfY, lineWidth, measuredBlock.fontSize, element.url);
+                const lineWidth = pdfFont.widthOfTextAtSize(trimmedText, mcFontSize) + (letterSpacing > 0 ? letterSpacing * (trimmedText.length - 1) : 0);
+                addLinkAnnotation(pdfDoc, pdfPage, drawX, pdfY, lineWidth, mcFontSize, element.url);
             }
         }
+        // Sticky note annotation (once per block, not per line)
+        if (textElement?.annotation) {
+            const ann = textElement.annotation;
+            const absY = yFromTop + geo.margins.top + geo.headerHeight;
+            const annotPdfY = geo.pageHeight - absY;
+            addStickyNoteAnnotation(pdfDoc, pdfPage, geo.margins.left, annotPdfY, ann.contents, ann.author, ann.color, ann.open);
+        }
         return; // skip standard single-column path
     }
     // Single-column layout (standard path)
@@ -238,14 +273,15 @@ export function renderTable(pdfPage, pagedBlock, geo, fontMap) {
     // ── Pass 1: Cell backgrounds ──────────────────────────────────────────────
     let rowAbsY = chunkStartAbsY;
     for (const row of chunkRows) {
-        const rowPdfY = toPdfY(rowAbsY, row.height, geo.pageHeight);
         let cellX = geo.margins.left;
         for (const cell of row.cells) {
-            const bgColorHex = cell.bgColor ?? (row.isHeader ? headerBgColor : undefined);
-            if (bgColorHex) {
-                const [r, g, b] = hexToRgb(bgColorHex);
-                // Use mergedWidth for colspan support
-                pdfPage.drawRectangle({ x: cellX, y: rowPdfY, width: cell.mergedWidth, height: row.height, color: rgb(r, g, b), borderWidth: 0 });
+            if (!cell.isSpanPlaceholder) {
+                const cellRenderHeight = cell.spanHeight ?? row.height;
+                const bgColorHex = cell.bgColor ?? (row.isHeader ? headerBgColor : undefined);
+                if (bgColorHex) {
+                    const [r, g, b] = hexToRgb(bgColorHex);
+                    pdfPage.drawRectangle({ x: cellX, y: toPdfY(rowAbsY, cellRenderHeight, geo.pageHeight), width: cell.mergedWidth, height: cellRenderHeight, color: rgb(r, g, b), borderWidth: 0 });
+                }
             }
             cellX += cell.mergedWidth;
         }
@@ -267,50 +303,56 @@ export function renderTable(pdfPage, pagedBlock, geo, fontMap) {
             borderWidth,
         });
         // Internal horizontal lines (row separators, between rows, not at edges)
+        // Suppressed after rows that have a spanning cell crossing into the next row
         let lineAbsY = chunkStartAbsY;
         for (let ri = 0; ri < chunkRows.length - 1; ri++) {
             lineAbsY += chunkRows[ri].height;
-            const linePdfY = geo.pageHeight - lineAbsY;
-            pdfPage.drawLine({
-                start: { x: geo.margins.left, y: linePdfY },
-                end: { x: geo.margins.left + totalTableWidth, y: linePdfY },
-                thickness: borderWidth,
-                color: borderRgb,
-            });
-        }
-        // Internal vertical lines (column separators, between columns, not at edges)
-        // With colspan support: only draw lines at boundaries that are NOT spanned by merged cells
-        // Each row may have different active boundaries due to different colspan patterns
-        let colBoundaryX = geo.margins.left;
-        for (let ci = 0; ci < columnWidths.length; ci++) {
-            colBoundaryX += columnWidths[ci];
-            // Check if this boundary (between column ci and ci+1) is active in ANY row
-            const boundaryIndex = ci; // boundary at index ci is between columns ci and ci+1
-            let isActive = false;
-            for (const row of chunkRows) {
-                if (row.activeBoundaries.includes(boundaryIndex)) {
-                    isActive = true;
-                    break;
-                }
-            }
-            if (isActive && ci < columnWidths.length - 1) {
-                const chunkTopPdfY = geo.pageHeight - chunkStartAbsY;
-                const chunkBottomPdfY = geo.pageHeight - (chunkStartAbsY + totalChunkHeight);
+            if (!chunkRows[ri].hasRowspan) {
+                const linePdfY = geo.pageHeight - lineAbsY;
                 pdfPage.drawLine({
-                    start: { x: colBoundaryX, y: chunkTopPdfY },
-                    end: { x: colBoundaryX, y: chunkBottomPdfY },
+                    start: { x: geo.margins.left, y: linePdfY },
+                    end: { x: geo.margins.left + totalTableWidth, y: linePdfY },
                     thickness: borderWidth,
                     color: borderRgb,
                 });
             }
         }
+        // Internal vertical lines (column separators, between columns, not at edges)
+        // Draw per-row segments: a boundary absent from a row's activeBoundaries means a merged cell
+        // spans it — a full-chunk line would cut through it. Per-row drawing preserves colspan correctness.
+        // Pre-compute X positions once; convert each row's activeBoundaries to a Set for O(1) lookup.
+        const colBoundaryXPositions = [];
+        let bx = geo.margins.left;
+        for (let ci = 0; ci < columnWidths.length - 1; ci++) {
+            bx += columnWidths[ci];
+            colBoundaryXPositions.push(bx);
+        }
+        const rowBoundarySets = chunkRows.map(row => new Set(row.activeBoundaries));
+        let vertRowAbsY = chunkStartAbsY;
+        for (let ri = 0; ri < chunkRows.length; ri++) {
+            const row = chunkRows[ri];
+            const rowBoundarySet = rowBoundarySets[ri];
+            const rowTopPdfY = geo.pageHeight - vertRowAbsY;
+            const rowBottomPdfY = geo.pageHeight - (vertRowAbsY + row.height);
+            for (let ci = 0; ci < colBoundaryXPositions.length; ci++) {
+                if (rowBoundarySet.has(ci)) {
+                    pdfPage.drawLine({
+                        start: { x: colBoundaryXPositions[ci], y: rowTopPdfY },
+                        end: { x: colBoundaryXPositions[ci], y: rowBottomPdfY },
+                        thickness: borderWidth,
+                        color: borderRgb,
+                    });
+                }
+            }
+            vertRowAbsY += row.height;
+        }
     }
     // ── Pass 3: Cell text ─────────────────────────────────────────────────────
     rowAbsY = chunkStartAbsY;
     for (const row of chunkRows) {
         let cellX = geo.margins.left;
         for (const cell of row.cells) {
-            if (cell.lines.length > 0) {
+            if (!cell.isSpanPlaceholder && cell.lines.length > 0) {
                 const pdfFont = fontMap.get(cell.fontKey);
                 if (!pdfFont) {
                     throw new PretextPdfError('FONT_NOT_LOADED', `Table cell font "${cell.fontKey}" not found in fontMap. This is a bug — font validation should have caught this.`);
@@ -318,13 +360,16 @@ export function renderTable(pdfPage, pagedBlock, geo, fontMap) {
                 const fontHeight = pdfFont.heightAtSize(cell.fontSize);
                 const [r, g, b] = hexToRgb(cell.color);
                 const textAreaX = cellX + cellPaddingH;
-                // Use mergedWidth for colspan support
                 const textAreaWidth = cell.mergedWidth - 2 * cellPaddingH;
+                // For rowspan cells, vertically center within the full spanHeight
+                const cellRenderHeight = cell.spanHeight ?? row.height;
+                const totalTextHeight = cell.lines.length * cell.lineHeight;
+                const verticalOffset = Math.max(0, (cellRenderHeight - totalTextHeight - 2 * cellPaddingV) / 2);
                 for (let li = 0; li < cell.lines.length; li++) {
                     const line = cell.lines[li];
                     if (line.text === '')
                         continue;
-                    const lineYFromPageTop = rowAbsY + cellPaddingV + li * cell.lineHeight;
+                    const lineYFromPageTop = rowAbsY + cellPaddingV + verticalOffset + li * cell.lineHeight;
                     const pdfY = toPdfY(lineYFromPageTop, fontHeight, geo.pageHeight);
                     const trimmedText = line.text.trimEnd();
                     const lineWidth = pdfFont.widthOfTextAtSize(trimmedText, cell.fontSize);
@@ -378,26 +423,55 @@ export function renderFloatBlock(pdfPage, pagedBlock, geo, fontMap, imageMap, pd
         width: fd.imageRenderWidth,
         height: fd.imageRenderHeight,
     });
-    // Draw text lines
-    const pdfFont = fontMap.get(fd.textFontKey);
-    if (!pdfFont)
-        throw new PretextPdfError('FONT_NOT_LOADED', `Float text font key "${fd.textFontKey}" not found in fontMap. This is a bug — font loading should have caught this.`);
-    const fontHeight = pdfFont.heightAtSize(fd.textFontSize);
-    const [r, g, b] = hexToRgb(fd.textColor);
+    // Draw text lines (rich or plain)
     const textBaseX = geo.margins.left + fd.textColX;
-    for (let i = 0; i < fd.textLines.length; i++) {
-        const line = fd.textLines[i];
-        if (!line.text || line.text === '')
-            continue;
-        const lineAbsY = baseAbsY + (i * fd.textLineHeight);
-        const pdfY = toPdfY(lineAbsY, fontHeight, geo.pageHeight);
-        pdfPage.drawText(line.text.trimEnd(), {
-            x: textBaseX,
-            y: pdfY,
-            size: fd.textFontSize,
-            font: pdfFont,
-            color: rgb(r, g, b),
-        });
+    if (fd.richFloatLines && fd.richFloatLines.length > 0) {
+        let cumY = 0;
+        for (const richLine of fd.richFloatLines) {
+            const lineAbsY = baseAbsY + cumY;
+            for (const fragment of richLine.fragments) {
+                if (!fragment.text || fragment.text.trim() === '')
+                    continue;
+                const pdfFont = fontMap.get(fragment.fontKey);
+                if (!pdfFont)
+                    throw new PretextPdfError('FONT_NOT_LOADED', `Float rich text font "${fragment.fontKey}" not found in fontMap.`);
+                const fontHeight = pdfFont.heightAtSize(fragment.fontSize);
+                const [r, g, b] = hexToRgb(fragment.color);
+                const drawX = textBaseX + fragment.x;
+                const pdfY = toPdfY(lineAbsY, fontHeight, geo.pageHeight) + (fragment.yOffset ?? 0);
+                const drawText = fragment.text.trimEnd();
+                if (fragment.letterSpacing && fragment.letterSpacing > 0) {
+                    let cx = drawX;
+                    for (const ch of drawText) {
+                        pdfPage.drawText(ch, { x: cx, y: pdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                        cx += pdfFont.widthOfTextAtSize(ch, fragment.fontSize) + fragment.letterSpacing;
+                    }
+                }
+                else {
+                    pdfPage.drawText(drawText, { x: drawX, y: pdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                }
+                const fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+                drawTextDecoration(pdfPage, drawX, fragWidth, pdfY, fragment.fontSize, pdfFont, [r, g, b], { underline: fragment.underline ?? false, strikethrough: fragment.strikethrough ?? false });
+                if (fragment.url)
+                    addLinkAnnotation(pdfDoc, pdfPage, drawX, pdfY, fragWidth, fragment.fontSize, fragment.url);
+            }
+            cumY += richLine.lineHeight;
+        }
+    }
+    else {
+        const pdfFont = fontMap.get(fd.textFontKey);
+        if (!pdfFont)
+            throw new PretextPdfError('FONT_NOT_LOADED', `Float text font key "${fd.textFontKey}" not found in fontMap. This is a bug — font loading should have caught this.`);
+        const fontHeight = pdfFont.heightAtSize(fd.textFontSize);
+        const [r, g, b] = hexToRgb(fd.textColor);
+        for (let i = 0; i < fd.textLines.length; i++) {
+            const line = fd.textLines[i];
+            if (line.text === '')
+                continue;
+            const lineAbsY = baseAbsY + (i * fd.textLineHeight);
+            const pdfY = toPdfY(lineAbsY, fontHeight, geo.pageHeight);
+            pdfPage.drawText(line.text.trimEnd(), { x: textBaseX, y: pdfY, size: fd.textFontSize, font: pdfFont, color: rgb(r, g, b) });
+        }
     }
 }
 // ─── Float group block rendering ──────────────────────────────────────────────
@@ -427,7 +501,7 @@ export function renderFloatGroup(pdfPage, pagedBlock, geo, fontMap, imageMap, pd
         // Draw plain lines (plain-text fallback for rich-paragraphs)
         for (let i = 0; i < textItem.lines.length; i++) {
             const line = textItem.lines[i];
-            if (!line.text || line.text === '')
+            if (line.text === '')
                 continue;
             const lineAbsY = baseAbsY + textItem.yOffsetFromTop + (i * textItem.lineHeight);
             const pdfY = toPdfY(lineAbsY, fontHeight, geo.pageHeight);
@@ -495,17 +569,46 @@ export function renderCodeBlock(pdfPage, pagedBlock, geo, fontMap) {
     const fontHeight = pdfFont.heightAtSize(fontSize);
     const [r, g, b] = hexToRgb(textColorHex);
     const textX = geo.margins.left + padding;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        const lineYFromPageTop = boxAbsY + paddingTop + i * lineHeight;
-        const pdfY = toPdfY(lineYFromPageTop, fontHeight, geo.pageHeight);
-        pdfPage.drawText(line.text.trimEnd(), {
-            x: textX,
-            y: pdfY,
-            size: fontSize,
-            font: pdfFont,
-            color: rgb(r, g, b),
-        });
+    // Syntax highlighting: tokenize if language is set and highlight.js is available
+    const highlightTokens = measuredBlock.codeHighlightTokens;
+    if (highlightTokens && highlightTokens.length > 0) {
+        // Render with per-token colors
+        for (let i = 0; i < lines.length; i++) {
+            const lineYFromPageTop = boxAbsY + paddingTop + i * lineHeight;
+            const pdfY = toPdfY(lineYFromPageTop, fontHeight, geo.pageHeight);
+            const lineTokens = highlightTokens[startLine + i];
+            if (!lineTokens)
+                continue;
+            let curX = textX;
+            for (const token of lineTokens) {
+                if (!token.text)
+                    continue;
+                const [tr, tg, tb] = hexToRgb(token.color);
+                pdfPage.drawText(token.text, {
+                    x: curX,
+                    y: pdfY,
+                    size: fontSize,
+                    font: pdfFont,
+                    color: rgb(tr, tg, tb),
+                });
+                curX += pdfFont.widthOfTextAtSize(token.text, fontSize);
+            }
+        }
+    }
+    else {
+        // Plain text rendering (no highlighting)
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const lineYFromPageTop = boxAbsY + paddingTop + i * lineHeight;
+            const pdfY = toPdfY(lineYFromPageTop, fontHeight, geo.pageHeight);
+            pdfPage.drawText(line.text.trimEnd(), {
+                x: textX,
+                y: pdfY,
+                size: fontSize,
+                font: pdfFont,
+                color: rgb(r, g, b),
+            });
+        }
     }
 }
 // ─── Blockquote rendering ─────────────────────────────────────────────────────
@@ -639,7 +742,7 @@ export function renderCallout(pdfPage, pagedBlock, geo, fontMap) {
         const boldFontKey = measuredBlock.fontKey.replace(/-400-/, '-700-');
         const titleFont = fontMap.get(boldFontKey) ?? font;
         const [tR, tG, tB] = hexToRgb(titleColor);
-        const titlePdfY = geo.pageHeight - currentAbsY - fontHeight - (fs * 1.4 - fs) / 2;
+        const titlePdfY = toPdfY(currentAbsY + (fs * LINE_HEIGHT_COMPACT - fs) / 2, fontHeight, geo.pageHeight);
         pdfPage.drawText(titleText, {
             x: geo.margins.left + paddingH,
             y: titlePdfY,
@@ -657,7 +760,7 @@ export function renderCallout(pdfPage, pagedBlock, geo, fontMap) {
             currentAbsY += lh;
             continue;
         }
-        const linePdfY = geo.pageHeight - currentAbsY - fontHeight - (lh - fs) / 2;
+        const linePdfY = toPdfY(currentAbsY + (lh - fs) / 2, fontHeight, geo.pageHeight);
         pdfPage.drawText(line.text.trimEnd(), {
             x: geo.margins.left + paddingH,
             y: linePdfY,
@@ -672,6 +775,7 @@ export function renderCallout(pdfPage, pagedBlock, geo, fontMap) {
 export function renderRichParagraph(pdfPage, pagedBlock, geo, fontMap, pdfDoc, footnoteNumbering) {
     const { measuredBlock, startLine, endLine, yFromTop } = pagedBlock;
     const { element, richLines, lineHeight, fontSize } = measuredBlock;
+    const tabularNumbers = element.type === 'rich-paragraph' && element.tabularNumbers === true;
     if (!richLines || richLines.length === 0)
         return;
     // Only render the lines on this page chunk
@@ -734,14 +838,23 @@ export function renderRichParagraph(pdfPage, pagedBlock, geo, fontMap, pdfDoc, f
                 }
                 const fragmentPdfY = basePdfY + (fragment.yOffset ?? 0);
                 const drawText = fragment.text.trimEnd();
-                pdfPage.drawText(drawText, {
-                    x: drawX,
-                    y: fragmentPdfY,
-                    size: fragment.fontSize,
-                    font: pdfFont,
-                    color: rgb(r, g, b),
-                });
-                const fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+                let fragWidth;
+                if (fragment.letterSpacing && fragment.letterSpacing > 0) {
+                    let cx = drawX;
+                    for (const ch of drawText) {
+                        pdfPage.drawText(ch, { x: cx, y: fragmentPdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                        cx += pdfFont.widthOfTextAtSize(ch, fragment.fontSize) + fragment.letterSpacing;
+                    }
+                    fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize) + fragment.letterSpacing * (drawText.length - 1);
+                }
+                else if (tabularNumbers) {
+                    drawTabularText(pdfPage, drawText, drawX, fragmentPdfY, fragment.fontSize, pdfFont, rgb(r, g, b));
+                    fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+                }
+                else {
+                    pdfPage.drawText(drawText, { x: drawX, y: fragmentPdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                    fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+                }
                 drawTextDecoration(pdfPage, drawX, fragWidth, fragmentPdfY, fragment.fontSize, pdfFont, [r, g, b], { underline: fragment.underline ?? false, strikethrough: fragment.strikethrough ?? false });
                 if (fragment.url) {
                     addLinkAnnotation(pdfDoc, pdfPage, drawX, fragmentPdfY, fragWidth, fragment.fontSize, fragment.url);
@@ -786,14 +899,23 @@ export function renderRichParagraph(pdfPage, pagedBlock, geo, fontMap, pdfDoc, f
             }
             const fragmentPdfY = basePdfY + (fragment.yOffset ?? 0);
             const drawText = fragment.text.trimEnd();
-            pdfPage.drawText(drawText, {
-                x: drawX,
-                y: fragmentPdfY,
-                size: fragment.fontSize,
-                font: pdfFont,
-                color: rgb(r, g, b),
-            });
-            const fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+            let fragWidth;
+            if (fragment.letterSpacing && fragment.letterSpacing > 0) {
+                let cx = drawX;
+                for (const ch of drawText) {
+                    pdfPage.drawText(ch, { x: cx, y: fragmentPdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                    cx += pdfFont.widthOfTextAtSize(ch, fragment.fontSize) + fragment.letterSpacing;
+                }
+                fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize) + fragment.letterSpacing * (drawText.length - 1);
+            }
+            else if (tabularNumbers) {
+                drawTabularText(pdfPage, drawText, drawX, fragmentPdfY, fragment.fontSize, pdfFont, rgb(r, g, b));
+                fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+            }
+            else {
+                pdfPage.drawText(drawText, { x: drawX, y: fragmentPdfY, size: fragment.fontSize, font: pdfFont, color: rgb(r, g, b) });
+                fragWidth = pdfFont.widthOfTextAtSize(drawText, fragment.fontSize);
+            }
             drawTextDecoration(pdfPage, drawX, fragWidth, fragmentPdfY, fragment.fontSize, pdfFont, [r, g, b], { underline: fragment.underline ?? false, strikethrough: fragment.strikethrough ?? false });
             if (fragment.url) {
                 addLinkAnnotation(pdfDoc, pdfPage, drawX, fragmentPdfY, fragWidth, fragment.fontSize, fragment.url);
@@ -821,7 +943,7 @@ export function renderFootnoteZone(pdfPage, footnoteItems, zoneHeight, fontMap,
     let currentPdfY = separatorY - SEPARATOR_PADDING;
     for (const { def, number } of footnoteItems) {
         const fontSize = def.fontSize ?? Math.max(8, defaultFontSize - 2);
-        const lineHeight = fontSize * 1.5;
+        const lineHeight = fontSize * LINE_HEIGHT_BODY;
         const fontFamily = def.fontFamily ?? doc.defaultFont ?? 'Inter';
         const fontKey = buildFontKey(fontFamily, 400, 'normal');
         const pdfFont = fontMap.get(fontKey);
@@ -841,8 +963,8 @@ export function renderFootnoteZone(pdfPage, footnoteItems, zoneHeight, fontMap,
     }
 }
 // ─── Header / Footer rendering ────────────────────────────────────────────────
-export function renderHeaderFooter(pdfPage, spec, pageNumber, totalPages, geo, fontMap, position) {
-    const text = resolveTokens(spec.text, pageNumber, totalPages);
+export function renderHeaderFooter(pdfPage, spec, pageNumber, totalPages, geo, fontMap, position, extra) {
+    const text = resolveTokens(spec.text, pageNumber, totalPages, extra);
     const fontSize = spec.fontSize ?? 10;
     const align = spec.align ?? 'center';
     const fontKey = `${spec.fontFamily ?? 'Inter'}-${spec.fontWeight ?? 400}-normal`;