rapier-markdown-kit 1.2.32 → 1.2.40

package/dist/kit/render-sanitize.mjs

@@ -49,6 +49,41 @@ const DIAGRAM_LABEL_CSS = new Set(('color fill stroke background-color font-fami
 	+ 'text-decoration-thickness text-underline-offset align-items align-content justify-content justify-items flex-direction flex-wrap '
 	+ 'width height min-width min-height max-width max-height margin margin-top margin-right margin-bottom margin-left '
 	+ 'padding padding-top padding-right padding-bottom padding-left').split(' '));
+const DOCUMENT_STYLE_PROPERTIES = new Set([...DIAGRAM_LABEL_CSS, ...('background display visibility opacity '
+	+ 'border border-top border-right border-bottom border-left border-color border-style border-width border-collapse border-spacing '
+	+ 'border-top-color border-right-color border-bottom-color border-left-color border-top-width border-right-width border-bottom-width border-left-width '
+	+ 'table-layout caption-side empty-cells list-style-type list-style-position direction unicode-bidi '
+	+ 'stroke-width stroke-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit '
+	+ 'fill-opacity fill-rule clip-rule clip-path filter stop-color stop-opacity text-anchor dominant-baseline alignment-baseline '
+	+ 'paint-order vector-effect shape-rendering color-interpolation color-interpolation-filters').split(' ')]);
+
+function cleanDocumentStyle(tag, value, context, classes = '') {
+	if (context === 'raw' && tag === 'span') return typography.style(typography.parseStyle(value));
+	const names = classes.split(/\s+/), diagram = tag === 'svg' && names.includes('pele') &&
+		(context === 'diagram' || ['render', 'export', 'source'].includes(context) && names.includes('rapier-diagram'));
+	const kept = [];
+	let start = 0, quote = '', depth = 0;
+	const take = end => {
+		const part = value.slice(start, end), colon = part.indexOf(':');
+		if (colon < 0) return;
+		const property = part.slice(0, colon).trim().toLowerCase(), body = part.slice(colon + 1).trim();
+		const diagramProperty = diagram && /^--(?:_[a-z0-9_-]+|pele-[a-z0-9-]+)$/.test(property);
+		if (!DOCUMENT_STYLE_PROPERTIES.has(property) && !/^--md-[a-z0-9-]+$/.test(property) && !diagramProperty && !(diagram && property === 'font')) return;
+		if (!body || /[\\\u0000-\u0008\u000b\u000e-\u001f{}@]|\/\*|\*\//.test(body)) return;
+		const withoutLocal = body.replace(/\burl\(\s*(['"]?)#[a-z0-9_.:-]+\1\s*\)/gi, '');
+		if (/(?:url|image|image-set|-webkit-image-set|element|paint|attr|expression)\s*\(/i.test(withoutLocal)) return;
+		kept.push(part.trim());
+	};
+	for (let at = 0; at <= value.length; at++) {
+		const ch = value[at];
+		if (quote) { if (ch === '\\') at++; else if (ch === quote) quote = ''; }
+		else if (ch === '"' || ch === "'") quote = ch;
+		else if (ch === '(') depth++;
+		else if (ch === ')') { if (--depth < 0) return ''; }
+		else if ((ch === ';' || at === value.length) && !depth) { take(at); start = at + 1; }
+	}
+	return quote || depth ? '' : kept.join(';');
+}
 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';
@@ -160,7 +195,8 @@ function createInertHtmlSanitizer({parseFragment, serialize, sanitizeHtml, safeR
 							if (!_rapierImageDataAttributeAllowed(tag, key, compact, safeRasterDataUrl)) continue;
 						} else if (!uri.test(compact)) continue;
 					}
-					attribs[name] = selected === 'raw' && tag === 'span' && key === 'style' ? typography.style(typography.parseStyle(value)) : value;
+					const cleaned = key === 'style' ? cleanDocumentStyle(tag, value, selected, input.class || '') : value;
+					if (key !== 'style' || cleaned) attribs[name] = cleaned;
 				}
 				if ((tag === 'a' || tag === 'area') && attribs.target?.trim().toLowerCase() === '_blank') attribs.rel = 'noopener noreferrer';
 				return {tagName, attribs};
@@ -254,6 +290,23 @@ function diagramLabelContained(node) {
 }
 
 function _rapierInstallSanitizeHooks() {
+	_rapierInstallDocumentSanitizeHooks();
+	DOMPurify.addHook('uponSanitizeElement', node => {
+		if (_rapierSanitizeRuntime.context !== 'paste' || !node || !/^(?:P|LI|H[1-6]|SPAN)$/.test(node.nodeName)) return;
+		node.removeAttribute('data-rapier-word-level');
+		node.removeAttribute('data-rapier-word-marker');
+		const style = node.getAttribute('style');
+		if (!style || !/mso-list/i.test(style)) return;
+		const spec = globalThis.RapierMarkdownSpec;
+		if (!spec) return;
+		const {wordListLevel, wordListIsMarker} = spec;
+		const level = /^(?:P|LI|H[1-6])$/.test(node.nodeName) ? wordListLevel(style) : 0;
+		if (level) node.setAttribute('data-rapier-word-level', String(level));
+		else if (node.nodeName === 'SPAN' && wordListIsMarker(style)) node.setAttribute('data-rapier-word-marker', '1');
+	});
+}
+
+function _rapierInstallDocumentSanitizeHooks() {
 	DOMPurify.addHook('uponSanitizeAttribute', (node, data) => {
 		if (!/^(?:src|href|xlink:href)$/i.test(data.attrName || '')) return;
 		const compact = String(data.attrValue || '').replace(/[\u0000-\u0020\u00a0]+/g, '');
@@ -269,7 +322,7 @@ function _rapierInstallSanitizeHooks() {
 		if (_rapierRemoteContent.allowed || !/^(?:paste|render|raw|export)$/.test(_rapierSanitizeRuntime.context)) return;
 		if (!node || node.nodeName !== 'IMG' || node.hasAttribute('data-rapier-remote-src')) return;
 		const src = node.getAttribute('src') || '';
-		if (!src || !_rapierRemoteSubresourceOrigin(src)) return;
+		if (!src || !_rapierRemoteSubresourceOrigin(src) || globalThis.RapierEmbedPictureBase?.vouched?.has(src)) return;
 		node._rapierHeldBack = true;
 		node.setAttribute('data-rapier-remote-src', src);
 		const alt = node.getAttribute('alt');
@@ -286,39 +339,22 @@ function _rapierInstallSanitizeHooks() {
 			node.setAttribute('data-rapier-remote-src', href);
 		}
 	});
-	DOMPurify.addHook('uponSanitizeElement', node => {
-		if (_rapierSanitizeRuntime.context !== 'paste' || !node || !/^(?:P|LI|H[1-6]|SPAN)$/.test(node.nodeName)) return;
-		node.removeAttribute('data-rapier-word-level');
-		node.removeAttribute('data-rapier-word-marker');
-		const style = node.getAttribute('style');
-		if (!style || !/mso-list/i.test(style)) return;
-		const spec = globalThis.RapierMarkdownSpec;
-		if (!spec) return;
-		const {wordListLevel, wordListIsMarker} = spec;
-		const level = /^(?:P|LI|H[1-6])$/.test(node.nodeName) ? wordListLevel(style) : 0;
-		if (level) node.setAttribute('data-rapier-word-level', String(level));
-		else if (node.nodeName === 'SPAN' && wordListIsMarker(style)) node.setAttribute('data-rapier-word-marker', '1');
-	});
 	DOMPurify.addHook('uponSanitizeAttribute', (node, data) => {
 		const value = String(data.attrValue == null ? '' : data.attrValue);
-		if (_rapierSanitizeRuntime.context === 'raw' && node?.nodeName === 'SPAN' && data.attrName?.toLowerCase() === 'style') {
-			data.attrValue = typography.style(typography.parseStyle(value));
+		if (data.attrName?.toLowerCase() === 'style') {
+			data.attrValue = cleanDocumentStyle(node?.localName?.toLowerCase(), value, _rapierSanitizeRuntime.context, node?.getAttribute('class') || '');
 			data.keepAttr = !!data.attrValue;
 			return;
 		}
 		if (String(data.attrName || '').toLowerCase() === 'id' && _rapierChromeOwnsId(value)) { data.keepAttr = false; return; }
 		if (_rapierRemoteContent.allowed || _rapierSanitizeRuntime.context === 'source') return;
-		if (String(data.attrName || '').toLowerCase() === 'style') {
-			const cleaned = _rapierStyleWithoutRemoteUrls(value);
-			if (cleaned !== value) data.attrValue = cleaned;
-			return;
-		}
 		const attribute = String(data.attrName || '').toLowerCase();
 		if (attribute === 'alt' || attribute === 'title') return;
 		if (/^data-rapier-remote-(?:src|alt|title)$/.test(attribute) && node && node._rapierHeldBack === true) { data.forceKeepAttr = true; return; }
 		if (attribute.startsWith('data-')) return;
 		const element = String(node && node.nodeName || '').toUpperCase();
 		if (attribute === 'href' && (element === 'A' || element === 'AREA')) return;
+		if (attribute === 'src' && element === 'IMG' && globalThis.RapierEmbedPictureBase?.vouched?.has(value)) return;
 		if (_rapierCssPresentationIsRemote(attribute, value) ||
 			value.split(/[\s,]+/).some(token => _rapierRemoteSubresourceOrigin(token))) {
 			data.keepAttr = false;
@@ -414,6 +450,13 @@ function _rapierLinkDestinationToConfirm(href, text = '') {
 }
 
 function _rapierSafeRasterDataUrl(value) {
+	if (/^data:image\/svg\+xml,/i.test(value)) {
+		try {
+			const assets = globalThis.RapierImageAssets;
+			return assets.dataImage(value)?.codec === 'image/svg+xml' &&
+				_rapierVerifyRasterBytes(assets.decodeDataImageBytes(value).bytes, 'image/svg+xml');
+		} catch (_) { return false; }
+	}
 	const match = RAPIER_RASTER_DATA_URL_RE.exec(value);
 	if (!match) return false;
 	try {
@@ -504,7 +547,7 @@ function _rapierVerifyRasterBytes(bytes, mime) {
 	return false;
 }
 
-  return {_rapierVerifyRasterBytes, _rapierInstallSanitizeHooks, sanitizeRapierHtml,
+  return {_rapierVerifyRasterBytes, _rapierInstallSanitizeHooks, _rapierInstallDocumentSanitizeHooks, sanitizeRapierHtml,
     sanitizeRapierFragment: typeof DOMPurify?.sanitize === 'function' ? sanitizeRapierFragment : undefined,
     diagramLabelStyle, escapeRapierHtmlText, _rapierChromeOwnsId, _rapierLinkDestinationToConfirm, _rapierSafeRasterDataUrl, _rapierCssPresentationIsRemote, _rapierRemoteSubresourceOrigin, _rapierStyleWithoutRemoteUrls, _rapierStylesheetWithoutRemoteUrls, _rapierDropRemoteRules};
 }

package/dist/kit/render.mjs

@@ -212,14 +212,14 @@ function _rapierTemplatePage(canonical, settings, root, darkPaper = false) {
 		const image = paragraph.querySelector('img');
 		const layout = globalThis.RapierMarkdownLayout.parseLayoutAttribute(paragraph.getAttribute('data-md-layout'));
 		const source = image?.getAttribute('src') || '';
-		if (isPageBorderLayout(layout) && /^data:image\/(?:png|jpeg|webp|gif|svg\+xml|jxl);base64,[A-Za-z0-9+/=]+$/i.test(source)) { url = source; paragraph.remove(); break; }
+		if (isPageBorderLayout(layout) && globalThis.RapierImageAssets.dataImage(source)) { url = source; paragraph.remove(); break; }
 	}
 	if (!url) return null;
 	const width = paper.width / 15, height = paper.height / 15;
 	const margins = ['top', 'right', 'bottom', 'left'].map(side => (settings?.geometry?.[side] ?? 1440) / 15);
 	const padding = margins.map(value => value + 'px').join(' ');
 	const ground = 'background:var(--rapier-template-border) 0 0/100% 100% no-repeat';
-	const shown = darkPaper && url.startsWith('data:image/svg+xml;base64,') ? _rapierDarkPaperSvgUrl(url, '#fafafa') : url;
+	const shown = darkPaper && globalThis.RapierImageAssets.dataImage(url)?.codec === 'image/svg+xml' ? _rapierDarkPaperSvgUrl(url, '#fafafa') : url;
 	const css = ':root{--rapier-template-border:url("' + url + '")}\n'
 		+ '@media screen{' + (shown !== url ? ':root{--rapier-template-border:url("' + shown + '")}' : '') + '.rapier-template-border{display:none}body{background:var(--md-color-inset)}.rapier-page{box-sizing:border-box;width:min(100%,' + width + 'px);min-height:' + height + 'px;margin:0 auto;padding:' + padding
 		+ ';background:var(--rapier-template-border) 0 0/100% ' + height + 'px repeat-y,var(--md-color-bg);color:var(--md-color-text)}}\n'
@@ -235,7 +235,7 @@ function _rapierDarkPaperSvgUrl(url, paperInk) {
 	const ink = globalThis.RapierImageInspection?.inkForPaper;
 	if (typeof ink !== 'function') return url;
 	let text;
-	try { text = new TextDecoder('utf-8', {fatal: true}).decode(Uint8Array.from(atob(url.slice(26)), c => c.charCodeAt(0))); }
+	try { text = new TextDecoder('utf-8', {fatal: true}).decode(globalThis.RapierImageAssets.decodeDataImageBytes(url).bytes); }
 	catch (_) { return url; }
 	const inked = ink(text, {dark: true, paperInk});
 	if (inked === text) return url;
@@ -274,7 +274,7 @@ function* _rapierProjectStyledRootSteps(semanticRoot, options) {
 	for (const token of root.querySelectorAll('.rapier-source-token--softbreak')) { yield;
 		if (token.getAttribute('data-rapier-source') !== '%0A') token.replaceWith(...token.childNodes);
 		else if (token.previousSibling?.classList?.contains('callout__label')) token.remove();
-		else token.replaceWith(root.ownerDocument.createTextNode(' '));
+		else token.replaceWith(root.ownerDocument.createTextNode(token.closest('pre') ? '\n' : ' '));
 	}
 	const metadata = opts.metadata || {};
 
@@ -532,10 +532,10 @@ function _rapierAnnotateExportBoxPolygons(root) {
 	for (const image of root.querySelectorAll('img[data-rapier-image-layout]')) {
 		const layout = globalThis.RapierMarkdownLayout.parseLayoutAttribute(image.getAttribute('data-rapier-image-layout'));
 		if (layout?.wrap !== 'box' && layout?.wrap !== 'around') continue;
-		const match = /^data:image\/svg\+xml;base64,([A-Za-z0-9+/]+=*)$/.exec(image.getAttribute('src') || '');
-		if (!match) continue;
+		const url = image.getAttribute('src') || '';
+		if (globalThis.RapierImageAssets.dataImage(url)?.codec !== 'image/svg+xml') continue;
 		let text;
-		try { text = new TextDecoder('utf-8', { fatal: true }).decode(Uint8Array.from(atob(match[1]), c => c.charCodeAt(0))); }
+		try { text = new TextDecoder('utf-8', { fatal: true }).decode(globalThis.RapierImageAssets.decodeDataImageBytes(url).bytes); }
 		catch (_) { continue; }
 		let recipe;
 		try { recipe = _rapierDrawReadSVGRecipe(text); } catch (_) { continue; }
@@ -634,7 +634,7 @@ 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|gif|svg\+xml|jxl);base64,[A-Za-z0-9+/]+={0,2}$/i.test(found)) { broken = true; return null; }
+		if (!globalThis.RapierImageAssets.dataImage(found)) { broken = true; return null; }
 		return found;
 	};
 	const inline = new RegExp('(\\]\\([ \\t\\r\\n]*(?:<)?)#' + id + '(?=>?[ \\t\\r\\n]*\\)|>?[ \\t\\r\\n]+["\'(])', 'g');
@@ -896,7 +896,7 @@ async function _rapierRequireOfflinePageImages(root) {
 	}
 	if (!missing.length) return;
 	throw Object.assign(new Error('Web page not written; embed these pictures and try again. ' + missing.join('; ')),
-		{code: 'offline_image_unavailable'});
+		{code: 'offline_image_unavailable', missing});
 }
 
 function _rapierCssValueUrls(value) {
@@ -1741,7 +1741,7 @@ function _rapierArtifactLayoutScript(root, nonce = '', {pictures = true} = {}) {
     throw new Error('Offline typography requires the complete retained MIT layout factories');
   const modules = _rapierArtifactFactoryModules(dependencies, 'layout');
   const script = '/* Rapier export layout: SPDX-License-Identifier: MIT */\n' +
-    '/* Pretext bac1774c0f8b7a92e44b9da43b6d5443d55d0d9b (Unreleased)\n' + dependencies.license + '\n*/\n' +
+    '/* Pretext 1.0.0 + main 0d102a5cd933611e86a7e60bda7b4baa5995c6b0\n' + dependencies.license + '\n*/\n' +
     '(() => {\nconst modules = Object.create(null);\n' + modules +
     (wrapping ? '\n(' + _rapierProjectArtifactLayout.toString() +
     ')(document.querySelector("main.rapier-page"), modules["spec/md-layout.mjs"], modules["layout/model.mjs"], modules["layout/preparation.mjs"]);\n' : '') +

package/dist/kit/wiki.mjs

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+export const WIKI_PREFIX = '?rapier-wiki=';
+export function wikiAddress(target) {
+  const at = target.indexOf('#'), path = at < 0 ? target : target.slice(0, at);
+  return WIKI_PREFIX + encodeURIComponent(path) + (at < 0 ? '' : '#' + encodeURIComponent(target.slice(at + 1)));
+}
+export function wikiTarget(address) {
+  if (typeof address !== 'string' || !address.startsWith(WIKI_PREFIX)) return null;
+  try { return decodeURIComponent(address.slice(WIKI_PREFIX.length).split('#')[0]); }
+  catch { return null; }
+}
+export function installWikiParser(md, render) {
+  md.inline.ruler.before('image', 'rapier_wiki', (state, silent) => {
+    if (!state.env?.rapierWikiLinks) return false;
+    const start = state.pos, embed = state.src[start] === '!';
+    const open = start + (embed ? 1 : 0);
+    if (state.linkLevel || state.src.slice(open, open + 2) !== '[[') return false;
+    const end = state.src.indexOf(']]', open + 2);
+    if (end < 0 || end + 2 > state.posMax || end - start > 4096) return false;
+    const body = state.src.slice(open + 2, end);
+    if (!body || /[\[\]\n\r\0]/.test(body)) return false;
+    const pipe = body.indexOf('|'), target = (pipe < 0 ? body : body.slice(0, pipe)).trim();
+    if (!target || /^(?:[a-z][a-z0-9+.-]*:|\/|\\)/i.test(target)) return false;
+    if (!silent) {
+      const token = state.push('rapier_wiki', '', 0);
+      token.content = state.src.slice(start, end + 2);
+      token.meta = {target, label: pipe < 0 ? target : body.slice(pipe + 1), embed};
+    }
+    state.pos = end + 2;
+    return true;
+  });
+  md.renderer.rules.rapier_wiki = (tokens, at, options, env) => render(tokens[at], env);
+}
+

package/dist/kit/will.d.mts

@@ -40,3 +40,6 @@ export function willMarkerOf(line: string): WillMarker | null;
 export function terminatorWidth(last: number, prior: number): number;
 /** The text without one trailing line terminator. */
 export function stripOneTerminator(text: string): string;
+/** Judges sequential UTF-16 source splices, including the resulting marker identities and protected text. */
+export function evaluateWill(beforeText: string, splices: {pos: number; removed: string; inserted: string}[]):
+  {outcome: 'applied'} | {outcome: 'invalid' | 'refused'; reason: string; rule: string; law?: WillLaw; region?: number};

package/dist/layout/hyphenation.mjs

@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: MIT
 import {next, weight, exceptions, maximum} from '../agent/vendor/hyphen-en-us/patterns.js';
 
+export const hyphenMinimums = {left: 2, right: 3, word: 5};
+
 export function englishCuts(word) {
   if (!/^[A-Za-z]+$/.test(word)) return null;
-  if (word.length < 6) return [];
+  if (word.length < hyphenMinimums.word) return [];
   const cuts = [];
   let offset = 0, before = 0;
   for (const part of word.match(/[A-Z]+(?![a-z])|[A-Z]?[a-z]+/g)) {
@@ -11,11 +13,11 @@ export function englishCuts(word) {
     for (const at of partCuts(part)) cuts.push(offset+at);
     offset += part.length; before = part.length;
   }
-  return cuts.filter(at => at >= 3 && at <= word.length-3).sort((a, b) => a-b).filter((at, index, all) => at !== all[index-1]);
+  return cuts.filter(at => at >= hyphenMinimums.left && at <= word.length-hyphenMinimums.right).sort((a, b) => a-b).filter((at, index, all) => at !== all[index-1]);
 }
 
 function partCuts(word) {
-  if (word.length < 6) return [];
+  if (word.length < hyphenMinimums.word) return [];
   const lower = word.toLowerCase(), known = exceptions[lower];
   if (Array.isArray(known)) return known;
   const source = '.'+lower+'.', weights = new Uint8Array(source.length+1);
@@ -30,7 +32,7 @@ function partCuts(word) {
     }
   }
   const cuts = [];
-  for (let at = 3; at <= word.length-3; at++) if (weights[at+1]&1) cuts.push(at);
+  for (let at = hyphenMinimums.left; at <= word.length-hyphenMinimums.right; at++) if (weights[at+1]&1) cuts.push(at);
   return cuts;
 }
 

package/dist/layout/line-plan.mjs

@@ -55,9 +55,105 @@ function laterWholeWord(flow, cursor, line, items, bands, slot, next, materializ
   return false;
 }
 
+export function slotSequence(width, top, obstacles, lineHeight, minWidth, slotsForBand, direction = 'ltr', order = 'columns') {
+  const bottom = obstacles.length ? Math.max(...obstacles.map(item => item.y + item.height)) - top : 0, rows = [];
+  let y = 0;
+  while (y < bottom && rows.length < 768) {
+    const bands = slotsForBand(width, obstacles, top + y, lineHeight, Math.min(minWidth, width));
+    if (!bands) return null;
+    if (bands.length) { rows.push({y, bands}); y += lineHeight; continue; }
+    let next = Infinity;
+    for (const obstacle of obstacles) if (obstacle.x < width && obstacle.x + obstacle.width > 0 &&
+        obstacle.y < top + y + lineHeight && obstacle.y + obstacle.height > top + y) next = Math.min(next, obstacle.y + obstacle.height - top);
+    if (!Number.isFinite(next) || next <= y) return null;
+    y = next;
+  }
+  const multiple = rows.some(row => row.bands.length > 1);
+  if (!multiple) return {slots: rows.flatMap(row => row.bands.map(band => ({...band, y: row.y}))), end: y, multiple};
+  const free = row => row.bands.length === 1 && row.bands[0].x < .5 && row.bands[0].width > width - .5;
+  const slots = [];
+  let block = 0;
+  for (let at = 0; at < rows.length;) {
+    if (free(rows[at])) { slots.push({...rows[at].bands[0], y: rows[at].y}); at++; continue; }
+    let stop = at;
+    while (stop < rows.length && !free(rows[stop])) stop++;
+    block++;
+    const channels = [];
+    for (let index = at; index < stop; index++) for (const band of rows[index].bands) {
+      const owner = channels.find(channel => channel.row === index - 1 &&
+        Math.min(channel.last.x + channel.last.width, band.x + band.width) - Math.max(channel.last.x, band.x) > 0);
+      const slot = {...band, y: rows[index].y};
+      if (owner) { owner.slots.push(slot); owner.row = index; owner.last = slot; }
+      else channels.push({slots: [slot], row: index, last: slot, x: band.x});
+    }
+    channels.sort((a, b) => direction === 'rtl' ? b.x - a.x : a.x - b.x);
+    const gaps = rows.slice(at, stop).filter(row => row.bands.length > 1).map(row => row.bands[1].x - row.bands[0].x - row.bands[0].width).sort((a, b) => a - b);
+    const thin = gaps[gaps.length >> 1] < .15 * width;
+    if (!thin) channels.forEach((channel, index) => { for (const slot of channel.slots) { slot.block = block; slot.channel = index; } });
+    if (order === 'rows' || thin) slots.push(...channels.flatMap(channel => channel.slots).sort((a, b) => a.y - b.y || (direction === 'rtl' ? b.x - a.x : a.x - b.x)));
+    else for (const channel of channels) slots.push(...channel.slots);
+    at = stop;
+  }
+  return {slots, end: y, multiple};
+}
+
+function channelPlan(flow, width, lineHeight, sequence, layoutNextRichInlineLineRange, materializeRichInlineLineRange, items) {
+  const lines = [], slots = sequence.slots;
+  let cursor, previous = null;
+  const place = (band, later) => {
+    let range = layoutNextRichInlineLineRange(flow, band.width, cursor);
+    if (!range) return 'end';
+    if (!Number.isFinite(range.width) || range.width > width + .5) return 'fail';
+    if (range.width > band.width + .5) return 'skip';
+    let line = materializeRichInlineLineRange(flow, range);
+    if (!afterSource(lastSource(line), previous)) return 'fail';
+    if (laterWholeWord(flow, cursor, line, items, [band, ...later], 0, layoutNextRichInlineLineRange, materializeRichInlineLineRange)) return 'skip';
+    if (later.some(other => other.y === band.y) && insideChip(items, line)) {
+      const whole = beforeChip(flow, range, line, cursor, items, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
+      if (whole) { range = whole.range; line = whole.line; }
+    }
+    if (!afterSource(lastSource(line), previous) || lines.length === 4096) return 'fail';
+    lines.push({...line, ...band});
+    previous = lastSource(line); cursor = range.end;
+    return 'placed';
+  };
+  const done = () => lines.length ? {lines, height: Math.max(lineHeight, ...lines.map(line => line.y + lineHeight))} : null;
+  for (let index = 0; index < slots.length; index++) {
+    const result = place(slots[index], [...slots.slice(index + 1, index + 9), {x: 0, width, y: sequence.end}]);
+    if (result === 'end') return done();
+    if (result === 'fail') return null;
+  }
+  for (let row = 0; row < 768; row++) {
+    const result = place({x: 0, width, y: sequence.end + row * lineHeight}, []);
+    if (result === 'end') return done();
+    if (result !== 'placed') return null;
+  }
+  return null;
+}
+
+export function columnsFilled(slots, placed) {
+  const total = new Map(), used = new Map(), reached = new Set();
+  for (const slot of slots) if (slot.block) total.set(slot.block + ':' + slot.channel, (total.get(slot.block + ':' + slot.channel) || 0) + 1);
+  for (const slot of placed) if (slot.block) { used.set(slot.block + ':' + slot.channel, (used.get(slot.block + ':' + slot.channel) || 0) + 1); reached.add(slot.block); }
+  for (const count of total.values()) if (count < 4) return false;
+  for (const block of reached) {
+    let last = -1;
+    for (const slot of slots) if (slot.block === block && slot.channel > last) last = slot.channel;
+    if ((used.get(block + ':' + last) || 0) < .6 * total.get(block + ':' + last)) return false;
+  }
+  return true;
+}
+
 export function linePlan(flow, width, top, obstacles, lineHeight, minWidth, direction, balance,
   slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange, items = null) {
   if (!flow || balance) return null;
+  const sequence = obstacles.length ? slotSequence(width, top, obstacles, lineHeight, minWidth, slotsForBand, direction) : null;
+  if (sequence?.multiple) {
+    const columns = channelPlan(flow, width, lineHeight, sequence, layoutNextRichInlineLineRange, materializeRichInlineLineRange, items);
+    if (!columns || columnsFilled(sequence.slots, columns.lines)) return columns;
+    return channelPlan(flow, width, lineHeight, slotSequence(width, top, obstacles, lineHeight, minWidth, slotsForBand, direction, 'rows'),
+      layoutNextRichInlineLineRange, materializeRichInlineLineRange, items);
+  }
   const lines = [];
   let cursor, previous = null, y = 0, bottom = 0, rows = 0;
   for (let step = 0; step < 4096 && rows < 768; step++) {

package/dist/layout/model.mjs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 import {layoutNextRichInlineLineRange, materializeRichInlineLineRange} from '../agent/vendor/pretext/rich-inline.js';
 import {validLayout} from '../spec/md-layout.mjs';
-import {linePlan} from './line-plan.mjs';
+import {linePlan, slotSequence, columnsFilled} from './line-plan.mjs';
 import {captureFontAuthority, createPreparationScope, fontReady, invalidateRichMetrics, paragraphItems,
   prepareRichParagraph, supportsRichStyle} from './preparation.mjs';
 export {captureFontAuthority, createPreparationScope, invalidateRichMetrics, prepareRichParagraph, supportsRichStyle};
@@ -309,6 +309,7 @@ export function pictureSlices(profile, x, y, width, height, scale = 1) {
   return slices;
 }
 
+export {slotSequence, columnsFilled};
 export function slotsForBand(width, obstacles, top, height, minWidth = 40) {
   if (!finite(width) || width <= 0 || !finite(top) || !finite(height) || height <= 0 ||
       !finite(top + height) || !finite(minWidth) || minWidth <= 0 || !Array.isArray(obstacles)) return null;

package/dist/layout/paragraph-fit.mjs

@@ -22,7 +22,7 @@ export function createParagraphFitter() {
     return handle;
   }
 
-  function* solveSteps(handle, width, {indent = 0, left = 0, right = 0, widths = null, shrink = .4, stretch = .8} = {}, known) {
+  function* solveSteps(handle, width, {indent = 0, left = 0, right = 0, widths = null, shrink = .5, stretch = 1.2, hyphenCost = 8} = {}, known) {
     const prepared = indexes.get(handle);
     if (!prepared || ![width, indent, left, right].every(Number.isFinite) || width <= 0) return null;
     const measures = Array.isArray(widths) && widths.every(value => Number.isFinite(value) && value > 0) ? widths : [];
@@ -102,7 +102,7 @@ export function createParagraphFitter() {
           if (!Number.isFinite(natural)) continue;
           const count = lastWord - start.word, gapWidth = gaps[lastWord] - gaps[start.word];
           const opening = start.cut ? 0 : Math.min(Math.max(0, left), words[start.word].opening);
-          const closing = end.cut ? 0 : Math.min(Math.max(0, right), words[lastWord].closing);
+          const closing = end.cut ? Math.min(Math.max(0, right), end.cut.protrude || 0) : Math.min(Math.max(0, right), words[lastWord].closing);
           const priorDiscretionary = start.kind === 'soft' || start.kind === 'auto';
           if (final && priorDiscretionary) continue;
           for (let lineClass = 0; lineClass < classes; lineClass++) {
@@ -120,7 +120,7 @@ export function createParagraphFitter() {
             let local = 1 + 100 * Math.max(0, overflow / target) ** 2;
             if (final && startIndex) local += 100 * Math.max(0, .45 - natural / target) ** 2 + (count === 0 ? 25 : 0);
             else if (!final) local += (ratio < 0 ? 100 : 12.5) * ratio ** 2 + 2400 * (residual / target) ** 2;
-            if (discretionary) local += 12 + (priorDiscretionary ? 12 : 0);
+            if (discretionary) local += hyphenCost + (priorDiscretionary ? hyphenCost : 0);
             const set = !final && count && residual > 0 ? remaining / count : delta;
             const nextClass = Math.min(lineClass + 1, classes - 1);
             for (let active = available; active; active &= active - 1) {
@@ -153,7 +153,7 @@ export function createParagraphFitter() {
         const start = points[startIndex], end = points[endIndex], lastWord = end.cut ? end.word : end.word - 1;
         chosen.push({start: start.next, end: end.end, next: end.next, kind: end.kind, glyph: end.cut?.glyph || '',
           wordSpacing: spacing[best], opening: start.cut ? 0 : Math.min(Math.max(0, left), words[start.word].opening),
-          closing: end.cut ? 0 : Math.min(Math.max(0, right), words[lastWord].closing),
+          closing: end.cut ? Math.min(Math.max(0, right), end.cut.protrude || 0) : Math.min(Math.max(0, right), words[lastWord].closing),
           firstWord: start.word, lastWord, segment: segmentIndex});
         best = priorIndex; endIndex = startIndex;
       }

package/dist/layout/prepared-paragraph.mjs

@@ -2,9 +2,25 @@
 import {paragraphHyphens} from './hyphenation.mjs';
 import {prepareRichInlineSegments} from '../agent/vendor/pretext/rich-inline.js';
 import {getEngineProfile, getPreparationLanguage, getFontMeasurement, parseFontSize,
-  getTextWidth, getEmojiCorrection, textMayContainEmoji, measureWithLetterSpacing} from '../agent/vendor/pretext/measurement.js';
+  getTextWidth, getEmojiCorrection, textMayContainEmoji, getSegmentMetrics, getContext} from '../agent/vendor/pretext/measurement.js';
 import {KIND_BITS, TEXT, SPACE, SOFT_HYPHEN, ZERO_WIDTH_BREAK, ZERO_WIDTH_GLUE, OBJECT, SPACED, UNBROKEN} from '../agent/vendor/pretext/analysis.js';
 
+function measureWithLetterSpacing(text, letterSpacing, emojiCorrection, measurement) {
+  if (!measurement.state.takesLetterSpacing) return null;
+  const base = getTextWidth(text, measurement, emojiCorrection);
+  if (letterSpacing === 0) return base;
+  const corrected = getSegmentMetrics(text, measurement).width - base;
+  const context = getContext(measurement), previous = context.letterSpacing;
+  try {
+    context.letterSpacing = `${letterSpacing}px`;
+    if (Number.parseFloat(context.letterSpacing) !== letterSpacing) return null;
+    const width = context.measureText(text).width - corrected;
+    return Number.isFinite(width) ? width : null;
+  } finally {
+    context.letterSpacing = previous;
+  }
+}
+
 const opening = /^[\p{Ps}\p{Pi}\p{Pf}"']+/u;
 const closing = /[\p{Pe}\p{Pi}\p{Pf}"'.,;:!?]+$/u;
 const empty = values => values == null || !values.some(value => value !== null && value !== 0);
@@ -141,7 +157,7 @@ export function* prepareParagraphCandidateSteps(items, options) {
       if (joined) {
         for (let at = word.first; at <= word.last; at++) {
           const unit = units[at];
-          if (unit.kind !== TEXT || /^\p{M}+$/u.test(text.slice(unit.start, unit.end))) continue;
+          if (unit.kind !== TEXT) continue;
           const delta = unit.width - measure(unit.start, unit.end);
           if (delta !== 0) contexts.push(Object.freeze({start: unit.start, end: unit.end, delta}));
           if (++measuredEdges % 8 === 0) yield;
@@ -152,6 +168,7 @@ export function* prepareParagraphCandidateSteps(items, options) {
       for (const cut of word.breaks) {
         if (cut.kind === 'soft' || cut.kind === 'auto') {
           cut.glyph = '-';
+          if (options.hanging && !word.protected) cut.protrude = parseFontSize(items[units[word.first].itemIndex].font) * .25;
         }
         let before = cut.at, after = cut.at + 1;
         if (cut.kind === 'auto') {