postext-pdf 1.4.2 → 1.5.0

package/dist/fontCache.js

@@ -1,4 +1,5 @@
 import { padTrueTypeGlyphs } from './trueTypePadding';
+import { PDFDict, PDFName, PDFRef, PDFStream } from 'pdf-lib';
 import { fontKey, parseFontString } from './fontString';
 /** True when `bytes` starts with the `OTTO` magic identifying a CFF-flavored
  *  OpenType font — the ones pdf-lib cannot subset reliably, so they embed
@@ -92,20 +93,132 @@ export function coverAllGlyphUnicode(font) {
         return context.register(context.flateStream(toUnicodeCmap(glyphs)));
     };
 }
+/** The nine standard weights: the cuts a font provider may have. */
+const STANDARD_WEIGHTS = [100, 200, 300, 400, 500, 600, 700, 800, 900];
+/** `weights` in the order CSS font matching tries them for `desired`
+ *  (CSS Fonts 4 §5.2): from 400 to 500, the weights up to 500 ascending,
+ *  then the lighter ones descending, then the heavier ones ascending; below
+ *  400, lighter (or equal) descending, then heavier ascending; above 500,
+ *  heavier (or equal) ascending, then lighter descending. The browser picks
+ *  the same face, so the PDF matches the preview. */
+export function cssWeightOrder(desired, weights) {
+    const asc = [...new Set(weights)].sort((a, b) => a - b);
+    if (desired >= 400 && desired <= 500) {
+        return [
+            ...asc.filter((w) => w >= desired && w <= 500),
+            ...asc.filter((w) => w < desired).reverse(),
+            ...asc.filter((w) => w > 500),
+        ];
+    }
+    if (desired < 400)
+        return [...asc.filter((w) => w <= desired).reverse(), ...asc.filter((w) => w > desired)];
+    return [...asc.filter((w) => w >= desired), ...asc.filter((w) => w < desired).reverse()];
+}
+/** Faces of the same family to try, in order, when the provider rejects
+ *  `spec`: every standard weight in the requested style, in CSS matching
+ *  order ({@link cssWeightOrder}), then every weight in the other style
+ *  the same way — italic falls back to upright, and upright to italic. A
+ *  family with no italics (a display face) sets its italic runs upright; a
+ *  family shipping only 400 and 700 takes a 600 as 700; one shipping a
+ *  single cut sets everything in it. */
+export function fallbackFaces(spec) {
+    const weights = cssWeightOrder(spec.weight, [...STANDARD_WEIGHTS, spec.weight]);
+    const styles = spec.style === 'italic' ? ['italic', 'normal'] : ['normal', 'italic'];
+    const out = [];
+    for (const style of styles) {
+        for (const weight of weights) {
+            if (style === spec.style && weight === spec.weight)
+                continue;
+            out.push({ family: spec.family, weight, style });
+        }
+    }
+    return out;
+}
 /**
  * Per-document mapping from `family|weight|style` to an embedded pdf-lib
  * font. Entries are populated up-front by `preload()` so that block-level
- * rendering (`get()`) is a sync lookup. A fontString that fails to parse or
- * to load is mapped to `null` and reported back via `missing()`.
+ * rendering (`get()`) is a sync lookup. A face the provider rejects falls
+ * back to another face of its family ({@link fallbackFaces}), reported
+ * through `onFallback`; a fontString that fails to parse, or whose family
+ * the provider cannot supply at all (no standard weight in either style),
+ * is mapped to `null` and reported back via `missing()`. Faces the
+ * provider answers with the same file share one embedded font, and
+ * `dropUnusedFonts()` keeps the fonts no page draws with out of the file.
  */
 export class FontCache {
     pdfDoc;
     provider;
+    onFallback;
     map = new Map();
     failed = new Set();
-    constructor(pdfDoc, provider) {
+    /** One load per actual face, shared by every key that falls back to it. */
+    loads = new Map();
+    errors = new Map();
+    /** Loaded faces by lower-cased family, for lookups nothing preloaded. */
+    byFamily = new Map();
+    /** Embeds by the byte length of their file: a provider that answers
+     *  several faces with one file (a stand-in for a cut the family lacks)
+     *  gets it embedded once, whatever the faces. */
+    byLength = new Map();
+    /** Every font this cache embedded. */
+    embedded = new Set();
+    constructor(pdfDoc, provider, onFallback) {
         this.pdfDoc = pdfDoc;
         this.provider = provider;
+        this.onFallback = onFallback;
+    }
+    /** Embed a font file, once per distinct content. */
+    embedBytes(bytes) {
+        const same = this.byLength.get(bytes.length) ?? [];
+        const known = same.find((entry) => sameBytes(entry.bytes, bytes));
+        if (known)
+            return known.font;
+        const font = (async () => {
+            // pdf-lib's CFF subsetter emits a font stream some viewers cannot
+            // parse (macOS Preview draws the text in a fallback face), so CFF
+            // OpenType (.otf, signature `OTTO`) embeds whole — larger PDF, but
+            // every viewer reads it. TrueType fonts subset normally.
+            const subset = !isCffOpenType(bytes);
+            // fontkit's TrueType subsetter mis-writes the offsets of fonts whose
+            // glyph records are not 4-byte aligned (instanced variable fonts,
+            // typically): pad them first so every glyph survives the subset.
+            const embeddable = subset ? padTrueTypeGlyphs(bytes) : bytes;
+            const embedded = await this.pdfDoc.embedFont(embeddable, { subset });
+            if (!subset) {
+                coverAllGlyphWidths(embedded);
+                coverAllGlyphUnicode(embedded);
+            }
+            this.embedded.add(embedded);
+            return embedded;
+        })();
+        same.push({ bytes, font });
+        this.byLength.set(bytes.length, same);
+        return font;
+    }
+    /** Fetch and embed one face, once. Null when the provider rejects it or
+     *  its bytes do not embed. */
+    loadFace(spec) {
+        const key = fontKey(spec.family, spec.weight, spec.style);
+        const pending = this.loads.get(key);
+        if (pending)
+            return pending;
+        const load = (async () => {
+            try {
+                const bytes = await this.provider(spec.family, spec.weight, spec.style);
+                const font = await this.embedBytes(bytes);
+                const family = spec.family.toLowerCase();
+                const faces = this.byFamily.get(family) ?? [];
+                faces.push({ ...spec, font });
+                this.byFamily.set(family, faces);
+                return font;
+            }
+            catch (err) {
+                this.errors.set(key, err instanceof Error ? err.message : String(err));
+                return null;
+            }
+        })();
+        this.loads.set(key, load);
+        return load;
     }
     async preloadFontStrings(fontStrings) {
         const jobs = new Map();
@@ -121,28 +234,27 @@ export class FontCache {
             jobs.set(key, { family: parsed.family, weight: parsed.weight, style: parsed.style });
         }
         await Promise.all(Array.from(jobs.entries()).map(async ([key, spec]) => {
-            try {
-                const bytes = await this.provider(spec.family, spec.weight, spec.style);
-                // pdf-lib's CFF subsetter emits a font stream some viewers cannot
-                // parse (macOS Preview draws the text in a fallback face), so CFF
-                // OpenType (.otf, signature `OTTO`) embeds whole — larger PDF, but
-                // every viewer reads it. TrueType fonts subset normally.
-                const subset = !isCffOpenType(bytes);
-                // fontkit's TrueType subsetter mis-writes the offsets of fonts whose
-                // glyph records are not 4-byte aligned (instanced variable fonts,
-                // typically): pad them first so every glyph survives the subset.
-                const embeddable = subset ? padTrueTypeGlyphs(bytes) : bytes;
-                const font = await this.pdfDoc.embedFont(embeddable, { subset });
-                if (!subset) {
-                    coverAllGlyphWidths(font);
-                    coverAllGlyphUnicode(font);
-                }
+            const font = await this.loadFace(spec);
+            if (font) {
                 this.map.set(key, font);
+                return;
             }
-            catch {
-                this.failed.add(`${spec.family} ${spec.weight}${spec.style === 'italic' ? ' italic' : ''}`);
-                this.map.set(key, null);
+            // One candidate at a time, so no face is fetched (and embedded)
+            // that nothing is set in; a face asked once is never asked again.
+            for (const alt of fallbackFaces(spec)) {
+                const altFont = await this.loadFace(alt);
+                if (!altFont)
+                    continue;
+                this.map.set(key, altFont);
+                this.onFallback?.({
+                    ...spec,
+                    fallback: { weight: alt.weight, style: alt.style },
+                    reason: this.errors.get(key) ?? 'rejected by the font provider',
+                });
+                return;
             }
+            this.failed.add(`${spec.family} ${spec.weight}${spec.style === 'italic' ? ' italic' : ''}`);
+            this.map.set(key, null);
         }));
     }
     get(fontString) {
@@ -150,10 +262,75 @@ export class FontCache {
         if (!parsed)
             return null;
         const key = fontKey(parsed.family, parsed.weight, parsed.style);
-        return this.map.get(key) ?? null;
+        const hit = this.map.get(key);
+        if (hit !== undefined)
+            return hit;
+        // Never preloaded: the nearest loaded face of the family (same style
+        // first), so a face the plan missed still paints its text.
+        const faces = this.byFamily.get(parsed.family.toLowerCase());
+        if (!faces || faces.length === 0)
+            return null;
+        const sameStyle = faces.filter((f) => f.style === parsed.style);
+        const pool = sameStyle.length > 0 ? sameStyle : faces;
+        const weight = cssWeightOrder(parsed.weight, pool.map((f) => f.weight))[0];
+        return pool.find((f) => f.weight === weight).font;
     }
     missing() {
         return [...this.failed];
     }
+    /** Leave out of the file every font this cache embedded that no page
+     *  draws with: a face asked for but never set (the text of a figure
+     *  later drawn as a picture, say) would otherwise be written anyway,
+     *  since pdf-lib writes every font it embedded. Call it once all pages
+     *  are drawn, right before `save()`. */
+    dropUnusedFonts() {
+        // pdf-lib keeps its embedded fonts in a private list and writes each
+        // one on save; a font taken out of it is never written.
+        const fonts = this.pdfDoc.fonts;
+        if (!Array.isArray(fonts))
+            return;
+        const used = fontRefsInUse(this.pdfDoc);
+        for (let i = fonts.length - 1; i >= 0; i--) {
+            const font = fonts[i];
+            if (this.embedded.has(font) && !used.has(font.ref.toString()))
+                fonts.splice(i, 1);
+        }
+    }
+}
+/** Whether two files hold the same bytes. */
+function sameBytes(a, b) {
+    if (a === b)
+        return true;
+    if (a.length !== b.length)
+        return false;
+    for (let i = 0; i < a.length; i++)
+        if (a[i] !== b[i])
+            return false;
+    return true;
+}
+/** The fonts the pages name in their resources, and in those of the form
+ *  XObjects they draw, as reference strings. */
+function fontRefsInUse(pdfDoc) {
+    const used = new Set();
+    const seen = new Set();
+    const visit = (resources) => {
+        if (!resources || seen.has(resources))
+            return;
+        seen.add(resources);
+        const fonts = resources.lookupMaybe(PDFName.of('Font'), PDFDict);
+        for (const [, value] of fonts?.entries() ?? [])
+            used.add(value.toString());
+        const xobjects = resources.lookupMaybe(PDFName.of('XObject'), PDFDict);
+        for (const [, value] of xobjects?.entries() ?? []) {
+            // Images and embedded pages are written on save, so a reference
+            // may not resolve yet; only a form drawn here can name a font.
+            const xobject = value instanceof PDFRef ? pdfDoc.context.lookup(value) : value;
+            if (xobject instanceof PDFStream)
+                visit(xobject.dict.lookupMaybe(PDFName.of('Resources'), PDFDict));
+        }
+    };
+    for (const page of pdfDoc.getPages())
+        visit(page.node.Resources());
+    return used;
 }
 //# sourceMappingURL=fontCache.js.map

package/dist/fontCache.js.map

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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { renderToPdf } from './pdf-backend';
-export type { RenderToPdfOptions, RenderProgress, PdfFontProvider, ResourceBytesProvider } from './pdf-backend';
+export type { RenderToPdfOptions, RenderProgress, PdfFontProvider, PdfWarning, PdfFontFallbackWarning, ResourceBytesProvider } from './pdf-backend';
 export { decompressWoff2 } from './woff2';
 export { svgToVectorDrawing, type VectorDrawing } from './pdf-backend/svgVector';
 export { sniffBytes, rasterizeSvgWithDom, type SvgRasterizer } from './pdf-backend/renderResourceBlock';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACpJ,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/pdf-backend/blockRender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blockRender.d.ts","sourceRoot":"","sources":["../../src/pdf-backend/blockRender.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAuC,MAAM,SAAS,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,OAAO,EAAsD,MAAM,cAAc,CAAC;AAIhG,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,mFAAmF;AACnF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B;AA+PD,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,qBAAqB,GAClC,IAAI,CA0DN"}
+{"version":3,"file":"blockRender.d.ts","sourceRoot":"","sources":["../../src/pdf-backend/blockRender.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAuC,MAAM,SAAS,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,OAAO,EAAiG,MAAM,cAAc,CAAC;AAI3I,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAmB,MAAM,SAAS,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,mFAAmF;AACnF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B;AA4VD,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,qBAAqB,GAClC,IAAI,CA0DN"}

package/dist/pdf-backend/blockRender.js

@@ -1,10 +1,11 @@
-import { setCharacterSpacing } from 'pdf-lib';
+import { popGraphicsState, pushGraphicsState, setCharacterSpacing } from 'pdf-lib';
 import { parseFontString } from '../fontString';
-import { drawLinePx, drawSwatchPx, drawTextPx, colorFromHex } from './primitives';
+import { alphaOf, alphaStateOp, drawLinePx, drawMeasuredTextPx, drawSwatchPx, drawTextPx, colorFromHex } from './primitives';
 import { paintChip } from './chip';
 import { pickSegmentColor, pickSegmentFont } from './fontHelpers';
 import { renderHeaderFooterSlot } from './headerFooter';
 import { renderResourceBlock, } from './renderResourceBlock';
+import { RefRun, UriRuns } from './links';
 import { tagArtifact, tagContent } from './tagging';
 function renderMathRender(ctx, render, topLeftXPx, topLeftYPx, fallbackColor) {
     if (!render.paths.length || render.viewBox.width <= 0 || render.viewBox.height <= 0)
@@ -21,7 +22,14 @@ function renderMathRender(ctx, render, topLeftXPx, topLeftYPx, fallbackColor) {
         if (path.fill === 'none')
             continue;
         const color = path.fill.startsWith('#') ? colorFromHex(path.fill, ctx.colorSpace) : fallbackColor;
+        // A translucent text colour: the constant alpha wraps the path (pdf-lib
+        // would add an ExtGState per path otherwise).
+        const gs = alphaStateOp(ctx, alphaOf(color));
+        if (gs)
+            ctx.page.pushOperators(pushGraphicsState(), gs);
         ctx.page.drawSvgPath(path.d, { x, y, scale: S, color });
+        if (gs)
+            ctx.page.pushOperators(popGraphicsState());
     }
 }
 function renderMathSegment(ctx, seg, xPx, baselinePx, fallbackColor) {
@@ -38,19 +46,28 @@ function renderMathSegment(ctx, seg, xPx, baselinePx, fallbackColor) {
  * In a tagged render (`elem` set) the text joins `elem`, each inline formula
  * gets its own `Formula` element (alt text = its TeX) and each ref a `Link`
  * element; word spaces are painted as real space glyphs so text extraction
- * never has to infer them from the gaps of a justified line.
+ * never has to infer them from the gaps of a justified line. A ref painted
+ * as several runs (small capitals; the later runs flagged `refContinues`)
+ * is still one `Link` element with one annotation over all its runs.
  */
 function renderSegments(ctx, segments, startX, baseline, line, block, blockFont, blockSize, blockColor, fontCache, linkRegistry, elem, justifiedSpaceWidth) {
     let x = startX;
-    for (const seg of segments) {
+    const refRun = new RefRun();
+    const uris = new UriRuns(ctx, line, linkRegistry, elem);
+    const repeatedAt = repeatedHyphenSegment(line, segments);
+    for (let i = 0; i < segments.length; i++) {
+        const seg = segments[i];
         if (seg.kind === 'space') {
+            const inLink = uris.space(seg.text);
             if (ctx.tags && seg.text) {
-                tagContent(ctx, elem);
+                tagContent(ctx, inLink ?? elem);
                 drawTextPx(ctx, seg.text, x, baseline, blockFont, blockSize, blockColor);
             }
             x += justifiedSpaceWidth ?? seg.width;
             continue;
         }
+        if (seg.kind !== 'text' || seg.chip)
+            uris.other();
         if (seg.kind === 'math') {
             if (elem) {
                 const formula = elem.type === 'Formula' ? elem : elem.child('Formula', { alt: seg.mathRender?.tex ?? '' });
@@ -82,32 +99,54 @@ function renderSegments(ctx, segments, startX, baseline, line, block, blockFont,
                 ? block.refColor
                 : pickSegmentColor(!!seg.bold, !!seg.italic, block));
         const color = colorHex === block.color ? blockColor : colorFromHex(colorHex, ctx.colorSpace);
-        const link = seg.refResourceId !== undefined && elem ? elem.child('Link') : undefined;
-        tagContent(ctx, link ?? elem);
-        drawTextPx(ctx, seg.text, x, baseline + (seg.baselineShift ?? 0), font, size, color);
-        if (seg.refResourceId !== undefined && linkRegistry) {
+        // A `:ref` links to its resource — one `Link` for all the runs of one
+        // set in small capitals —, a Markdown link's words to its URL.
+        const uriElem = uris.word(seg.refResourceId === undefined ? seg.href : undefined, x, seg.width, seg.text);
+        const link = refRun.enter(seg, x, elem);
+        tagContent(ctx, link ?? uriElem ?? elem);
+        // The hyphen repeated from the line before is painted but not read.
+        const actualText = i === repeatedAt ? seg.text.slice(1) : undefined;
+        drawTextPx(ctx, seg.text, x, baseline + (seg.baselineShift ?? 0), font, size, color, undefined, actualText);
+        const ref = refRun.leave(seg, segments[i + 1]);
+        if (ref && linkRegistry) {
             const { scale, pageHeightPt } = ctx;
-            const x1 = x * scale;
+            const x1 = ref.startX * scale;
             const x2 = (x + seg.width) * scale;
             const y2 = pageHeightPt - line.bbox.y * scale;
             const y1 = pageHeightPt - (line.bbox.y + line.bbox.height) * scale;
-            linkRegistry.addLink(ctx.page, [x1, y1, x2, y2], seg.refResourceId, link ? { elem: link, contents: seg.text } : undefined);
+            linkRegistry.addLink(ctx.page, [x1, y1, x2, y2], ref.resourceId, link ? { elem: link, contents: ref.text } : undefined);
         }
         x += seg.width;
     }
+    uris.end();
 }
-/** Column-balancing tracking: the block was measured with extra advance
- *  after every glyph, so paint it with the matching character spacing
- *  (`Tc`, in points at the page scale) and reset it afterwards. */
+/** Tracking: the block (column balancing; negative for a runt set short)
+ *  and the line (justification tracking) were measured with extra advance
+ *  after every glyph, so paint the line with the matching character
+ *  spacing (`Tc`, in points at the page scale) and reset it afterwards. */
 function renderLine(ctx, line, block, columnWidth, columnX, fontCache, linkRegistry, elem) {
-    const tracked = block.letterSpacing !== undefined && block.letterSpacing > 0;
-    if (tracked)
-        ctx.page.pushOperators(setCharacterSpacing(block.letterSpacing * ctx.scale));
-    renderLineText(ctx, line, block, columnWidth, columnX, fontCache, linkRegistry, elem);
-    if (tracked)
+    const tracking = (block.letterSpacing ?? 0) + (line.letterSpacing ?? 0);
+    if (tracking !== 0)
+        ctx.page.pushOperators(setCharacterSpacing(tracking * ctx.scale));
+    renderLineText(ctx, line, block, columnWidth, columnX, fontCache, linkRegistry, elem, tracking, trailingTracking(line, tracking));
+    if (tracking !== 0)
         ctx.page.pushOperators(setCharacterSpacing(0));
 }
-function renderLineText(ctx, line, block, columnWidth, columnX, fontCache, linkRegistry, elem) {
+/** The tracking a line's measured width carries after its last glyph:
+ *  `tracking` when the line ends on text, else 0. It is advance, not ink,
+ *  so centring and right alignment leave it out (EF-153), as the canvas
+ *  and HTML backends do (`lineTrailingTracking` in postext). */
+function trailingTracking(line, tracking) {
+    if (tracking === 0)
+        return 0;
+    const segments = line.segments;
+    if (segments && segments.length > 0) {
+        const last = segments[segments.length - 1];
+        return last.kind === 'text' && last.text.length > 0 ? tracking : 0;
+    }
+    return /\S$/.test(line.text) ? tracking : 0;
+}
+function renderLineText(ctx, line, block, columnWidth, columnX, fontCache, linkRegistry, elem, tracking, trailing = 0) {
     const blockFont = fontCache.get(block.fontString);
     if (!blockFont)
         return;
@@ -141,22 +180,78 @@ function renderLineText(ctx, line, block, columnWidth, columnX, fontCache, linkR
         let contentWidth = 0;
         for (const seg of segments)
             contentWidth += seg.width;
-        const slack = Math.max(0, effectiveWidth - contentWidth);
+        const slack = Math.max(0, effectiveWidth - (contentWidth - trailing));
         const startX = line.bbox.x + (block.textAlign === 'center' ? slack / 2 : slack);
         renderSegments(ctx, segments, startX, line.baseline, line, block, blockFont, blockSize, blockColor, fontCache, linkRegistry, elem);
         return;
     }
     // Ragged (left-aligned) rendering — also used for last lines of justified
     // blocks. Segments are needed when any of them styles differently from the
-    // block (bold/italic/math/ref/own font or colour); otherwise one drawTextPx
-    // paints the line.
-    if (segments && segments.some((s) => s.bold || s.italic || s.kind === 'math' || s.kind === 'swatch' || s.kind === 'chip' || s.refResourceId !== undefined || s.fontString !== undefined || s.color !== undefined || s.baselineShift !== undefined)) {
+    // block (bold/italic/math/ref/own font or colour); otherwise one text
+    // object paints the line.
+    if (segments && segments.some((s) => s.bold || s.italic || s.kind === 'math' || s.kind === 'swatch' || s.kind === 'chip' || s.refResourceId !== undefined || s.href !== undefined || s.fontString !== undefined || s.color !== undefined || s.baselineShift !== undefined)) {
         renderSegments(ctx, segments, line.bbox.x, line.baseline, line, block, blockFont, blockSize, blockColor, fontCache, linkRegistry, elem);
         return;
     }
     tagContent(ctx, elem);
-    const plainX = block.textAlign === 'right' ? line.bbox.x + Math.max(0, effectiveWidth - line.bbox.width) : line.bbox.x;
-    drawTextPx(ctx, line.text, plainX, line.baseline, blockFont, blockSize, blockColor);
+    const plainSlack = Math.max(0, effectiveWidth - (line.bbox.width - trailing));
+    const plainX = line.bbox.x + (block.textAlign === 'right' ? plainSlack : block.textAlign === 'center' ? plainSlack / 2 : 0);
+    // Each word where the layout measured it (EF-137): the embedded face's
+    // own widths could differ, most of all for a character it has no glyph
+    // for, and would carry the rest of the line along. A line with
+    // right-to-left letters stays one run, which the shaper turns around.
+    // The hyphen repeated from the line before is painted but not read.
+    const actualText = line.repeatedHyphen && line.text.startsWith('-') ? line.text.slice(1) : undefined;
+    if (segments && segments.length > 0 && !hasRightToLeft(line.text)
+        && drawMeasuredTextPx(ctx, withLineEndSpace(segments, line.text), plainX, line.baseline, blockFont, blockSize, blockColor, tracking, actualText))
+        return;
+    drawTextPx(ctx, line.text, plainX, line.baseline, blockFont, blockSize, blockColor, undefined, actualText);
+}
+/**
+ * The index of the segment that opens with the hyphen repeated from the line
+ * before (`VDTLine.repeatedHyphen`, "vencer-" | "-se"), or -1. The PDF paints
+ * that segment with an `/ActualText` that leaves the hyphen out, so copying
+ * and text extraction read the word once, as written ("vencer-se").
+ */
+function repeatedHyphenSegment(line, segments) {
+    if (!line.repeatedHyphen)
+        return -1;
+    const i = segments.findIndex((s) => s.kind !== 'space');
+    const seg = segments[i];
+    return seg && seg.kind === 'text' && !seg.chip && seg.text.startsWith('-') ? i : -1;
+}
+/** A ragged line's segments, plus the space that ends the line when its
+ *  text has one and the segments leave it out. The space takes no room
+ *  past the line, but it is painted, as it was when the whole text was one
+ *  run, so extracted text keeps the words either side of the break apart. */
+function withLineEndSpace(segments, text) {
+    let shown = '';
+    for (const seg of segments)
+        shown += seg.text;
+    if (text.length <= shown.length || !text.startsWith(shown))
+        return segments;
+    const rest = text.slice(shown.length);
+    return /^\s+$/.test(rest) ? [...segments, { text: rest, width: 0 }] : segments;
+}
+/** Whether `text` holds a right-to-left letter: Hebrew, Arabic, Syriac,
+ *  Thaana, N'Ko and the scripts after them up to U+08FF, their
+ *  presentation forms, and the right-to-left blocks of the supplementary
+ *  planes. */
+function hasRightToLeft(text) {
+    for (let i = 0; i < text.length; i++) {
+        const c = text.charCodeAt(i);
+        if (c < 0x0590)
+            continue;
+        if (c <= 0x08ff || (c >= 0xfb1d && c <= 0xfdff) || (c >= 0xfe70 && c <= 0xfefe))
+            return true;
+        if (c >= 0xd800 && c <= 0xdbff) {
+            const cp = text.codePointAt(i);
+            if ((cp >= 0x10800 && cp <= 0x10fff) || (cp >= 0x1e800 && cp <= 0x1efff))
+                return true;
+            i++;
+        }
+    }
+    return false;
 }
 function renderBullet(ctx, block, fontCache, elem) {
     if (!block.bulletText ||
@@ -176,8 +271,12 @@ function renderBullet(ctx, block, fontCache, elem) {
     // Canvas uses `textBaseline='middle'` at bulletY; pdf-lib draws from the
     // alphabetic baseline. Shift the baseline down by ~0.3em so the em-square
     // midline aligns at bulletY, matching canvas placement within hinting tolerance.
+    // A marker set as text (a contents number) has its baseline at
+    // `bulletBaselineY` (postext 1.5); `bulletY` stays its em-box midpoint.
+    const baselineY = block.bulletBaselineY;
+    const onBaseline = baselineY !== undefined;
     const midY = block.bulletY ?? firstLine.baseline;
-    const baselinePx = midY + size * 0.3;
+    const baselinePx = onBaseline ? baselineY : midY + size * 0.3;
     tagContent(ctx, elem);
     drawTextPx(ctx, block.bulletText, block.bulletOffsetX, baselinePx, font, size, color);
     // Ordered-list separator styled apart from the number (own font/colour).
@@ -188,7 +287,7 @@ function renderBullet(ctx, block, fontCache, elem) {
             return;
         const sepSize = parseFontString(sepFontString)?.sizePx ?? size;
         const sepColor = colorFromHex(block.separatorColor ?? colorHex, ctx.colorSpace);
-        drawTextPx(ctx, block.separatorText, block.separatorX, midY + sepSize * 0.3, sepFont, sepSize, sepColor);
+        drawTextPx(ctx, block.separatorText, block.separatorX, onBaseline ? baselineY : midY + sepSize * 0.3, sepFont, sepSize, sepColor);
     }
 }
 function renderStrikethrough(ctx, block) {