rapier-markdown-kit 1.2.3 → 1.2.6

package/dist/kit/ledger/transport.mjs

@@ -2,6 +2,7 @@
 // Paired source placement, shared by live editing and canonical-history proof.
 import {_rapierTransformSplices, _rapierValidAuthored, _rapierHistoryEffects} from './journal-records.mjs';
 import {projectInverseSource} from './inverse-source.mjs';
+import {authoredBasis, authoredPlacement, authoredPlacements} from './authored-origin.mjs';
 import {sha256} from './hash.mjs';
 import {canonicalJSON} from './data.mjs';
 
@@ -74,6 +75,18 @@ export function transposeRecord(base, splices, id, records) {
     if (next === null) throw new RangeError('canonical_transport_invalid');
     current = next;
   }
+  // A concurrent act that already removed these same authored units and wrote the
+  // same replacement is one physical edit. This act stays in history with no second
+  // deletion. Pure insertions are never collapsed: each one is its own unit. An
+  // inverse of that act means the replacement is not still in force.
+  const sameRows = (left, right) => left.length === right.length && left.every((row, index) =>
+    row.pos === right[index].pos && row.removed === right[index].removed && row.inserted === right[index].inserted);
+  const matched = crossed.filter(record => sameRows(record.splices, splices));
+  const targetsOf = record => record.transaction.sourceTransactionIds || (record.transaction.sourceTransactionId ? [record.transaction.sourceTransactionId] : []);
+  const withdrawn = matched.some(record => crossed.some(other => targetsOf(other).includes(record.transaction.id) ||
+    other.transaction.reverts === record.transaction.id || other.transaction.reapplies === record.transaction.id));
+  if (splices.some(row => row.removed.length) && matched.length && !withdrawn)
+    return {splices: [], sourceIndices: [], against: crossed, text: current};
   const moved = [], sourceIndices = [];
   for (const [sourceIndex, row] of splices.entries()) {
     const submitted = _rapierTransformSplices(source, [row]);
@@ -120,49 +133,7 @@ export function transposeSource(base, splices, client, log) {
   return transposeRecord(base, splices, client, records);
 }
 
-// The frontier names only causal maxima. Linear history needs one predecessor,
-// and concurrent predecessors remain separate until an act observes both.
-function authoredFrontier(records, visit = null) {
-  const dependencies = new Map(), frontier = new Set();
-  for (const record of records) {
-    const id = record.transaction.id, basis = record.authored?.basis;
-    if (visit) visit(record, basis ?? [...frontier].sort());
-    if (!basis) { dependencies.set(id, [...frontier]); frontier.clear(); }
-    else {
-      const pending = [...basis], seen = new Set();
-      while (pending.length) {
-        const prior = pending.pop();
-        if (seen.has(prior)) continue;
-        if (!dependencies.has(prior)) throw new RangeError('canonical_origin_invalid');
-        seen.add(prior); frontier.delete(prior); pending.push(...dependencies.get(prior));
-      }
-      dependencies.set(id, basis);
-    }
-    frontier.add(id);
-  }
-  return [...frontier].sort();
-}
-
-export function authoredBasis(records) { return authoredFrontier(records); }
-
-export function authoredPlacements(base, records) {
-  const origins = new Map(); let source = base;
-  authoredFrontier(records, (record, basis) => {
-    origins.set(record.transaction.id, record.authored ?? authoredPlacement(source, record.splices, basis));
-    source = _rapierTransformSplices(source, record.splices);
-    if (source === null) throw new RangeError('canonical_origin_invalid');
-  });
-  return origins;
-}
-
-// Immutable authored placement stays on its own act. Basis IDs refer only to this
-// canonical history; no source snapshot or duplicate history is stored.
-export function authoredPlacement(source, splices, basis) {
-  const origin = {basis: basis.slice().sort(), source: sha256(source), splices: splices.map(row => ({...row}))};
-  if (!_rapierValidAuthored(origin) || _rapierTransformSplices(source, splices) === null)
-    throw new RangeError('canonical_origin_invalid');
-  return origin;
-}
+export {authoredBasis, authoredPlacement, authoredPlacements};
 
 // Reconstruct an authored view from the same records, then prove its exact physical
 // placement. Equality of resulting text alone cannot prove a repeated-text anchor.
@@ -233,6 +204,19 @@ function authoredReplay(base, records, append = null) {
       if (source === null) throw new RangeError('canonical_origin_invalid');
     }
   }
+  const coverKey = origin => origin?.splices.some(row => row.removed.length)
+    ? canonicalJSON({basis: origin.basis, splices: origin.splices}) : null;
+  const coverCounts = new Map();
+  for (const [id, origin] of origins) {
+    if (effects.references.get(id)?.length) continue;
+    const key = coverKey(origin);
+    if (key) coverCounts.set(key, (coverCounts.get(key) || 0) + 1);
+  }
+  // Two inverses can name different acts and still withdraw one physical replacement.
+  const sharesCover = id => (effects.references.get(id) || []).some(ref => {
+    const key = coverKey(origins.get(ref));
+    return !!key && coverCounts.get(key) > 1;
+  });
   const ordered = (ids, selected = null) => {
     const order = [], known = new Set(ids), waiting = new Map(), dependents = new Map(), ready = [];
     const rank = id => selected ? Number(selected.has(id)) : Number(origins.get(id).splices.some(row => row.removed.length));
@@ -351,10 +335,11 @@ function authoredReplay(base, records, append = null) {
       if (aligned.text !== text) throw new RangeError('canonical_origin_invalid');
       const crossed = aligned.records.slice(basisOrder.length);
       let moved;
-      if (sharedInverses && effects.references.get(id)?.length) {
+      if (effects.references.get(id)?.length && (sharedInverses || sharesCover(id))) {
         // Each inverse retains its own targets. First prove the exact intention
         // in its causal source, then place that choice in the accepted effect
-        // graph. Another inverse may already suppress the same original bytes.
+        // graph. Another inverse may already suppress the same original bytes,
+        // including when the two inverses name different authors of one replacement.
         const authored = projectInverse(basis.text, basis.records, id);
         if (!same(origin.splices, authored.splices) ||
             _rapierTransformSplices(basis.text, origin.splices) !== authored.after)

package/dist/kit/pdf-vectors.mjs

@@ -132,7 +132,8 @@ export async function collectPdfVectors(main, {width, height, count, capture, si
         root = document.importNode(parsed.documentElement, true);
         root.style.setProperty('width', originalBox.width + 'px', 'important'); root.style.setProperty('height', originalBox.height + 'px', 'important');
         mount = document.createElement('div'); mount.style.cssText = `position:fixed;left:${originalBox.left}px;top:${originalBox.top}px;width:${originalBox.width}px;height:${originalBox.height}px;pointer-events:none`;
-        mount.append(root); document.body.append(mount); temporary.push(mount); await document.fonts.ready;
+        // A shadow root keeps the picture's own <style> on the picture, as an <img> does.
+        mount.attachShadow({mode: 'open'}).append(root); document.body.append(mount); temporary.push(mount); await document.fonts.ready;
         textRoots.push(root);
       }
       const box = root.getBoundingClientRect(), nodes = [root, ...root.querySelectorAll('*')], sequence = [];

package/dist/kit/print-capitals.mjs

@@ -82,4 +82,3 @@ export function createPrintCapitals(lineMetrics, linesHeight, followingProse) {
 
 const capitals = createPrintCapitals(lineMetrics, linesHeight, followingPrintProse);
 export const applyPrintCapitals = capitals.apply;
-export const clearPrintCapitals = capitals.clear;

package/dist/kit/rapier-ledger.mjs

@@ -10,6 +10,8 @@ export {_rapierTransformSplices, _rapierRecordSplices, _rapierValidLedgerRecord,
 import {replayHistory, sourceBefore, historyProjection, historyProjections, historyPlaces, selectiveUndo, groupHistoryActs, pictureHistorySplices} from './ledger/history.mjs';
 export {replayHistory, sourceBefore, historyProjection, historyProjections, historyPlaces, selectiveUndo, groupHistoryActs, pictureHistorySplices};
 
+import {sha256State} from './ledger/hash.mjs';
+export {sha256State};
 import {transposeSource} from './ledger/transport.mjs';
 export {transposeSource};
 

package/dist/kit/render-markdown.mjs

@@ -325,7 +325,7 @@ function initMarkdownIt() {
 			const provider = env.rapierProviders === false ? null : _rapierProviders.mermaid;
 			const native = globalThis.RapierFlowchart?.parseFlowchart(src).ok === true;
 			const ready = native || !!(provider && provider.status === 'ready' && typeof provider.renderToString === 'function');
-			if (!ready && env.rapierProviders !== false && !_diagramPromptedOnce) {
+			if (!ready && !provider?.request?.() && env.rapierProviders !== false && !_diagramPromptedOnce) {
 				_diagramPromptedOnce = true;
 				try { _rapierUiDiagram.request(); } catch (_) {}
 			}
@@ -366,7 +366,7 @@ function initMarkdownIt() {
 			if (env.rapierPage) return '<span data-rapier-math-source="">' + literal + '</span>';
 			const mathProvider = env.rapierProviders === false ? null : _rapierProviders.math;
 			if (!mathProvider || mathProvider.status !== 'ready' || typeof mathProvider.renderToString !== 'function') {
-				if (env.rapierProviders !== false && !_mathPromptedOnce) {
+				if (!mathProvider?.request?.() && env.rapierProviders !== false && !_mathPromptedOnce) {
 					_mathPromptedOnce = true;
 					try { _rapierUiMath.request(); } catch (_) {}
 				}
@@ -1716,6 +1716,15 @@ function* _rapierResolveSoftBreakTokensSteps(root) {
 	return root;
 }
 
+// Markup parsed in a document of its own, which runs no script and loads nothing (Copy's clipboard tree): one element per
+// markup, or no boxes where the joined parse did not keep them apart.
+function _rapierInertParse(markups) {
+	const doc = new DOMParser().parseFromString(markups.map((html, at) => '<div data-rapier-batch="' + at + '">' + html + '</div>').join(''), 'text/html');
+	const boxes = [...doc.body.childNodes];
+	const intact = boxes.length === markups.length && boxes.every((box, at) => box.getAttribute?.('data-rapier-batch') === String(at));
+	return {doc, boxes: intact ? boxes : null};
+}
+
 function _rapierUnwrapElement(element) {
 	while (element.firstChild) element.parentNode.insertBefore(element.firstChild, element);
 	element.remove();
@@ -1742,7 +1751,7 @@ function renderWithMathML(source, metadata = {}) {
 	return {html, equations};
 }
 
-  return {renderWithMathML, _rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierApplyImageGeometry, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
+  return {renderWithMathML, _rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierInertParse, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierApplyImageGeometry, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
 }
 export {RAPIER_TABLE_CAPTION_PREFIX_RE as tableCaptionPrefix, RAPIER_PORTABLE_HIGHLIGHT_HEX as portableHighlightHex, _RAPIER_RTL_SCRIPT as rtlScripts, createMarkdownRenderer};
 

package/dist/kit/render-print.mjs

@@ -75,7 +75,7 @@ function _rapierPrintWillFont(markers) {
 	const bounds = [0, -400, 10, 0];
 	const outline = cat(u16(1), bounds.map(u16), u16(2), u16(0), [1, 1, 1], u16(0), u16(10), u16(-5), u16(bounds[1]), u16(bounds[3] - bounds[1]), u16((bounds[1] - bounds[3]) / 2), [0]);
 	const utf16 = text => Array.from(text, ch => u16(ch.charCodeAt(0)));
-	const names = [[1, 'RapierWill'], [2, 'Regular'], [4, 'RapierWill Regular'], [6, 'RapierWill-Regular']];
+	const names = [[1, 'RapierWillCarrier'], [2, 'Regular'], [4, 'RapierWillCarrier Regular'], [6, 'RapierWillCarrier-Regular']];
 	let offset = 0;
 	const tables = {
 		'OS/2': cat(u16(4), u16(advance), u16(400), u16(5), u16(0), u16(650), u16(600), u16(0), u16(75), u16(650), u16(600), u16(0), u16(350),
@@ -449,7 +449,17 @@ async function _rapierPrintTextPages(main, pageWidth, count, check, origin = mai
 			prev = run;
 		}
 	}
-	return pages.map(page => page.map(({block, carrier, ...run}) => run));
+	// Each run carries the tags of its block's structure (outermost first): a PDF reader finds the document's headings, lists and
+	// tables from them rather than from positions.
+	const ROLES = {TABLE: 'Table', TR: 'TR', TD: 'TD', TH: 'TH', UL: 'L', OL: 'L', LI: 'LI', BLOCKQUOTE: 'BlockQuote', P: 'P', PRE: 'Code', FIGCAPTION: 'Caption',
+		H1: 'H1', H2: 'H2', H3: 'H3', H4: 'H4', H5: 'H5', H6: 'H6'};
+	const tags = block => {
+		const chain = [];
+		for (let node = block; node && node !== main; node = node.parentElement)
+			if (ROLES[node.tagName] || node === block && node.matches('.rapier-will-carrier')) chain.unshift({node, role: ROLES[node.tagName] || 'P'});
+		return chain;
+	};
+	return pages.map(page => page.map(({block, ...run}) => ({...run, tags: tags(block)})));
 }
 
 function _rapierPrintLinkPages(main, width, height, count) {
@@ -542,6 +552,9 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 	const descriptor = add('<< /Type /FontDescriptor /FontName /RapierText /Flags 4 /FontBBox [' + font.bounds.join(' ') + '] /ItalicAngle 0 /Ascent 500 /Descent -500 /CapHeight 500 /StemV 80 /FontFile2 ' + fontFile + ' 0 R >>');
 	const descendant = add('<< /Type /Font /Subtype /CIDFontType2 /BaseFont /RapierText /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> /FontDescriptor ' + descriptor + ' 0 R /DW 500 /CIDToGIDMap /Identity >>');
 	const type = add('<< /Type /Font /Subtype /Type0 /BaseFont /RapierText /Encoding /Identity-H /DescendantFonts [' + descendant + ' 0 R] /ToUnicode ' + mapping + ' 0 R >>');
+	const carrierDescriptor = add('<< /Type /FontDescriptor /FontName /RapierWillCarrier /Flags 4 /FontBBox [' + font.bounds.join(' ') + '] /ItalicAngle 0 /Ascent 500 /Descent -500 /CapHeight 500 /StemV 80 /FontFile2 ' + fontFile + ' 0 R >>');
+	const carrierDescendant = add('<< /Type /Font /Subtype /CIDFontType2 /BaseFont /RapierWillCarrier /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> /FontDescriptor ' + carrierDescriptor + ' 0 R /DW 500 /CIDToGIDMap /Identity >>');
+	const carrierType = add('<< /Type /Font /Subtype /Type0 /BaseFont /RapierWillCarrier /Encoding /Identity-H /DescendantFonts [' + carrierDescendant + ' 0 R] /ToUnicode ' + mapping + ' 0 R >>');
 	const numberFont = pageNumbers ? add('<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>') : null;
 	const kids = pages.map(() => { objects.push(null); return objects.length - 1; }), decimal = value => Number(value.toFixed(4));
 	const nativeFonts = new Map();
@@ -571,12 +584,26 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 		nativeResources.push(entry.name + ' ' + type + ' 0 R');
 	}
 	const sharedImages = new Map();
+	// The structure tree (PDF 1.7, 14.7): one element per tagged DOM element, each run marked with its page's next MCID.
+	const structs = new Map(), documentElement = {role: 'Document', kids: []}, parentTree = [];
+	const structOf = tags => {
+		let parent = documentElement;
+		for (const {node, role} of tags) {
+			let element = structs.get(node);
+			if (!element) {element = {role, kids: [], parent}; structs.set(node, element); parent.kids.push(element);}
+			parent = element;
+		}
+		return parent === documentElement ? null : parent;
+	};
 	for (let index = 0; index < pages.length; index++) {
 		check();
+		const marked = [];
+		parentTree.push(marked);
 		const held = pages[index], flate = !!held?.rgb;
 		const picture = stream('/Type /XObject /Subtype /Image /Width ' + pixelWidth + ' /Height ' + pixelHeight + ' /ColorSpace /DeviceRGB /BitsPerComponent 8 /Filter /' + (flate ? 'FlateDecode' : 'DCTDecode'), flate ? held.rgb : held);
 		pages[index] = null;
-		let commands = 'q\n' + [decimal(pixelWidth * .75), 0, 0, decimal(pixelHeight * .75), decimal(margins.left), decimal(height - margins.top - pixelHeight * .75)].join(' ') + ' cm\n/Im0 Do\nQ\n';
+		// The page's picture is how its tagged text looks, not a figure of its own: an artifact.
+		let commands = '/Artifact BMC\nq\n' + [decimal(pixelWidth * .75), 0, 0, decimal(pixelHeight * .75), decimal(margins.left), decimal(height - margins.top - pixelHeight * .75)].join(' ') + ' cm\n/Im0 Do\nQ\nEMC\n';
 		const pictures = ['/Im0 ' + picture + ' 0 R'], states = [];
 		for (const drawing of vectorPages[index] || []) {
 			commands += `q\n.75 0 0 -.75 ${decimal(margins.left)} ${decimal(height - margins.top)} cm\n0 0 ${pixelWidth} ${pixelHeight} re W n\n1 0 0 1 ${decimal(drawing.x)} 0 cm\n`;
@@ -609,6 +636,8 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 			// Keep one logical Unicode text object, resetting its font before each scalar's direction
 			// can change. Readers that ignore ActualText otherwise discard earlier words in mixed RTL/LTR.
 			// Express width in the font size: some readers ignore horizontal text scaling when joining.
+			const element = structOf(run.tags || []);
+			if (element) {element.kids.push({page: index, mcid: marked.length}); commands += `/${element.role} << /MCID ${marked.length} >> BDC\n`; marked.push(element);}
 			commands += `q\n/Span << /ActualText <feff${hex(run.text)}> >> BDC\nBT\n100 Tz\n`;
 			for (const part of run.parts || [run]) {
 				if (part.font) {
@@ -623,11 +652,11 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 					const baseline = decimal(height - margins.top - (part.y + part.height * .8) * .75);
 					for (let letter = 0; letter < characters.length; letter++) {
 						const value = codes.get(characters[letter].codePointAt(0)).toString(16).padStart(4, '0');
-						commands += `/F1 ${decimal(size)} Tf\n3 Tr\n1 0 0 ${decimal(scaleY)} ${decimal(margins.left + part.x * .75 + slots[letter] * advance)} ${baseline} Tm\n<${value}> Tj\n`;
+						commands += `${run.carrier ? '/Fc' : '/F1'} ${decimal(size)} Tf\n3 Tr\n1 0 0 ${decimal(scaleY)} ${decimal(margins.left + part.x * .75 + slots[letter] * advance)} ${baseline} Tm\n<${value}> Tj\n`;
 					}
 				}
 			}
-			commands += 'ET\nEMC\nQ\n';
+			commands += 'ET\nEMC\nQ\n' + (element ? 'EMC\n' : '');
 		}
 		if (numberFont) commands += `BT\n/F2 9 Tf\n0 Tr\n1 0 0 1 ${decimal(width / 2 - String(index + 1).length * 2.5)} ${decimal(margins.bottom / 2)} Tm\n(${index + 1}) Tj\nET\n`;
 		const content = stream('/Filter /FlateDecode', await compressed(encode(commands)));
@@ -638,10 +667,17 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 				: '/Dest [' + kids[link.target.page] + ' 0 R /XYZ ' + decimal(margins.left + link.target.x * .75) + ' ' + decimal(height - margins.top - link.target.y * .75) + ' null]';
 			return add('<< /Type /Annot /Subtype /Link /Border [0 0 0] /Rect [' + rect.join(' ') + '] ' + target + ' >>');
 		});
-		put(kids[index], '<< /Type /Page /Parent 2 0 R /MediaBox [0 0 ' + decimal(width) + ' ' + decimal(height) + '] /Resources << /XObject << ' + pictures.join(' ') + ' >> /ExtGState << ' + states.join(' ') + ' >> /Font << /F1 ' + type + ' 0 R' + (numberFont ? ' /F2 ' + numberFont + ' 0 R' : '') + ' ' + nativeResources.join(' ') + ' >> >> /Contents ' + content + ' 0 R' + (annotations.length ? ' /Annots [' + annotations.map(id => id + ' 0 R').join(' ') + ']' : '') + ' >>');
+		put(kids[index], '<< /Type /Page /Parent 2 0 R /StructParents ' + index + ' /MediaBox [0 0 ' + decimal(width) + ' ' + decimal(height) + '] /Resources << /XObject << ' + pictures.join(' ') + ' >> /ExtGState << ' + states.join(' ') + ' >> /Font << /F1 ' + type + ' 0 R /Fc ' + carrierType + ' 0 R' + (numberFont ? ' /F2 ' + numberFont + ' 0 R' : '') + ' ' + nativeResources.join(' ') + ' >> >> /Contents ' + content + ' 0 R' + (annotations.length ? ' /Annots [' + annotations.map(id => id + ' 0 R').join(' ') + ']' : '') + ' >>');
 	}
 	put(2, '<< /Type /Pages /Count ' + kids.length + ' /Kids [' + kids.map(id => id + ' 0 R').join(' ') + '] >>');
-	put(1, '<< /Type /Catalog /Pages 2 0 R /Names << /EmbeddedFiles << /Names [<feff' + hex(filename) + '> ' + file + ' 0 R] >> >> /AF [' + file + ' 0 R] >>');
+	const tree = add(''), ids = new Map([[documentElement, add('')]]);
+	const reserve = element => { for (const kid of element.kids) if (kid.kids) { ids.set(kid, add('')); reserve(kid); } };
+	reserve(documentElement);
+	for (const [element, id] of ids) put(id, '<< /Type /StructElem /S /' + element.role + ' /P ' + (element.parent ? ids.get(element.parent) : tree) + ' 0 R /K [' +
+		element.kids.map(kid => kid.kids ? ids.get(kid) + ' 0 R' : '<< /Type /MCR /Pg ' + kids[kid.page] + ' 0 R /MCID ' + kid.mcid + ' >>').join(' ') + '] >>');
+	const parents = add('<< /Nums [' + parentTree.map((marked, index) => index + ' [' + marked.map(element => ids.get(element) + ' 0 R').join(' ') + ']').join(' ') + '] >>');
+	put(tree, '<< /Type /StructTreeRoot /K [' + ids.get(documentElement) + ' 0 R] /ParentTree ' + parents + ' 0 R /ParentTreeNextKey ' + parentTree.length + ' >>');
+	put(1, '<< /Type /Catalog /Pages 2 0 R /MarkInfo << /Marked true >> /StructTreeRoot ' + tree + ' 0 R /Names << /EmbeddedFiles << /Names [<feff' + hex(filename) + '> ' + file + ' 0 R] >> >> /AF [' + file + ' 0 R] >>');
 	const info = add('<< /Producer (Rapier) /Title <feff' + hex(title || filename.replace(/\.[^.]*$/, '')) + '> >>');
 	const header = encode('%PDF-1.7\n%\u00e2\u00e3\u00cf\u00d3\n'), offsets = new Array(objects.length);
 	let cursor = header.length;

package/dist/kit/render-sanitize.mjs

@@ -29,11 +29,6 @@ const RAPIER_SANITIZE_OPTIONS = Object.freeze({
 		FORBID_TAGS: RAPIER_SANITIZE_FORBID_TAGS,
 		FORBID_ATTR: RAPIER_SANITIZE_FORBID_ATTR,
 	}),
-	snippet: Object.freeze({
-		..._rapierSanitizeProfile('html'),
-		FORBID_TAGS: RAPIER_SANITIZE_FORBID_TAGS,
-		FORBID_ATTR: Object.freeze([...'style']),
-	}),
 	diagram: Object.freeze({
 		..._rapierSanitizeProfile('html', 'svg'),
 		FORBID_TAGS: Object.freeze(['form', 'dialog', 'template', 'iframe', 'script', 'foreignobject']),
@@ -59,6 +54,9 @@ const DIAGRAM_LABEL_SVG_NAMESPACE = 'http://www.w3.org/2000/svg';
 const DIAGRAM_LABEL_HTML_NAMESPACE = 'http://www.w3.org/1999/xhtml';
 const DIAGRAM_LABEL_MATH_NAMESPACE = 'http://www.w3.org/1998/Math/MathML';
 
+// The profile each DOMPurify instance holds (setConfig), shared by every renderer made over it.
+const purifyConfigured = new WeakMap();
+
 function _rapierImageDataAttributeAllowed(tag, attribute, value, verify) {
 	return (tag === 'img' && attribute === 'src' || tag === 'image' && /^(?:href|xlink:href)$/.test(attribute)
 		&& /^data:image\/(?:png|jpeg|webp|jxl);base64,/i.test(value)) && verify(value);
@@ -376,6 +374,8 @@ function _rapierInstallSanitizeHooks() {
 	});
 }
 
+const purifyOptions = new Map();
+
 function sanitizeRapierHtml(value, context = 'render') {
 	return sanitize(value, context, false);
 }
@@ -392,24 +392,31 @@ function sanitize(value, context, fragment) {
 	// (the hook) without an id the chrome owns. 'source' is Markdown source HTML, written and never shown: the render
 	// profile's admission, and the block on remote content stays the reader's (a remote picture's URL is the person's words).
 	const selected = context === 'raw' || context === 'export' || context === 'source' || RAPIER_SANITIZE_OPTIONS[context] ? context : 'render';
-	let options = selected === 'raw' ? { ...RAPIER_SANITIZE_OPTIONS.render, ALLOW_DATA_ATTR: false } : RAPIER_SANITIZE_OPTIONS[selected] || RAPIER_SANITIZE_OPTIONS.render;
-	if (selected === 'source') options = {...options, ADD_DATA_URI_TAGS: ['image']};
-	const labels = selected === 'diagram' || selected === 'export';
-	if (labels) {
+	const labels = selected === 'diagram' || selected === 'export', key = selected + (fragment ? ' fragment' : '');
+	let options = purifyOptions.get(key);
+	if (!options) {
+		options = selected === 'raw' ? { ...RAPIER_SANITIZE_OPTIONS.render, ALLOW_DATA_ATTR: false } : RAPIER_SANITIZE_OPTIONS[selected] || RAPIER_SANITIZE_OPTIONS.render;
+		if (selected === 'source') options = {...options, ADD_DATA_URI_TAGS: ['image']};
 		// DOMPurify's USE_PROFILES replaces explicit allowlists. Add MathML to the
 		// selected profile without discarding its admitted HTML and SVG vocabulary.
-		options = {...options, ALLOWED_TAGS: [...new Set([...options.ALLOWED_TAGS, ...RAPIER_SANITIZE_PROFILES.mathTags])],
+		if (labels) options = {...options, ALLOWED_TAGS: [...new Set([...options.ALLOWED_TAGS, ...RAPIER_SANITIZE_PROFILES.mathTags])],
 			ALLOWED_ATTR: [...new Set([...options.ALLOWED_ATTR, ...RAPIER_SANITIZE_PROFILES.mathAttributes])], ADD_TAGS: ['foreignobject'], ADD_DATA_URI_TAGS: ['image'],
 			HTML_INTEGRATION_POINTS: {foreignobject: true}, FORBID_TAGS: options.FORBID_TAGS.filter(tag => tag !== 'foreignobject')};
+		if (fragment) options = {...options, RETURN_DOM_FRAGMENT: true};
+		purifyOptions.set(key, options);
+	}
+	if (labels) {
 		DOMPurify.addHook('uponSanitizeElement', diagramLabelElement);
 		DOMPurify.addHook('uponSanitizeAttribute', diagramLabelAttribute);
 		DOMPurify.addHook('afterSanitizeAttributes', diagramLabelContained);
 	}
-	if (fragment) options = {...options, RETURN_DOM_FRAGMENT: true};
+	// DOMPurify reparses a per-call configuration on every call (its cache compares its own copy), about 0.45 ms
+	// each in Chrome 155. A profile is set once and kept until another profile is asked for; every caller comes here.
+	if (purifyConfigured.get(DOMPurify) !== options) { DOMPurify.setConfig(options); purifyConfigured.set(DOMPurify, options); }
 	const previous = _rapierSanitizeRuntime.context;
 	_rapierSanitizeRuntime.context = selected;
 	try {
-		return DOMPurify.sanitize(value == null ? '' : String(value), options);
+		return DOMPurify.sanitize(value == null ? '' : String(value));
 	} finally {
 		if (labels) {
 			DOMPurify.removeHook('uponSanitizeElement', diagramLabelElement);

package/dist/kit/render-styles.mjs

@@ -103,9 +103,9 @@ function _rapierArtifactStyles(theme, includeFonts, printMode, houseDefaults = f
 	const highlightCss = _rapierStyleText('rapier-highlight-style');
 	parts.push(highlightCss);
 	// A page written for the system theme has no body.light to switch: under a light system
-	// setting it takes the Standard palette's light values from the sheet's own body.light rule.
-	const light = theme === 'system' && /html\[data-highlights="standard"\] body\.light\s*\{([^}]*)\}/.exec(highlightCss);
-	if (light) parts.push('@media (prefers-color-scheme:light){html[data-rapier-theme="system"][data-highlights="standard"] body{' + light[1].trim() + '}}');
+	// setting each palette takes its light values from the sheet's own body.light rule.
+	if (theme === 'system') for (const [, palette, light] of highlightCss.matchAll(/html\[data-highlights="(standard|accent)"\] body\.light\s*\{([^}]*)\}/g))
+		parts.push('@media (prefers-color-scheme:light){html[data-rapier-theme="system"][data-highlights="' + palette + '"] body{' + light.trim() + '}}');
 	if (printMode) parts.push(_rapierArtifactPrintCss());
 	return parts.filter(Boolean).join('\n\n');
 }

package/dist/kit/render-work.mjs

@@ -8,7 +8,7 @@ export function finish(iterator) {
 
 export function check(work) {
 	work?.check?.();
-  if (work?.signal?.aborted) throw Object.assign(new Error('The operation was cancelled.'), {name: 'AbortError', code: 'cancelled'});
+  if (work?.signal?.aborted) throw Object.assign(new Error('The operation was canceled.'), {name: 'AbortError', code: 'cancelled'});
 }
 
 export async function pause(work, fraction, label) {

package/dist/kit/render.mjs

@@ -8,43 +8,6 @@ import {documentLanguage, documentSettingsFonts} from '../spec/document-settings
 import {createLineMeasurer, linesHeight} from '../layout/model.mjs';
 import {markPrintCapitals, createPrintCapitals, followingPrintProse} from './print-capitals.mjs';
 import {freezePublishedInk} from './render-ink.mjs';
-// The document's renderer. DOM, codecs and host state are explicit inputs.
-// Rapier generates attribute selectors for dark paper. Project those owned rules onto their
-// SVG elements before export removes stylesheets; the inert host and the editor share this pass.
-export function presentNativeDiagram(drawing) {
-  const winners=new Map();
-  for(const style of drawing.querySelectorAll('style')){
-    const media=/^\s*@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)\s*\{([\s\S]*)\}\s*$/.exec(style.textContent);
-    if(media)for(const rule of media[1].matchAll(/([^{}]+)\{([^{}]*)\}/g)){
-      // The browser's CSS sanitizer serializes owned hex colours as rgb()/rgba().
-      const properties=[...rule[2].matchAll(/(?:^|;)\s*(fill|stroke|color|stop-color)\s*:\s*(#[\da-f]{3,8}|rgba?\([\d.,%/\s]+\)|none)\s*(?:!important)?(?=;|$)/gi)];
-      for(const selector of rule[1].split(',')){
-        // Draw's selectors contain only attributes, descendants and immediate children.
-        if(!/^\s*\[[^\[\]{};]+\](?:\s*(?:>\s*)?\[[^\[\]{};]+\])*\s*$/.test(selector))continue;
-        const rank=(selector.match(/\[/g)||[]).length;
-        for(const element of [...(drawing.matches(selector)?[drawing]:[]),...drawing.querySelectorAll(selector)]){
-          let paints=winners.get(element);if(!paints)winners.set(element,paints=new Map());
-          for(const [,property,dark] of properties){const light=element.getAttribute(property);
-            if(light&&(paints.get(property)?.rank??-1)<=rank)paints.set(property,{light,dark,rank});}
-        }
-      }
-    }
-    style.remove();
-  }
-  for(const [element,paints] of winners)for(const [property,{light,dark}] of paints)
-    element.style.setProperty(property,'light-dark('+light+', '+dark+')','important');
-  drawing.classList.add('rapier-native-flowchart');drawing.setAttribute('role','img');
-  drawing.setAttribute('aria-roledescription',drawing.getAttribute('data-rapier-diagram-kind')||'flowchart');
-  const width=Number(drawing.getAttribute('width')),
-    sizes=[...drawing.querySelectorAll('text[font-size]')].map(text=>Number(text.getAttribute('font-size'))).filter(size=>Number.isFinite(size)&&size>0),
-    minimum=sizes.reduce((smallest,size)=>Math.min(smallest,size),Infinity);
-  if(Number.isFinite(width)&&width>0){
-    const readable=Math.ceil(width*14/(Number.isFinite(minimum)?minimum:14)*1000)/1000;
-    drawing.style.width='clamp('+readable+'px, 100%, '+width+'px)';
-  }
-  drawing.style.maxWidth='none';
-}
-
 // Set the first view once. Subsequent rendering keeps the person's horizontal position.
 export function positionNativeDiagram(drawing) {
   const surface=drawing?.closest?.('.diagram-block,.diagram-live-preview');
@@ -67,6 +30,7 @@ export function positionNativeDiagram(drawing) {
   surface.scrollLeft=Math.max(0,Math.min(surface.scrollWidth-surface.clientWidth,left));
 }
 
+// The document's renderer. DOM, codecs and host state are explicit inputs.
 function createRenderer(runtime) {
   const {RapierLedgerCarried, RapierPageReturnAddress, RapierTextCodec, _rapierArtifactHighlight, _rapierArtifactPreference, _rapierArtifactStyles, _rapierBlobDataUrl, _rapierBuildInterchangeContext, _rapierDocumentNameIsAdmissible, _rapierLedgerParts, _rapierDrawReadSVGRecipe, _rapierDrawShapeProfileFor, _rapierExportFontCss, _rapierFillDiagram, _rapierFinalizeExportCode, _rapierLanguageClass, _rapierLineStartOffsets, _rapierMarkdownEnvironment, _rapierPortableHtml, _rapierPrepareInterchangeContext, _rapierProjectPortableRoot, _rapierProviders, _rapierSourceCharEscaped, _rapierSourceLineSpan, crypto, document, escapeRapierHtmlText, globalThis, sanitizeRapierHtml} = runtime;
   let md = runtime.md;
@@ -376,7 +340,7 @@ function _rapierDocxRenderStyles(root) {
 		const surface = into.createElement('div'); surface.className = 'md-render'; into.body.appendChild(surface);
 		const canvas = into.createElement('canvas'); canvas.width = canvas.height = 1;
 		const paint = canvas.getContext('2d'), colours = new Map();
-		if (!paint) throw new Error('Word text colours could not be read.');
+		if (!paint) throw new Error('Word text colors could not be read.');
 		const hex = colour => {
 			if (!colours.has(colour)) {
 				// CSS may resolve an accent to oklch/color-mix. The browser supplies its
@@ -659,11 +623,12 @@ function _rapierSharedResolve(text, ids, images, definitions) {
 	// Authored # characters were encoded. A raw id after ]( can only be a structural
 	// substitution; matching its destination lets nested alt brackets survive unchanged.
 	const inline = new RegExp('(\\]\\([ \\t\\r\\n]*(?:&lt;)?)#' + id + '(?=>?[ \\t\\r\\n]*\\)|>?[ \\t\\r\\n]+["\'(])', 'g');
-	// A definition may sit in a quote or a list item: its line starts with that container's markers.
-	const definition = new RegExp('(^[ \\t>]*\\[((?:\\\\.|[^\\]\\\\])+)\\]:[ \\t]*(?:(?:\\r\\n|\\r|\\n)[ \\t>]*)?(?:&lt;)?)#' + id + '(?=>?[ \\t]*$|>?[ \\t]+["\'(])', 'gm');
+	// A definition may sit in a quote or a list item, as the writer found it: its line starts with their markers.
+	const definition = new RegExp('(^[ \\t>]*(?:(?:[-+*]|\\d{1,9}[.)])[ \\t]+[ \\t>]*)*\\[((?:\\\\.|[^\\]\\\\])+)\\]:[ \\t]*(?:(?:\\r\\n|\\r|\\n)[ \\t>]*)?(?:&lt;)?)#' + id + '(?=>?[ \\t]*$|>?[ \\t]+["\'(])', 'gm');
 	const swapInline = (match, lead, value) => { const found = src(value); return found == null ? match : lead + found; };
 	const swapDefinition = (match, lead, label, value) => {
-		if (!definitions.has(md.utils.normalizeReference(_rapierSharedDecode(label)))) return match;
+		const decoded = _rapierSharedDecode(label), quoted = decoded.replace(/\r?\n[ \t]*(?:>[ \t]*)+/g, ' ');
+		if (!definitions.has(md.utils.normalizeReference(decoded)) && !definitions.has(md.utils.normalizeReference(quoted))) return match;
 		const found = src(value);
 		return found == null ? match : lead + found;
 	};

package/dist/layout/paragraph-fit.mjs

@@ -172,20 +172,6 @@ export function createParagraphFitter() {
     return {lines, work, cost: totalCost, approximate: false};
   }
 
-  function solve(prepared, width, options, observe) {
-    const work = solveSteps(prepared, width, options);
-    try {
-      let step = work.next();
-      while (!step.done) {
-        if (step.value && !observe) return null;
-        step = work.next(step.value ? observe(step.value) : undefined);
-      }
-      return step.value;
-    } finally { work.return(); }
-  }
-  return {prepare, solve, solveSteps};
+  return {prepare, solveSteps};
 }
 
-const fitter = createParagraphFitter();
-export const prepareParagraph = fitter.prepare;
-export const fitParagraph = fitter.solve;

package/dist/layout/typography.mjs

@@ -3,7 +3,8 @@ import {createPreparationScope, supportsRichStyle, captureFontAuthority} from '.
 import {createParagraphFitter} from './paragraph-fit.mjs';
 
 // Layout projections keep the original text in place. The factory also runs in an exported page.
-export function createTypography(fitter = createParagraphFitter()) {
+export function createTypography() {
+  const fitter = createParagraphFitter();
   const mark = 'data-rapier-typography', boundary = mark + '-break', hang = mark + '-hang';
   const protectedInitial = mark + '-protected-initial';
   const gapMark = mark + '-gap', fitMark = mark + '-fit';