rapier-markdown-kit 1.1.104 → 1.2.5

package/dist/kit/render.mjs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-import {htmlImageRecord, mountHtmlBlocks} from '../spec/html-blocks.mjs';
+import {htmlImageRecord, htmlRuntimeSource} from '../spec/html-blocks.mjs';
 import {finish, finishAsync, cloneTree, cleanTree, serializeTree, encodeUtf8Steps, pause} from './render-work.mjs';
 import {fontFamilyCss} from '../spec/md-marks.mjs';
 import {readFontAssets, documentFontsCss} from '../spec/document-fonts.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,8 +30,9 @@ 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 {RAPIER_COLOR_CLOSE, RapierLedgerCarried, RapierPageReturnAddress, RapierTextCodec, _rapierArtifactHighlight, _rapierArtifactPreference, _rapierArtifactStyles, _rapierBlobDataUrl, _rapierBuildInterchangeContext, _rapierDocumentNameIsAdmissible, _rapierLedgerParts, _rapierDrawReadSVGRecipe, _rapierDrawShapeProfileFor, _rapierExportFontCss, _rapierFillDiagram, _rapierFinalizeExportCode, _rapierFormatColorOpen, _rapierLanguageClass, _rapierLineStartOffsets, _rapierMarkdownEnvironment, _rapierPortableHtml, _rapierPrepareInterchangeContext, _rapierProjectPortableRoot, _rapierProviders, _rapierSourceCharEscaped, _rapierSourceLineSpan, crypto, document, escapeRapierHtmlText, globalThis, rapierConfirm, sanitizeRapierHtml} = 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;
   async function render(source, options = {}) {
     if (typeof source !== 'string') throw new TypeError('Document source must be a string');
@@ -157,14 +121,16 @@ async function _rapierBuildArtifact(options, providedContext) {
 	styledRoot.setAttribute('lang', language);
 	if (completePage && typeof _rapierFinalizeExportCode === 'function') await _rapierFinalizeExportCode(styledRoot);
 	// _rapierProjectStyledRoot already returns the sanitized projection.
-	// Print runs shared paragraph typography, but keeps its existing picture layout;
-	// picture-shape annotations have no consumer in that artifact.
+	// Picture-shape annotations have no consumer in a printed artifact.
 	if (!opts.print) _rapierAnnotateExportBoxPolygons(styledRoot);
+	// Paper keeps each picture's wrap through the same static float layout a page uses.
+	if (completePage || opts.print) {
+		if (work) await finishAsync(_rapierSharedPageLayoutSteps(styledRoot), work);
+		else _rapierSharedPageLayout(styledRoot);
+	}
 	if (completePage && !opts.print) {
-		if (work) {
-			await finishAsync(_rapierSharedPageLayoutSteps(styledRoot), work);
-			await finishAsync(_rapierShareCapLongCodeBlocksSteps(styledRoot), work);
-		} else { _rapierSharedPageLayout(styledRoot); _rapierShareCapLongCodeBlocks(styledRoot); }
+		if (work) await finishAsync(_rapierShareCapLongCodeBlocksSteps(styledRoot), work);
+		else _rapierShareCapLongCodeBlocks(styledRoot);
 	}
 	if (typeof opts.afterRoot === 'function') await opts.afterRoot(styledRoot);
 	markPrintCapitals(styledRoot);
@@ -185,8 +151,6 @@ async function _rapierBuildArtifact(options, providedContext) {
 	// rules of its own -- Share, for the no-script float it alone writes -- appends them.
 	// Print retains its existing factory resources. HTML adds only the optional small Sans subset below.
 	const includeFonts = !!opts.print;
-	const zenFontCss = opts.print && styledRoot.querySelector('svg[aria-roledescription="zenuml"]')
-		? (_rapierProviders?.mermaid?.exportFontCss?.() || '') : '';
 	const willFont = opts.print && opts.willFont ? opts.willFont : null;
 	const settingsCss = _rapierDocumentSettingsCss(settings);
 	const refined = styledRoot.querySelector('p[data-md-hyphens="auto"],p[data-md-lines],p[data-md-caps="small"],p[data-md-hanging="on"],img[data-rapier-print-lines]');
@@ -227,7 +191,7 @@ async function _rapierBuildArtifact(options, providedContext) {
 	// nonce out of it and be admitted.
 	const layoutScript = opts.scripts !== false ? _rapierArtifactLayoutScript(styledRoot, nonce, {pictures:!opts.print}) : '';
 	const inkScript = !opts.print && opts.scripts !== false ? _rapierArtifactInkScript(styledRoot, nonce) : '';
-	const htmlScript = opts.scripts !== false && styledRoot.querySelector('[data-rapier-html]') ? '<script nonce="' + nonce + '">(' + mountHtmlBlocks.toString().replace(/<\/script/gi, '<\\/script') + ')(document);</script>' : '';
+	const htmlScript = !opts.print && opts.scripts !== false && styledRoot.querySelector('[data-rapier-html],[data-rapier-animation]') ? '<script nonce="' + nonce + '">' + htmlRuntimeSource().replace(/<\/script/gi, '<\\/script') + '</script>' : '';
 	const page = '<!DOCTYPE html>\n'
 		+ '<html lang="' + escapeRapierHtmlText(language) + '" data-rapier-theme="' + theme + '" data-highlights="' + highlights + '" data-invert-image-alpha="' + (invertImageAlpha ? 'on' : 'off') + '">\n'
 		+ '<head>\n<meta charset="UTF-8">\n' + (carrier ? RapierPageReturnAddress.PAGE_SEED + '\n' : '')
@@ -243,7 +207,7 @@ async function _rapierBuildArtifact(options, providedContext) {
 		+ '<meta name="generator" content="Rapier ' + escapeRapierHtmlText(version) + '">\n'
 		+ '<title>' + escapeRapierHtmlText(pageTitle) + '</title>\n'
 		+ '<style>' + css + '</style>\n</head>\n'
-		+ '<body class="' + bodyClass + '"><main class="' + docClass + '" data-md-theme="' + theme + '"' + (settings?.space ? ' data-md-space' : '') + '>'
+		+ '<body class="' + bodyClass + '"><main class="' + docClass + '" data-md-theme="' + theme + '">'
 		+ bodyHtml + '</main>' + carrier + layoutScript + inkScript + htmlScript + '</body>\n</html>';
 
 	return {
@@ -301,49 +265,6 @@ function* _rapierProjectStyledRootSteps(semanticRoot, options) {
 			if (lang) code.classList.add('language-' + String(lang).replace(/[^a-z0-9_-]/gi, ''));
 		}
 	} else {
-		if (root.hasAttribute('data-md-space')) {
-			// One raw HTML token may have several siblings. Its authored heights stay inside one line-sized box.
-			for (let element = root.firstElementChild; element;) {
-				const group = element.getAttribute('data-md-html-block');
-				if (group === null) { element = element.nextElementSibling; continue; }
-				let first = element;
-				// Sanitizing a container or repairing a table can leave its text before the first surviving tag.
-				while (first.previousSibling && first.previousSibling.nodeType !== 1) { first = first.previousSibling; yield; }
-				const wrap = document.createElement('div');
-				wrap.className = 'md-space-block';
-				root.insertBefore(wrap, first);
-				let node = first;
-				while (node && (node.nodeType !== 1 || node.getAttribute('data-md-html-block') === group)) {
-					const next = node.nextSibling;
-					wrap.appendChild(node);
-					node = next;
-					yield;
-				}
-				element = wrap.nextElementSibling;
-			}
-			// A removed raw container can leave only text. Reserve that surviving content in this projection.
-			for (let first = root.firstChild; first;) {
-				if (first.nodeType === 1) { first = first.nextSibling; continue; }
-				let end = first, hasText = false;
-				while (end && end.nodeType !== 1) {
-					if (end.nodeType === 3 && end.nodeValue.trim()) hasText = true;
-					end = end.nextSibling;
-					yield;
-				}
-				if (hasText) {
-					const wrap = document.createElement('div');
-					wrap.className = 'md-space-block';
-					root.insertBefore(wrap, first);
-					for (let node = first; node !== end;) {
-						const next = node.nextSibling;
-						wrap.appendChild(node);
-						node = next;
-						yield;
-					}
-				}
-				first = end;
-			}
-		}
 		for (const code of root.querySelectorAll('pre > code')) { yield;
 			if (code.parentElement?.classList.contains('diagram-source') &&
 					code.closest('.diagram-block')?.getAttribute('data-diagram-state') === 'ready') continue;
@@ -465,11 +386,15 @@ function _rapierPaintCode(el, html) {
 
 function _rapierPrefixPortableAnchors(root, baseName) { return finish(_rapierPrefixPortableAnchorsSteps(root, baseName)); }
 
-function* _rapierPrefixPortableAnchorsSteps(root, baseName) {
+// The id an anchor carries on a portable page: the document's name, then the anchor with what an id cannot hold made a hyphen.
+function _rapierPortableAnchorId(baseName, id) {
 	const slug = String(baseName || 'document').toLowerCase()
 		.replace(/[^a-z0-9]+/g, '-')
 		.replace(/^-+|-+$/g, '') || 'document';
-	const prefix = 'rapier-' + slug + '-';
+	return 'rapier-' + slug + '-' + (String(id).replace(/[^a-z0-9_-]+/gi, '-').replace(/^-+|-+$/g, '') || 'anchor');
+}
+
+function* _rapierPrefixPortableAnchorsSteps(root, baseName) {
 	const ids = new Map(), svgIds = new Map();
 	const used = new Set();
 	const scopeOf = element => {
@@ -486,11 +411,10 @@ function* _rapierPrefixPortableAnchorsSteps(root, baseName) {
 	for (const element of root.querySelectorAll('[id]')) { yield;
 		const oldId = element.id;
 		if (!oldId) continue;
-		const base = oldId.replace(/[^a-z0-9_-]+/gi, '-')
-			.replace(/^-+|-+$/g, '') || 'anchor';
-		let nextId = prefix + base;
+		const first = _rapierPortableAnchorId(baseName, oldId);
+		let nextId = first;
 		let suffix = 2;
-		while (used.has(nextId)) nextId = prefix + base + '-' + suffix++;
+		while (used.has(nextId)) nextId = first + '-' + suffix++;
 		used.add(nextId);
 		// A document link resolves the first matching anchor, as it did before renaming.
 		// SVG references resolve within their own drawing, never the last repeated drawing.
@@ -693,16 +617,18 @@ function _rapierSharedResolve(text, ids, images, definitions) {
 	let broken = false;
 	const src = value => {
 		const found = images.get(value);
-		if (typeof found !== 'string' || !/^data:image\/(?:png|jpeg|webp|svg\+xml|jxl);base64,[A-Za-z0-9+/]+={0,2}$/i.test(found)) { broken = true; return null; }
+		if (typeof found !== 'string' || !/^data:image\/(?:png|jpeg|webp|gif|svg\+xml|jxl);base64,[A-Za-z0-9+/]+={0,2}$/i.test(found)) { broken = true; return null; }
 		return found;
 	};
 	// 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');
-	const definition = new RegExp('(^ {0,3}\\[((?:\\\\.|[^\\]\\\\])+)\\]:[ \\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;
 	};
@@ -877,7 +803,7 @@ function* _rapierSharedPageLayoutSteps(root) {
 		// `layout.y` already owns `shape-outside` for its own inset reservation (below); the two are not
 		// combinable (a float has exactly one `shape-outside` value), so a `y`-offset `around` picture
 		// keeps that inset instead of silhouette wrapping -- a documented, narrow degradation.
-		if (layout.wrap === 'around' && !layout.rotate && !layout.y) {
+		if (layout.wrap === 'around' && !layout.rotate && !layout.y && !image.dataset.rapierContour?.endsWith('-box')) {
 			const src = image.getAttribute('src');
 			if (src) {
 				paragraph.style.setProperty('shape-outside', 'url("' + src + '")');
@@ -905,16 +831,12 @@ function* _rapierSharedPageLayoutSteps(root) {
 	for (const {image, paragraph, layout} of positionedAssignments) {
 		yield;
 		paragraph.style.cssText = 'position:relative;height:0;margin:0;padding:0;line-height:0';
-		const x = layout.x ?? 50, naturalWidth = Number(image.getAttribute('width')) || 0;
-		if (layout.width != null) {
-			image.style.width = layout.width + '%';
-			image.style.left = (x - layout.width / 2) + '%';
-		} else if (naturalWidth > 0) {
-			image.style.width = naturalWidth + 'px';
-			image.style.left = 'calc(' + x + '% - ' + (naturalWidth / 2) + 'px)';
-		} else {
-			image.style.left = x + '%';
-		}
+		// Without x the picture starts at the left edge, as everywhere else (layout/model.mjs imageBox).
+		const x = layout.x, naturalWidth = Number(image.getAttribute('width')) || 0;
+		if (layout.width != null) image.style.width = layout.width + '%';
+		else if (naturalWidth > 0) image.style.width = naturalWidth + 'px';
+		image.style.left = x == null ? '0' : layout.width != null ? (x - layout.width / 2) + '%'
+			: naturalWidth > 0 ? 'calc(' + x + '% - ' + (naturalWidth / 2) + 'px)' : x + '%';
 		image.style.position = 'absolute';
 		image.style.top = (layout.y || 0) + 'em';
 		image.style.margin = '0';
@@ -1567,6 +1489,7 @@ function _rapierProjectArtifactLayout(root, metadata, geometry, preparation) {
   // wrap=around reads data-rapier-occupancy, else alpha. Cache key: src, dimensions, layout.wrap, rotate angle.
   // A turned raster's profile is recomputed here as pictureProfile does, never shipped.
   function profile(image, layout) {
+    if (layout.wrap === 'around' && image.dataset?.rapierContour?.endsWith('-box')) return null;
     const src = image.currentSrc || image.getAttribute('src') || '', rotateRad = (layout.rotate || 0) * Math.PI / 180;
     const cached = profiles.get(image);
     if (cached?.src === src && cached.width === image.naturalWidth && cached.height === image.naturalHeight &&
@@ -1780,8 +1703,7 @@ function _rapierProjectArtifactLayout(root, metadata, geometry, preparation) {
           if (image.hasAttribute('data-rapier-html')) {
             const attrs = JSON.parse(decodeURIComponent(image.getAttribute('data-rapier-html'))).attrs;
             const line = parseFloat(computed.lineHeight) || (parseFloat(computed.fontSize) || 16) * 1.6;
-            unrotated.height = !attrs.height || attrs.height === 'auto'
-              ? Number(image.dataset.rapierNaturalHeight) || box(image).height : Number(attrs.height) * line;
+            unrotated.height = metadata.objectHeight(unrotated.width, Number(image.dataset.rapierNaturalHeight) || box(image).height, attrs, line);
           }
           // rasterReserved (layout/model.mjs).
           const rasterRad = (layout.rotate || 0) * Math.PI / 180;
@@ -1936,6 +1858,6 @@ function _rapierArtifactTypographyScript(root) {
     '})();';
 }
 
-  return {_rapierDataImageDestinationsAsync, _rapierSharedSourceFormsAsync, _rapierPrefixPortableAnchorsSteps, _rapierProjectStyledRootAsync, _rapierBuildArtifact, _rapierBuildPublishedPage, _rapierProjectStyledRoot, _rapierDocxRenderStyles, _rapierPaintCode, _rapierPrefixPortableAnchors, _rapierDocumentSettingsOf, _rapierDocumentSettingsCss, _rapierExportedPageCsp, _rapierArtifactNonce, _rapierAnnotateExportBoxPolygons, _rapierSharedSourceHash, _rapierSharedSourceForms, _rapierSharedSourceCarrier, _rapierSharedResolve, _rapierReadSharedDocument, _rapierSharedPageFallbackCss, _rapierShareWrapKind, _rapierSharePictureParagraph, _rapierSharedPageLayout, _rapierShareCapLongCodeBlocks, _rapierRequireOfflinePageImages, _rapierCssValueUrls, _rapierBuildSharedPage, _rapierImageSources, _rapierImageDestinations, _rapierScanMarkdownImages, _rapierParseMarkdownImageDestination, _rapierImageOpenRunsList, _rapierArtifactFactoryModules, _rapierProjectArtifactLayout, _rapierArtifactLayoutScript, _rapierArtifactInkScript , render};
+  return {_rapierDataImageDestinationsAsync, _rapierSharedSourceFormsAsync, _rapierPrefixPortableAnchorsSteps, _rapierPortableAnchorId, _rapierProjectStyledRootAsync, _rapierBuildArtifact, _rapierBuildPublishedPage, _rapierProjectStyledRoot, _rapierDocxRenderStyles, _rapierPaintCode, _rapierPrefixPortableAnchors, _rapierDocumentSettingsOf, _rapierDocumentSettingsCss, _rapierExportedPageCsp, _rapierArtifactNonce, _rapierAnnotateExportBoxPolygons, _rapierSharedSourceHash, _rapierSharedSourceForms, _rapierSharedSourceCarrier, _rapierSharedResolve, _rapierReadSharedDocument, _rapierSharedPageFallbackCss, _rapierShareWrapKind, _rapierSharePictureParagraph, _rapierSharedPageLayout, _rapierShareCapLongCodeBlocks, _rapierRequireOfflinePageImages, _rapierCssValueUrls, _rapierBuildSharedPage, _rapierImageSources, _rapierImageDestinations, _rapierScanMarkdownImages, _rapierParseMarkdownImageDestination, _rapierImageOpenRunsList, _rapierArtifactFactoryModules, _rapierProjectArtifactLayout, _rapierArtifactLayoutScript, _rapierArtifactInkScript , render};
 }
 export {createRenderer};

package/dist/layout/model.mjs

@@ -251,13 +251,11 @@ export function bandsProfile(bands) {
 export function serializeProfile(profile, count = shapeGrid) {
   if (!profile) return '';
   const bands = [];
-  let any = false;
   for (let index = 0; index < count; index++) {
     const t = (index + .5) / count;
     let runs = profile.runsAt ? profile.runsAt(t) : null;
     if (!runs) { const span = profile.spanAt ? profile.spanAt(t) : null; runs = span ? [span] : []; }
     const clean = (runs || []).map(([a, b]) => [Math.max(0, Math.min(1, +a)), Math.max(0, Math.min(1, +b))]).filter(([a, b]) => Number.isFinite(a) && Number.isFinite(b) && b > a);
-    if (clean.length) any = true;
     bands.push(clean.map(([a, b]) => {
       let left = Math.round(a * 1e4), right = Math.round(b * 1e4);
       // A narrow occupied run must not round to an invalid zero-width descriptor.
@@ -265,13 +263,13 @@ export function serializeProfile(profile, count = shapeGrid) {
       return (left / 1e4) + '-' + (right / 1e4);
     }).join(','));
   }
-  return any ? bands.join('|') : '';
+  return bands.join('|');
 }
 
 export function parseProfile(text) {
-  if (typeof text !== 'string' || !text) return null;
+  if (typeof text !== 'string' || !text || text.length > 262144) return null;
   const bands = text.split('|').map(band => band ? band.split(',').map(run => run.split('-').map(Number)) : []);
-  if (bands.length < 2 || bands.some(band => band.some(run => run.length !== 2 || !run.every(Number.isFinite) || run[0] < 0 || run[1] > 1 || run[1] <= run[0]))) return null;
+  if (bands.length < 2 || bands.length > 192 || bands.some(band => band.length > 192 || band.some(run => run.length !== 2 || !run.every(Number.isFinite) || run[0] < 0 || run[1] > 1 || run[1] <= run[0]))) return null;
   return bandsProfile(bands);
 }
 
@@ -309,9 +307,13 @@ export function pictureSlices(profile, x, y, width, height, scale = 1) {
         return span ? [span] : [];
       }).filter(run => Number.isFinite(run[0]) && Number.isFinite(run[1]) && run[1] > run[0])
         .sort((a, b) => a[0] - b[0]);
-      // Words wrap the outer contour: a band reserves from its leftmost ink to its rightmost, so no word lands
-      // inside a hollow outline or between two strokes of one picture.
-      const merged = runs.length ? [[runs[0][0], Math.max(...runs.map(run => run[1]))]] : [];
+      // Preserve transparent holes and gaps; only overlapping runs share an obstacle.
+      const merged = [];
+      for (const run of runs) {
+        const tail = merged.at(-1);
+        if (tail && run[0] <= tail[1]) tail[1] = Math.max(tail[1], run[1]);
+        else merged.push([...run]);
+      }
       const current = new Map();
       for (const [left, right] of merged) {
         const key = left + ':' + right;

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';

package/dist/packages/rapier-diff/concerns.mjs

@@ -0,0 +1,163 @@
+// SPDX-License-Identifier: MIT
+import {letter, within, prev, next} from './tokens.mjs';
+
+// Separator-only pieces join the edit beside them; adjacent blocks each carry their own line break.
+export function separate(c, endA = c.before.length, endB = c.after.length) {
+  const {before, after, safe, raw, spend} = c;
+  // A separator-only piece beside another edit joins it; equal separators at its ends stay unchanged.
+  if (!raw) for (let i = c.result.length - 1; i > 0; i--) {
+    const p = c.result[i - 1], q = c.result[i], side = p[0][0] === p[0][1] ? 1 : p[1][0] === p[1][1] ? 0 : -1, text = side ? after : before;
+    if (side >= 0 && !/\S/.test(text.slice(...p[side]))) {
+      let n = 0;
+      while (p[0][1] + n < q[0][0] && text[p[side][0] + n] === text[p[side][1] + n] && spend()) n++;
+      if (p[0][1] + n === q[0][0] && p.slice(0, 2).every((span, k) => safe(k ? after : before, span[0] + n) && safe(k ? after : before, span[1] + n)))
+        for (const span of p.slice(0, 2)) { span[0] += n; span[1] += n; }
+    }
+    if (p[2] || q[2] || p[0][1] !== q[0][0] || p[1][1] !== q[1][0] ||
+      ![p, q].some(r => !/\S/.test(before.slice(...r[0]) + after.slice(...r[1])))) continue;
+    const x = [p[0][0], q[0][1]], y = [p[1][0], q[1][1]], keep = /\S/.test(before.slice(...q[0]) + after.slice(...q[1])) ? q : p;
+    // CRLF steps as one separator.
+    for (let k; x[0] < x[1] && y[0] < y[1] && /\s/.test(before[x[1] - 1]) && before[x[1] - 1] === after[y[1] - 1] &&
+      (k = before.endsWith('\r\n', x[1]) && after.endsWith('\r\n', y[1]) ? 2 : 1) <= Math.min(x[1] - x[0], y[1] - y[0]) &&
+      safe(before, x[1] - k) && safe(after, y[1] - k);) { x[1] -= k; y[1] -= k; }
+    keep[3][0] = x[0] === x[1] ? 2 : y[0] === y[1] ? 0 : 1;
+    c.result.splice(i - 1, 2, [x, y, false, keep[3]]);
+  }
+  // Repeated closing lines can attach to the wrong block. Rotate an exact insertion/deletion to the
+  // next blank-line boundary, without crossing another edit or splitting a character.
+  if (!raw) for (let i = 0; i < c.result.length; i++) {
+    const p = c.result[i], q = c.result[i + 1], side = p[0][0] === p[0][1] ? 1 : p[1][0] === p[1][1] ? 0 : -1;
+    if (side < 0 || p[2]) continue;
+    const text = side ? after : before;
+    const room = Math.min((q?.[0][0] ?? endA) - p[0][1], (q?.[1][0] ?? endB) - p[1][1]);
+    let n = 0, shift = 0;
+    while (n < room && text[p[side][0] + n] === text[p[side][1] + n] && spend()) {
+      n++;
+      if (text[p[side][0] + n - 1] === '\n' && /^\r?\n/.test(text.slice(p[side][0] + n))) { shift = n; break; }
+    }
+    if (shift && p.slice(0, 2).every((span, k) => safe(k ? after : before, span[0] + shift) && safe(k ? after : before, span[1] + shift)))
+      for (const span of p.slice(0, 2)) { span[0] += shift; span[1] += shift; }
+  }
+  // Adjacent blocks deleted or inserted together: when the first carries the line break before it, each carries
+  // its own, so any one restores apart from its neighbours.
+  if (!raw) for (let i = 1; i < c.result.length; i++) {
+    const p = c.result[i - 1], q = c.result[i], kind = p[3][0], side = kind ? 1 : 0, text = side ? after : before;
+    if (kind % 2 || q[3][0] !== kind || p[2] || q[2] || p[side][1] !== q[side][0] || p[1 - side][0] !== q[1 - side][0]) continue;
+    const blank = /^\r?\n/.test(text.slice(...p[side])) && !/^\r?\n/.test(text.slice(...q[side])) && /(\r?\n)(?:[ \t]*\r?\n)+$/.exec(text.slice(...p[side]));
+    if (blank && blank.index > 0) p[side][1] = q[side][0] -= blank[0].length - blank[1].length;
+  }
+}
+
+// Refine the outer walk and each move's inner walk before assigning transport ownership.
+export function phrases(c) {
+  const {before, after, raw, code} = c;
+  // Whole-word replacements separated only by spaces read and restore as one phrase, and one number stays one number.
+  if (!raw) for (let i = c.result.length - 1; i > 0; i--) {
+    const p = c.result[i - 1], q = c.result[i], gap = before.slice(p[0][1], q[0][0]);
+    if (p[3][0] !== 1 || q[3][0] !== 1 || p[3][3] || q[3][3] || p[2] || q[2] || gap !== after.slice(p[1][1], q[1][0])) continue;
+    // A time, a date, a version or a decimal is one number.
+    const number = /^(?:[.,:/-]\d*)+$/.test(gap) && /\d/.test(before[p[0][1] - 1] + after[p[1][1] - 1]) && /\d/.test(before[q[0][0]] + after[q[1][0]]);
+    if (!number && (code || !/^[^\S\r\n]+$/.test(gap) || within(before, p[0][0]) || within(after, p[1][0]) ||
+      within(before, q[0][1]) || within(after, q[1][1]))) continue;
+    p[0][1] = q[0][1]; p[1][1] = q[1][1]; c.result.splice(i, 1);
+  }
+  // Paired inline markers added or removed around unchanged text on one line are one concern.
+  if (!raw && !code) for (let i = 1; i < c.result.length; i++) {
+    const p = c.result[i - 1], q = c.result[i], kind = p[3][0], side = kind ? 1 : 0, text = side ? after : before;
+    if (kind % 2 || kind !== q[3][0] || p[2] || q[2] || p[3][3] || q[3][3]) continue;
+    const open = text.slice(...p[side]), close = text.slice(...q[side]), inner = text.slice(p[side][1], q[side][0]);
+    if (!inner.trim() || inner.includes('\n') || !(open === close && /^(?:[*_]{1,3}|~~|==|`+)$/.test(open) ||
+      open === '[' && /^\]\([^\s()]*\)$/.test(close))) continue;
+    p[3] = q[3] = [kind, 'word', p[3][2], [[p[0][0], q[0][1]], [p[1][0], q[1][1]]]];
+  }
+}
+
+// Readable concerns: phrases, numbers and paired markers, then the public edits and changes with context.
+export function concerns(c) {
+  phrases(c);
+  const {before, after, spend, safe, budget, raw, code, evidence, structures, initial, options, pa, pb} = c, lb = c.lb;
+  const overlaps = (a, b) => a[0] < b[1] && a[1] > b[0];
+  // Siblings are ordered and disjoint: the parts holding a range are found by descent, outermost first.
+  const containing = (parts, from, to, out = []) => {
+    let lo = 0, hi = parts.length;
+    while (lo < hi) { const mid = lo + hi >>> 1; if (parts[mid].end < to) lo = mid + 1; else hi = mid; }
+    for (let k = lo; k < parts.length && parts[k].start <= from && spend(); k++)
+      if (parts[k].end >= to) { out.push(parts[k]); containing(parts[k].children, from, to, out); }
+    return out;
+  };
+  // Edits are ordered and disjoint on the after side.
+  const touched = (edits, range) => {
+    let lo = 0, hi = edits.length;
+    while (lo < hi) { const mid = lo + hi >>> 1; if (edits[mid].after[1] <= range[0]) lo = mid + 1; else hi = mid; }
+    return lo < edits.length && overlaps(range, edits[lo].after);
+  };
+  const changes = [], edits = [];
+  let normalized;
+  const meaning = structures?.[0]?.meaning;
+  const format = typeof meaning === 'string' && meaning === structures[1].meaning;
+  for (let i = 0; i < c.result.length; i++) {
+    const item = c.result[i];
+    if (raw === 'char' && !evidence) {
+      const a = item[0], b = item[1], next = c.result[i + 1];
+      if (item[3][0] !== 1) {
+        const room = Math.min((next?.[0][0] ?? before.length) - a[1], (next?.[1][0] ?? after.length) - b[1]);
+        let n = 0;
+        while (n < room && before[a[0] + n] === after[b[0] + n] && spend()) n++;
+        while (n && (!safe(before, a[0] + n) || !safe(before, a[1] + n) || !safe(after, b[0] + n) || !safe(after, b[1] + n))) n--;
+        a[0] += n; a[1] += n; b[0] += n; b[1] += n;
+      }
+      const p = normalized;
+      if (p && p[0][0] === p[0][1] && item[3][0] === 2 && p[0][0] === a[0] && p[1][1] === b[0]) {
+        p[1][1] = b[1]; if (item[2]) edits.at(-1).coarse = true; continue;
+      }
+      normalized = item;
+    }
+    const group = item[3];
+    if (!raw && !group[3]) group[3] = [[...item[0]], [...item[1]]];
+    if (!group[4]) {
+      const context = group[3];
+      // Context completes a word only where an edge falls inside it.
+      if (!raw) for (const [text, span] of [[before, context[0]], [after, context[1]]]) {
+        const start = within(text, span[0]), end = within(text, span[1]);
+        for (let c; start && letter(c = prev(text, span[0])) && spend() && safe(text, span[0] - c.length);) span[0] -= c.length;
+        for (let c; end && letter(c = next(text, span[1])) && spend() && safe(text, span[1] + c.length);) span[1] += c.length;
+      }
+      group[4] = []; changes.push(group);
+      if (format) group[0] = 5;
+    }
+    group[4].push(edits.length);
+    edits.push({before: item[0], after: item[1], ...(item[2] ? {coarse: true} : {})});
+  }
+  if (structures && !raw && budget.left >= 0) {
+    const oldNames = new Set(pa.filter(p => p.nameAt).map(p => p.name)), newNames = new Set(pb.filter(p => p.nameAt).map(p => p.name));
+    const linksTo = new Map();
+    if (spend(pa.length + pb.length + lb.length)) lb.forEach((link, k) => linksTo.set(link.to, [...linksTo.get(link.to) || [], k]));
+    for (const change of changes) {
+      if (change[0] === 5) continue;
+      if (budget.left < 0) break;
+      const range = change[3];
+      const older = containing(structures[0].parts, ...range[0]), newer = containing(structures[1].parts, ...range[1]);
+      const part = (change[0] === 0 ? older : newer).at(-1) || older.at(-1);
+      if (!change[2] && part?.name) { change[2] = part.name; change[1] = part.kind; }
+      const names = new Set([change[2], ...older.map(p => p.name), ...newer.map(p => p.name)]), breaks = [], affects = [];
+      for (const k of [...names].flatMap(name => linksTo.get(name) || []).sort((a, b) => a - b)) {
+        const {at, to} = lb[k];
+        if (!newNames.has(to)) { if (oldNames.has(to)) breaks.push({at, to}); continue; }
+        if (!spend() || touched(edits, at)) continue;
+        const p = containing(structures[1].parts, ...at).filter(p => /^(paragraph|call|item|task|cell|declaration)$/.test(p.kind)).at(-1);
+        affects.push(p && !touched(edits, [p.start, p.end]) ? [p.start, p.end] : at);
+      }
+      if (breaks.length) change[6] = breaks;
+      if (affects.length) change[5] = affects;
+    }
+  }
+  if (options._stats) Object.assign(options._stats, {work: Math.max(0, initial - Math.max(0, budget.left)), coarse: edits.some(c => c.coarse)});
+  // Concern tuples: kind, unit, name, context, edits, affects, breaks. Wording inside a move shares its context.
+  const moves = new Map(changes.map((change, i) => change[0] === 3 && [change[3], i + 1]).filter(Boolean));
+  return {edits, changes: changes.map(([kind, unit, name, context, owned, affects, breaks], i) => ({
+    id: i + 1, kind: ['delete', 'replace', 'insert', 'move', 'rename', 'format'][kind], unit, edits: owned,
+    ...(name ? {name} : {}), ...(context ? {context: {before: context[0], after: context[1]}} : {}),
+    ...(kind !== 3 && moves.has(context) ? {move: moves.get(context)} : {}),
+    ...(affects ? {affects} : {}), ...(breaks ? {breaks} : {})
+  }))};
+}

package/dist/packages/rapier-diff/diff.mjs

@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: MIT
+// One comparison: observe structure, walk the source into exact records, find moves and renames, then read them as
+// concerns. Each stage lives in its own module and shares one comparison context.
+import {observe} from './structure.mjs';
+import {boundaries, tokenizer, wordSegmenter} from './tokens.mjs';
+import {matcher} from './matching.mjs';
+import {walker} from './walk.mjs';
+import {moves} from './moves.mjs';
+import {separate, concerns} from './concerns.mjs';
+
+export function diff(before, after, options = {}) {
+  if (before === after) return {edits: [], changes: []};
+  const budget = options._budget || {left: Number.isFinite(options.limit) ? Math.max(0, options.limit) : 1e7};
+  const spend = (n = 1) => (budget.left -= n) >= 0, safe = boundaries(), raw = options._unit;
+  // Internal records: [before range, after range, coarse, concern, transported fragments].
+  const c = {before, after, options, budget, spend, safe, raw, chars: options.unit === 'char', initial: budget.left,
+    segmenter: wordSegmenter(), result: [], code: options.as === 'code'};
+  // A Markdown fence holds code inside prose; only code outside fences makes the text code.
+  if (options.as !== 'prose' && options.as !== 'code') c.code = /(?:^|\n)\s*(?:[{}]|(?:function|class|const|let|var|import|export|def|fn|func|package)\s+\w[^]{0,80}[({=:;])/
+    .test((before.slice(0, 4096) + '\n' + after.slice(0, 4096)).replace(/^ {0,3}(`{3,}|~{3,})[^]*?(?:^ {0,3}\1[`~]*[ \t]*$|(?![^]))/gm, ''));
+  let fallback;
+  if (options.structure && (!raw || options._structure)) {
+    let structures;
+    try {
+      structures = options._observed || [observe(before, options.structure, spend, safe), observe(after, options.structure, spend, safe)];
+      if (structures.some(value => !value || value.invalid)) throw null;
+      const [pa, pb] = structures.map(value => value.flat), aliases = new Map();
+      const oldByKey = new Map(pa.filter(p => p.key != null).map(p => [p.key, p]));
+      const oldNames = new Set(pa.map(p => p.name)), newNames = new Set(pb.map(p => p.name));
+      for (const p of pb) {
+        const old = oldByKey.get(p.key);
+        if (old?.nameAt && p.nameAt && old.kind === p.kind && !oldNames.has(p.name) && !newNames.has(old.name)) aliases.set(p, old);
+      }
+      Object.assign(c, {structures, pa, pb, la: structures[0].links, lb: structures[1].links, aliases});
+    } catch {
+      // A failed reader preserves an explicit prose choice and reports why structure was not used.
+      const failed = structures?.find(value => !value || value.invalid);
+      fallback = {structure: failed?.threw ? 'threw' : budget.left < 0 ? 'limit' : 'invalid', ...(failed?.threw ? {error: failed.error} : {})};
+      c.code = options.as !== 'prose';
+    }
+  }
+  c.tokens = tokenizer(c); c.matches = matcher(spend, budget);
+  const {walk, operations} = Object.assign(c, walker(c)), {structures, pa, pb} = c;
+  const evidence = c.evidence = options.from && operations(options.from);
+  if (options.from && !evidence) (fallback ||= {}).from = budget.left < 0 ? 'limit' : 'invalid';
+  if (evidence) for (const span of evidence) walk(...span, structures ? 0 : raw === 'char' ? 3 : 1, pa, pb);
+  else walk(0, before.length, 0, after.length, structures ? 0 : raw === 'word' ? 2 : 1,
+    structures?.[0]?.parts, structures?.[1]?.parts);
+  separate(c);
+  moves(c);
+  // A heading edit can re-record its children. Compare both walks after transport is known: unchanged moved
+  // fragments cost nothing, so a smaller plain walk cannot discard a move just by aligning some of its lines.
+  if (structures && !evidence && !raw && c.result.some(r => r[0][0] === r[0][1]) && c.result.some(r => r[1][0] === r[1][1]) &&
+    budget.left >= c.initial - budget.left) {
+    const size = (rows, transport = false) => rows.reduce((n, r) => n + (!transport && r[3][0] === 3 ? 0 : r[0][1] - r[0][0] + r[1][1] - r[1][0]), 0);
+    const walked = c.result, links = c.lb, cost = size(walked);
+    if (cost) {
+      c.result = []; c.lb = structures[1].links;
+      walk(0, before.length, 0, after.length, 1);
+      separate(c); moves(c);
+      const plain = size(c.result);
+      if (budget.left < 0 || c.result.some(r => r[2]) || plain > cost ||
+        plain === cost && size(c.result, true) >= size(walked, true)) { c.result = walked; c.lb = links; }
+    }
+  }
+  const {edits, changes} = concerns(c);
+  return {edits, ...(fallback && !raw ? {fallback} : {}), changes};
+}