postext 1.22.3 → 1.24.0

package/dist/html-backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-backend.d.ts","sourceRoot":"","sources":["../src/html-backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EAoBX,aAAa,EACd,MAAM,OAAO,CAAC;AA+Df,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;kDAI8C;IAC9C,gBAAgB,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG;QAC5D;;;0BAGkB;QAClB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,CAAC;IACF;;;;;;;;;;;;iEAY6D;IAC7D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;4DAGwD;IACxD,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC1D;;;;;;;2DAOuD;IACvD,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;KAAE,CAAC;IACnG;;;wDAGoD;IACpD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C;;;;;;;uEAOmE;IACnE,UAAU,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC/B;AAgKD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAajE;AAsjED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,8EAA8E;IAC9E,cAAc,EAAE,MAAM,CAAC;IACvB;4EACwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACzB,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,QAS4B,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,WAAW,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAiFjB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAEtF"}
+{"version":3,"file":"html-backend.d.ts","sourceRoot":"","sources":["../src/html-backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EAqBX,aAAa,EACd,MAAM,OAAO,CAAC;AA+Df,MAAM,WAAW,iBAAiB;IAChC,iFAAiF;IACjF,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;kDAI8C;IAC9C,gBAAgB,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG;QAC5D;;;0BAGkB;QAClB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,CAAC;IACF;;;;;;;;;;;;iEAY6D;IAC7D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;4DAGwD;IACxD,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC1D;;;;;;;2DAOuD;IACvD,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QAAC,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;KAAE,CAAC;IACnG;;;wDAGoD;IACpD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C;;;;;;;uEAOmE;IACnE,UAAU,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC/B;AAgKD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAajE;AAmpED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,8EAA8E;IAC9E,cAAc,EAAE,MAAM,CAAC;IACvB;4EACwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACzB,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,QAS4B,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,WAAW,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAiFjB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAEtF"}

package/dist/html-backend.js

@@ -1,5 +1,5 @@
 import { footnoteRuleSegments } from './columnRule';
-import { lineTextAlign, tableCellFillRects, tableFrameOutline } from './vdt';
+import { leaderRuleGeometry, lineTextAlign, tableCellFillRects, tableFrameOutline } from './vdt';
 import { dimensionToPx } from './units';
 import { documentInkHex, isSingleInkSvgUrl, singleInkColorMatrix } from './svg/singleInk';
 import { lineInkExtent, lineTrailingTracking } from './lineInk';
@@ -521,8 +521,10 @@ function lineEndHtml(text, x) {
  * What a copy puts between a line and the one after it in the same block
  * (`next`), or after a block's last line (#403): nothing after a line that
  * ends inside a word or on a hyphen or dash (`VDTLine.hyphenated`); a
- * newline after a line of verse and after the last line of a paragraph (or
- * of a heading, a caption, a cell); between two lines of a block, a space
+ * space before the turnover of a line of verse, a blank line after a
+ * stanza (#620); a newline after a line of verse, after a line that ends
+ * at a forced line break (`VDTLine.hardBreak`, #620) and after the last line
+ * of a paragraph (or of a heading, a caption, a cell); between two lines of a block, a space
  * where the break consumed one — the plain text skips a character between
  * them (`plainEnd` / `plainStart`) — and nothing where it did not (between
  * two ideographs). Lines without those offsets, and a block's last line
@@ -533,7 +535,16 @@ function lineEndHtml(text, x) {
 function lineEndText(line, next) {
     if (line.hyphenated)
         return '';
-    if (line.verse || (!next && line.isLastLine !== false))
+    // A line of verse in the line layout (#620): a space before its
+    // turnover, a newline after it, a blank line after a stanza.
+    if (line.verseLine)
+        return next?.verseLine?.turnover ? ' ' : line.verseLine.stanzaEnd ? '\n\n' : '\n';
+    // A line of a code listing (#624): nothing before its continuation (a
+    // wrapped line reads whole), a newline after each source line.
+    if (line.codeLine)
+        return next?.codeLine?.continued ? '' : '\n';
+    // A forced line break the author typed (#620).
+    if (line.verse || line.hardBreak || (!next && line.isLastLine !== false))
         return '\n';
     if (next && line.plainEnd !== undefined && next.plainStart !== undefined)
         return next.plainStart > line.plainEnd ? ' ' : '';
@@ -599,7 +610,7 @@ end = '') {
     // assumption that its inter-word glue shrinks (TeX glue-setting semantics),
     // so honor that by compressing the spaces to fit the measure exactly.
     const useJustify = block.textAlign === 'justify' && spaceCount > 0 &&
-        ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
+        !line.tabbed && ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
     const justifiedSpaceWidth = useJustify
         ? (effectiveWidth - wordWidth) / spaceCount
         : 0;
@@ -616,7 +627,7 @@ end = '') {
     // x are taken in that order; the markup stays in logical order, so the
     // text copies as written.
     const at = line.order ? orderedOffsets(segs, line.order, leadingGap, useJustify ? justifiedSpaceWidth : undefined) : undefined;
-    const cjk = block.tocEntry !== undefined || hasCJK(line.text);
+    const cjk = block.tocEntry !== undefined || hasCJK(line.text) || (line.tabbed === true && segs.some((sg) => sg.leader === 'text'));
     const paintText = (seg, at, inLink = false) => {
         const font = quoteFontString(pickSegmentFont(seg, block));
         const color = pickSegmentColor(seg, block);
@@ -636,6 +647,13 @@ end = '') {
             x += useJustify ? justifiedSpaceWidth : seg.width;
             continue;
         }
+        if (seg.leader) {
+            // A leader (#622): painted, hidden from assistive technology and
+            // left out of a selection.
+            parts.push(leaderHtml(seg, x, line.baseline - line.bbox.y, block));
+            x += seg.width;
+            continue;
+        }
         parts.push(links.at(segmentHref(seg)));
         if (seg.kind === 'math') {
             parts.push(renderMathSegmentSvg(seg, x, line, block));
@@ -698,19 +716,22 @@ function renderComposedSegments(line, block, targets, rootDir = 'ltr', end = '')
     // right alignment leave it out (EF-153), as the canvas does.
     const lineTracking = (block.letterSpacing ?? 0) + (line.letterSpacing ?? 0);
     const trailing = lineTrailingTracking(line, lineTracking);
+    // A line beside a wrapped picture (#627) fills its own span.
+    const wrapRoom = line.measure?.wrap ? line.measure.width : undefined;
     if (!line.segments || line.segments.length === 0) {
         const plainIndent = line.bbox.x - block.bbox.x;
         const plainWidth = line.bbox.width - trailing;
+        const plainRoom = wrapRoom ?? block.bbox.width - plainIndent;
         const plainLeft = block.textAlign === 'right'
-            ? Math.max(0, block.bbox.width - plainIndent - plainWidth)
+            ? Math.max(0, plainRoom - plainWidth)
             : block.textAlign === 'center'
-                ? Math.max(0, (block.bbox.width - plainIndent - plainWidth) / 2)
+                ? Math.max(0, (plainRoom - plainWidth) / 2)
                 : 0;
         return `<span style="position:absolute;left:${plainLeft.toFixed(3)}px;top:0;white-space:pre;">${esc(line.text)}</span>` + lineEndHtml(end, plainLeft + plainWidth);
     }
     // Match canvas justification: stretch inter-word spaces to fill effective width.
     const lineIndent = line.bbox.x - block.bbox.x;
-    const effectiveWidth = block.bbox.width - lineIndent;
+    const effectiveWidth = wrapRoom ?? block.bbox.width - lineIndent;
     let wordWidth = 0;
     let spaceCount = 0;
     for (const seg of line.segments) {
@@ -729,7 +750,7 @@ function renderComposedSegments(line, block, targets, rootDir = 'ltr', end = '')
     // assumption that its inter-word glue shrinks (TeX glue-setting semantics),
     // so honor that by compressing the spaces to fit the measure exactly.
     const useJustify = block.textAlign === 'justify' && spaceCount > 0 &&
-        ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
+        !line.tabbed && ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
     const justifiedSpaceWidth = useJustify
         ? (effectiveWidth - wordWidth) / spaceCount
         : 0;
@@ -767,6 +788,13 @@ function renderComposedSegments(line, block, targets, rootDir = 'ltr', end = '')
             x += gap;
             continue;
         }
+        if (seg.leader) {
+            // A leader (#622): painted, hidden from assistive technology and
+            // left out of a selection.
+            parts.push(leaderHtml(seg, x, line.baseline - line.bbox.y, block));
+            x += seg.width;
+            continue;
+        }
         parts.push(links.at(segmentHref(seg)));
         if (seg.kind === 'math') {
             parts.push(renderMathSegmentSvg(seg, x, line, block));
@@ -824,6 +852,28 @@ function renderComposedSegments(line, block, targets, rootDir = 'ltr', end = '')
         parts.push(lineMarksHtml(line, block.color));
     return parts.join('');
 }
+/** A leader (#622, `VDTLineSegment.leader`): a contents row's or a tab
+ *  stop's dots in the segment's font, or a rule under the baseline
+ *  (`baselineOffset` from the line top), `aria-hidden` and unselectable,
+ *  so neither a screen reader nor a copy reads it. */
+function leaderHtml(seg, x, baselineOffset, block) {
+    const color = pickSegmentColor(seg, block);
+    const hidden = 'aria-hidden="true"';
+    const noSelect = 'user-select:none;-webkit-user-select:none;pointer-events:none;';
+    if (seg.leader === 'rule') {
+        const m = /(\d*\.?\d+)px/.exec(block.fontString);
+        const { dy, thickness } = leaderRuleGeometry(m ? Number(m[1]) : 16);
+        return `<span ${hidden} style="position:absolute;left:${x.toFixed(3)}px;top:${(baselineOffset + dy - thickness / 2).toFixed(3)}px;`
+            + `width:${seg.width.toFixed(3)}px;height:${thickness.toFixed(3)}px;background:${color};${noSelect}"></span>`;
+    }
+    const font = quoteFontString(pickSegmentFont(seg, block));
+    const fontDecl = font !== quoteFontString(block.fontString) ? `font:${font};` : '';
+    const colorDecl = color !== block.color ? `color:${color};` : '';
+    const pos = `position:absolute;left:${x.toFixed(3)}px;top:0;white-space:pre;${noSelect}`;
+    if (fontDecl)
+        return `<span ${hidden} style="${pos}"><span style="${fontDecl}line-height:0;${colorDecl}">${esc(seg.text)}</span></span>`;
+    return `<span ${hidden} style="${pos}${colorDecl}">${esc(seg.text)}</span>`;
+}
 /** Inline colour swatch (`:swatch{…}`): a square of `side` px on the line's
  *  baseline (`baselineOffset` from the line top), filled with `fill` when
  *  the colour resolved and outlined in the text colour. */
@@ -927,7 +977,10 @@ function renderBullet(block, rootDir = 'ltr') {
 }
 function renderLine(line, block, targets, rootDir = 'ltr', rootLang, 
 /** The block's line after this one (see {@link lineEndText}). */
-next) {
+next, 
+/** Markup set at the start of the line's box, before its text (a drop
+ *  cap, #623). */
+lead = '') {
     const font = quoteFontString(block.fontString);
     const strikethroughDecl = block.strikethroughText ? 'text-decoration:line-through;' : '';
     // Tracking — the block's (column balancing, a runt set short) and the
@@ -945,7 +998,24 @@ next) {
         strikethroughDecl +
         trackingDecl +
         (lineCjkDecl(line) ? CJK_TEXT_DECL : '') +
-        `">${renderSegments(line, block, targets, rootDir, rootLang, lineEndText(line, next))}</div>`);
+        `">${lead}${renderSegments(line, block, targets, rootDir, rootLang, lineEndText(line, next))}</div>`);
+}
+/**
+ * A paragraph's drop cap (#623), as the first runs of its first line's box:
+ * an opening mark hung before it, then the initial, each standing on its
+ * baseline (a box in the line's font shifted down to it, the glyphs in an
+ * inner box of their own face with no line height, as a contents number
+ * sits on its line). In the markup they come right before the line's text,
+ * with nothing between, so a copy and a screen reader read the first word
+ * whole.
+ */
+function dropCapHtml(cap, line, lineFont) {
+    const run = (text, font, x, baselineY, width, cls) => `<span class="${cls}" style="position:absolute;left:${(x - line.bbox.x).toFixed(3)}px;top:${(baselineY - line.baseline).toFixed(3)}px;` +
+        `width:${width.toFixed(3)}px;height:${line.bbox.height}px;font:${lineFont};color:${cap.color};white-space:pre;` +
+        (hasCJK(text) ? CJK_TEXT_DECL : '') +
+        `"><span style="font:${quoteFontString(font)};line-height:0;">${esc(text)}</span></span>`;
+    const hang = cap.hang ? run(cap.hang.text, cap.hang.fontString, cap.hang.x, cap.hang.baselineY, cap.hang.width, 'pt-dropcap-hang') : '';
+    return hang + run(cap.text, cap.fontString, cap.x, cap.baselineY, cap.width, 'pt-dropcap');
 }
 // ---------------------------------------------------------------------------
 // Vertical text (`VDTPage.flow`)
@@ -1094,7 +1164,7 @@ function renderVerticalLine(line, block, v, targets, next) {
     }
     const contentWidth = line.segments && line.segments.length > 0 ? lineInkExtent(line, 0).width : line.bbox.width;
     const useJustify = block.textAlign === 'justify' && spaceCount > 0
-        && ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
+        && !line.tabbed && ((!line.isLastLine && !line.ragged) || contentWidth > effectiveWidth);
     const justifiedSpaceWidth = useJustify ? (effectiveWidth - wordWidth) / spaceCount : 0;
     const slack = Math.max(0, effectiveWidth - (contentWidth - trailing));
     let x = block.textAlign === 'center' ? slack / 2 : block.textAlign === 'right' ? slack : 0;
@@ -1528,7 +1598,22 @@ function renderResourceTable(rb, bx, by, options) {
         }
     }
     parts.push(rounded ? clipToOutline(fills.join(''), outline(0)) : fills.join(''));
-    if (t.borderWidthPx > 0) {
+    if (t.strokes) {
+        // Booktabs (#625): one box per stroke of the layout, centred on its
+        // line (the rules are horizontal; a vertical one is drawn as tall).
+        for (const s of t.strokes) {
+            const x = bx + Math.min(s.x1, s.x2);
+            const y = by + Math.min(s.y1, s.y2);
+            const w = Math.abs(s.x2 - s.x1);
+            const h = Math.abs(s.y2 - s.y1);
+            parts.push(`<div aria-hidden="true" style="position:absolute;` +
+                (h === 0
+                    ? `left:${x}px;top:${y - s.widthPx / 2}px;width:${w}px;height:${s.widthPx}px;`
+                    : `left:${x - s.widthPx / 2}px;top:${y}px;width:${s.widthPx}px;height:${h}px;`) +
+                `background:${t.borderColor};"></div>`);
+        }
+    }
+    else if (t.borderWidthPx > 0) {
         // Border boxes are inflated by half the stroke so the border centres on
         // the cell edge — adjacent cells overlap exactly, like canvas strokeRect.
         const bw = t.borderWidthPx;
@@ -1877,7 +1962,8 @@ function renderBlockInner(block, options) {
     parts.push(v ? renderVerticalBullet(block, v) : renderBullet(block, options.dir));
     block.lines.forEach((line, i) => {
         const next = block.lines[i + 1];
-        parts.push(v ? renderVerticalLine(line, block, v, options.linkTargets, next) : renderLine(line, block, options.linkTargets, options.dir, options.rootLang, next));
+        const lead = i === 0 && block.dropCap && !v ? dropCapHtml(block.dropCap, line, quoteFontString(block.fontString)) : '';
+        parts.push(v ? renderVerticalLine(line, block, v, options.linkTargets, next) : renderLine(line, block, options.linkTargets, options.dir, options.rootLang, next, lead));
     });
     return parts.join('');
 }
@@ -1992,6 +2078,12 @@ verticalRegion, verticalDigits) {
     // Running heads and folios stay on the sheet, horizontal.
     const sheetOptions = options.vertical ? { ...options, vertical: undefined } : options;
     const slotParts = [];
+    // Line numbers (#621): on the sheet, hidden from assistive technology
+    // (each block is an artifact) and left out of a selection, so copied
+    // text runs from line to line without them.
+    if (page.lineNumbers) {
+        slotParts.push(`<div class="pt-line-numbers" style="user-select:none;-webkit-user-select:none;pointer-events:none;">${renderDesignSlot(page.lineNumbers, sheetOptions)}</div>`);
+    }
     if (page.header)
         slotParts.push(renderDesignSlot(page.header, sheetOptions));
     if (page.footer)