rapier-markdown-kit 1.2.33 → 1.2.42

package/dist/kit/render-markdown.mjs

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 import {htmlPlaceholder, mountHtmlBlocks, materializeObjects, objectPosterLabel, htmlImageRecord, htmlLayoutEdit, htmlModeEdit, mergeHtmlObjectBlocks} from '../spec/html-blocks.mjs';
 import {finish, finishAsync, cloneTree, cleanTree, serializeTree, htmlParts, admitHtml, htmlBoundary, pause, check} from './render-work.mjs';
+import {installWikiParser, wikiAddress} from './wiki.mjs';
 const RAPIER_TABLE_CAPTION_PREFIX_RE = /^(?:Table:|:) /;
 const RAPIER_PORTABLE_HIGHLIGHT_HEX = Object.freeze({
 	green: '#35c57a', red: '#f05a62', blue: '#4f91f7', yellow: '#e6b91e', purple: '#9b6dea',
@@ -9,6 +10,51 @@ const _RAPIER_RTL_SCRIPT = /[\p{Script=Hebrew}\p{Script=Arabic}\p{Script=Syriac}
 function createMarkdownRenderer(runtime) {
   const {Node, _rapierPrefixPortableAnchors, RAPIER_HIGHLIGHT_COLOR_BY_MARKER, RAPIER_MARKDOWN_SPEC, RAPIER_RENDERED_HEADING_SELECTOR, _rapierApplyMarkdownSpec, _rapierChromeOwnsId, _rapierCodeHtml, _rapierDeriveDarkColor, _rapierDormantHeadings, _rapierEmbedAssetSource, _rapierHeadingSlugBase, _rapierNextHeadingSlug, _rapierHighlightAdmitted, _rapierInstallMarkdownMath, _rapierMarkdownPreview, _rapierPlainLayout, _rapierProviders, _rapierRemoteContent, _rapierRemoteImagePlaceholder, _rapierRemoteSubresourceOrigin, _rapierRenderedAnchorOriginalIds, _rapierSourceCharEscaped, _rapierSplitOpeningFrontmatter, _rapierUiDiagram, _rapierUiMath, document, escapeRapierHtmlText, globalThis, sanitizeRapierHtml, window} = runtime;
   let md = runtime.md;
+  let wikiTimer = null, wikiAttempt = 0;
+  const wikiBusy = new WeakSet();
+  function scheduleWikiEmbeds() {
+    if (!globalThis.RapierPlatform || !document || wikiTimer !== null) return;
+    wikiTimer = setTimeout(async () => {
+      wikiTimer = null;
+      const original = globalThis.RapierOriginalFolderCore?.currentOriginal();
+      if (!original) { if (++wikiAttempt < 8) scheduleWikiEmbeds(); return; }
+      wikiAttempt = 0;
+      for (const node of [...document.querySelectorAll('#editor-blocks .rapier-source-token--wiki-embed')].slice(0, 32)) {
+        if (wikiBusy.has(node) || node.hasAttribute('data-rapier-wiki-ready')) continue;
+        wikiBusy.add(node);
+        try {
+          const link = node.querySelector('a'), href = link?.getAttribute('href');
+          if (!href) continue;
+          const before = node.innerHTML;
+          const embedded = await original.embed(href);
+          if (!node.isConnected || node.innerHTML !== before || globalThis.RapierOriginalFolderCore?.currentOriginal() !== original) continue;
+          const holder = _rapierRenderSemanticRoot(embedded.text, {docKind: 'markdown'}, {wikiEmbedding: true});
+          let followed = 0;
+          for (const anchor of holder.querySelectorAll('a[href]')) {
+            const address = anchor.getAttribute('href');
+            if (/^(?:[a-z][a-z0-9+.-]*:|\/)/i.test(address)) continue;
+            try {
+              if (++followed > 64) throw new Error('link limit');
+              anchor.setAttribute('href', await original.addressFrom(embedded.displayPath, address));
+            } catch (_) { anchor.replaceWith(...anchor.childNodes); }
+          }
+          if (!node.isConnected || node.innerHTML !== before || globalThis.RapierOriginalFolderCore?.currentOriginal() !== original) continue;
+          for (const image of holder.querySelectorAll('img,[data-rapier-remote-src]'))
+            image.replaceWith(document.createTextNode(image.getAttribute('alt') || image.textContent || ''));
+          for (const block of [...holder.querySelectorAll('p,h1,h2,h3,h4,h5,h6,div,pre,blockquote,ul,ol,li,table,tr,td,th')].reverse())
+            block.replaceWith(...block.childNodes, document.createElement('br'));
+          node.replaceChildren(...holder.childNodes);
+          node.setAttribute('data-rapier-visible', encodeURIComponent(node.textContent));
+          node.setAttribute('data-rapier-wiki-ready', '');
+          node.contentEditable = 'false';
+        } catch (_) {  }
+        finally { wikiBusy.delete(node); }
+      }
+    }, 125);
+  }
+  window?.addEventListener?.('rapier:original-file-ready', scheduleWikiEmbeds);
+  const wikiMode = options => options.wikiEmbedding ? 'links' : options.wikiLinks !== undefined ? options.wikiLinks
+    : globalThis.RapierOriginalFolderCore?.currentOriginal?.() ? 'label' : false;
 function initMarkdownIt() {
 	if (typeof window.markdownit !== 'function') throw new Error('markdownit');
 	if (typeof _rapierMarkdownPreview === 'function') globalThis.rapierRenderPreview = _rapierMarkdownPreview;
@@ -82,6 +128,21 @@ function initMarkdownIt() {
 	const sourceToken = (source, visible, className) =>
 		'<span class="rapier-source-token ' + className + '" data-rapier-source="' +
 		encodeURIComponent(source) + '" data-rapier-visible="' + encodeURIComponent(visible) + '">' + md.utils.escapeHtml(visible) + '</span>';
+	installWikiParser(md, (token, env) => {
+		const {target, label, embed} = token.meta, href = wikiAddress(target), esc = md.utils.escapeHtml;
+		if (env.rapierWikiLinks === 'label') return esc(label);
+		if (embed && /\.(?:png|jpe?g|gif|webp|jxl)(?:#.*)?$/i.test(target)) {
+			if (!env.rapierWikiEmbedding && globalThis.RapierPlatform?.files.relativeCandidate?.(href) && globalThis.RapierEmbeddedImages?.imageHtml)
+				return globalThis.RapierEmbeddedImages.imageHtml(null, label, '', null, '', label, token.content, href, env.rapierImagePresentation !== false);
+			return '<span data-rapier-remote-src="' + esc(href) + '" data-rapier-remote-alt="' + esc(label) +
+				'" data-rapier-image-source="' + esc(encodeURIComponent(token.content)) + '">' + esc(label) + '</span>';
+		}
+		const note = embed && !env.rapierWikiEmbedding;
+		if (note) scheduleWikiEmbeds();
+		return '<span class="rapier-source-token rapier-source-token--wiki' + (note ? '-embed' : '') +
+			'" data-rapier-source="' + esc(encodeURIComponent(token.content)) + '" data-rapier-visible="' + esc(encodeURIComponent(label)) +
+			'"><a href="' + esc(href) + '">' + esc(label) + '</a></span>';
+	});
 	md.renderer.rules.emoji = (tokens, idx) => {
 		const token = tokens[idx];
 		const source = token.markup ? ':' + token.markup + ':' : token.content;
@@ -114,7 +175,9 @@ function initMarkdownIt() {
 
 	md.renderer.rules.image = (tokens, idx, opts, env, self) => {
 		const token = tokens[idx];
-		const src = token.attrGet('src') || '';
+		const written = token.attrGet('src') || '';
+		const hosted = globalThis.RapierEmbedPictureBase?.(written) ?? null;
+		const src = hosted || written;
 		const title = token.attrGet('title') || '';
 		const rawAlt = String(token.content ?? token.attrGet('alt') ?? '');
 		const size = _rapierImageAltSize(rawAlt);
@@ -140,7 +203,7 @@ function initMarkdownIt() {
 				+ (token.meta?.mdImage?.source ? ' data-rapier-image-source="' + escape(encodeURIComponent(token.meta.mdImage.source)) + '"' : '')
 				+ '>' + escape(alt || src) + '</span>';
 		}
-		if (!env.rapierPage && !_rapierRemoteContent.allowed && _rapierRemoteSubresourceOrigin(src)) {
+		if (!hosted && !env.rapierPage && !_rapierRemoteContent.allowed && _rapierRemoteSubresourceOrigin(src)) {
 			const html = _rapierRemoteImagePlaceholder(src, alt, title, size, layout, rawAlt);
 			return html.replace('<span ', '<span data-rapier-markdown-image="" ' +
 				(token.meta?.mdImage?.source ? 'data-rapier-image-source="' + md.utils.escapeHtml(encodeURIComponent(token.meta.mdImage.source)) + '" ' : ''));
@@ -277,6 +340,7 @@ function initMarkdownIt() {
 	};
 
 	const _fenceDefault = md.renderer.rules.fence;
+	let _mathPromptedOnce = false;
 	{
 		let _diagramPromptedOnce = false;
 		md.renderer.rules.fence = function (tokens, idx, opts, env, self) {
@@ -303,8 +367,16 @@ 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 && !provider?.request?.() && env.rapierProviders !== false && !_diagramPromptedOnce) {
+			const diagramReady = native || !!(provider && provider.status === 'ready' && typeof provider.renderToString === 'function');
+			const mathProvider = env.rapierProviders === false ? null : _rapierProviders.math;
+			const mathNeeded = provider?.requiresMath?.(src) === true;
+			const mathReady = !mathNeeded || mathProvider?.status === 'ready';
+			if (!mathReady && !mathProvider?.request?.() && env.rapierProviders !== false && !_mathPromptedOnce) {
+				_mathPromptedOnce = true;
+				try { _rapierUiMath.request(); } catch (_) {}
+			}
+			const ready = diagramReady && mathReady;
+			if (!diagramReady && !provider?.request?.() && env.rapierProviders !== false && !_diagramPromptedOnce) {
 				_diagramPromptedOnce = true;
 				try { _rapierUiDiagram.request(); } catch (_) {}
 			}
@@ -338,7 +410,6 @@ function initMarkdownIt() {
 	preserveEmphasisMarkup('strong_open', 'data-rapier-strong');
 
 	{
-		let _mathPromptedOnce = false;
 		const _renderMath = (src, displayMode, env, authored) => {
 			const marker = displayMode ? '$$' : '$';
 			const source = authored || marker + src + marker, literal = md.utils.escapeHtml(source);
@@ -381,6 +452,10 @@ function initMarkdownIt() {
 	}
 	globalThis.RapierMarkdownLayout.installMarkdownLayout(md);
 	globalThis.RapierImageAssets.configureParser(md, _rapierSplitOpeningFrontmatter);
+	const render = md.renderer.render;
+	md.renderer.render = function (tokens, options, env) {
+		return render.call(this, _rapierCloseOpenDetails(tokens), options, env);
+	};
 }
 
 function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
@@ -402,8 +477,21 @@ function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
 
 	const markdown = _rapierSplitOpeningFrontmatter(canonical).body;
 	const env = {rapierImagePresentation: options.imagePresentation === true, ...(options.page ? {rapierPage: true} : {}), ...(options.providers === false ? {rapierProviders: false} : {})};
+	if (options.wikiEmbedding) env.rapierWikiEmbedding = true;
+	const wikiLinks = wikiMode(options);
+	if (wikiLinks) env.rapierWikiLinks = wikiLinks;
 	if (options.mathEquations) env.rapierMathEquations = options.mathEquations;
-	let rendered = md
+	const nesting = md && options.maxNesting > 0 ? options.maxNesting : 0;
+	let cutAt = -1, rendered;
+	if (nesting || md && options.closeDetails) {
+		const saved = md.options.maxNesting;
+		if (nesting) md.options.maxNesting = nesting;
+		try {
+			const tokens = md.parse(markdown, env);
+			if (nesting) cutAt = _rapierNestingCutAt(tokens, nesting);
+			rendered = md.renderer.render(options.closeDetails ? _rapierCloseOpenDetails(tokens) : tokens, md.options, env);
+		} finally { md.options.maxNesting = saved; }
+	} else rendered = md
 		? md.render(markdown, env)
 		: '<pre><code>' + escapeRapierHtmlText(markdown) + '</code></pre>';
 	if (md && env.footnotes && Array.isArray(env.footnotes.list) && env.footnotes.list.length) {
@@ -412,6 +500,7 @@ function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
 		rendered = _relabelFootnoteHtml(rendered, labels);
 	}
 	root.innerHTML = sanitizeRapierHtml(rendered, options.page ? 'source' : 'export');
+	if (cutAt >= 0) _rapierAppendNestingCut(root, markdown, cutAt);
 	_rapierApplyBlockDirection(root);
 
 	_rapierAssignHeadingSlugs(root, RAPIER_RENDERED_HEADING_SELECTOR, false);
@@ -425,6 +514,15 @@ function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
 	return root;
 }
 
+function _rapierAppendNestingCut(root, markdown, cutAt) {
+	const note = root.ownerDocument.createElement('p'), pre = root.ownerDocument.createElement('pre'), code = root.ownerDocument.createElement('code');
+	note.setAttribute('data-rapier-nesting-cut', 'true');
+	note.textContent = 'Nesting is too deep to show here. The rest of the document follows as plain text.';
+	code.textContent = String(markdown).split('\n').slice(cutAt).join('\n');
+	pre.append(code);
+	root.append(note, pre);
+}
+const _rapierNestingCutAt = (tokens, nesting) => { const deepest = tokens.find(token => token.level >= nesting - 1 && token.map); return deepest ? deepest.map[0] + 1 : -1; };
 async function _rapierRenderSemanticRootAsync(canonical, metadata, options = {}) {
 	const work = options.work || options;
 	check(work);
@@ -435,8 +533,16 @@ async function _rapierRenderSemanticRootAsync(canonical, metadata, options = {})
 	}
 	const markdown = _rapierSplitOpeningFrontmatter(canonical).body;
 	const fallbackEnv = options.page ? {rapierPage: true} : {};
-	let parsed = options.parsed || (runtime.parseAsync ? await runtime.parseAsync(markdown, options) : {tokens: md.parse(markdown, fallbackEnv), env: fallbackEnv});
+	const wikiLinks = markdown.includes('[[') && wikiMode(options);
+	if (wikiLinks) fallbackEnv.rapierWikiLinks = wikiLinks;
+	const nesting = options.maxNesting > 0 ? options.maxNesting : 0, saved = md.options.maxNesting;
+	if (nesting) md.options.maxNesting = nesting;
+	let parsed;
+	try { parsed = !wikiLinks && options.parsed || (runtime.parseAsync && !wikiLinks && !nesting ? await runtime.parseAsync(markdown, options) : {tokens: md.parse(markdown, fallbackEnv), env: fallbackEnv}); }
+	finally { md.options.maxNesting = saved; }
 	let {tokens, env} = parsed, labels = env.footnotes?.list?.map((item, index) => String(item?.label || ('inline-' + (index + 1))));
+	const cutAt = nesting ? _rapierNestingCutAt(tokens, nesting) : -1;
+	tokens = _rapierCloseOpenDetails(tokens);
 	env = {...env, rapierImagePresentation: options.imagePresentation === true};
 	await pause(work, .3);
 	const inert = document.createElement('template').content.ownerDocument;
@@ -463,6 +569,7 @@ async function _rapierRenderSemanticRootAsync(canonical, metadata, options = {})
 			}
 		}
 		if (html) append();
+		if (cutAt >= 0) _rapierAppendNestingCut(root, markdown, cutAt);
 		parsed = tokens = env = labels = null;
 		await finishAsync(_rapierSemanticDecorations(root), work);
 		await pause(work, .6);
@@ -727,6 +834,49 @@ function _rapierImageSizeAttributes(size, marker, geometry, automatic = true) {
     return attributes + (style ? ' style="' + style + '"' : '');
 }
 
+function _rapierCloseOpenDetails(tokens) {
+	const opens = /^<details[\t\n\f\r />]/i, closes = /^<\/details[\t\n\f\r ]*>$/i;
+	const tags = token => {
+		const found = [];
+		if (token.type === 'html_inline') found.push(token.content);
+		else if (token.type === 'html_block') {
+			let raw = '';
+			_rapierRawHtmlFragment(token.content, tag => {
+				if (raw) { if (new RegExp('^</' + raw + '[\\t\\n\\f\\r ]*>$', 'i').test(tag)) raw = ''; }
+				else {
+					const literal = /^<(script|style|textarea|title|xmp|iframe|noembed|noframes|plaintext)(?=[\t\n\f\r />])/i.exec(tag);
+					if (literal) raw = literal[1];
+					else found.push(tag);
+				}
+				return tag;
+			}, md);
+		}
+		else if (token.type === 'inline') for (const child of token.children || []) if (child.type === 'html_inline') found.push(child.content);
+		return found;
+	};
+	const after = new Map(), add = (index, count) => after.set(index, (after.get(index) || 0) + count);
+	const waiting = [];
+	for (let index = 0; index < tokens.length; index++) {
+		const token = tokens[index];
+		let depth = 0;
+		for (const tag of tags(token)) {
+			if (opens.test(tag)) { if (token.type === 'html_block') waiting.push(index); else depth++; }
+			else if (closes.test(tag)) { if (depth) depth--; else waiting.pop(); }
+		}
+		if (depth) add(index + 1 < tokens.length && tokens[index + 1].nesting === -1 ? index + 1 : index, depth);
+	}
+	for (const index of waiting) add(index, 1);
+	if (!after.size) return tokens;
+	const out = [];
+	tokens.forEach((token, index) => {
+		out.push(token);
+		const count = after.get(index);
+		if (count) out.push({type: 'html_block', tag: '', attrs: null, map: null, nesting: 0, level: token.level || 0, children: null,
+			content: '</details>'.repeat(count) + '\n', markup: '', info: '', meta: null, block: true, hidden: false});
+	});
+	return out;
+}
+
 function _rapierRawHtmlFragment(source, rewrite, parser) {
 	const state = new parser.inline.State(source, parser, {}, []);
 	const htmlRule = parser.inline.ruler.__rules__.find(rule => rule.name === 'html_inline').fn;
@@ -792,7 +942,9 @@ function* _rapierAssignHeadingSlugsSteps(root, selector = RAPIER_RENDERED_HEADIN
 		if (!headingSet.has(element) && element.id) used[element.id] = 0;
 	}
 	for (const heading of headings) { yield;
-		heading.id = _rapierNextHeadingSlug(_rapierHeadingSlugBase(heading.textContent), used);
+		const base = _rapierHeadingSlugBase(heading.textContent);
+		const owned = typeof _rapierChromeOwnsId === 'function' && _rapierChromeOwnsId(base);
+		heading.id = _rapierNextHeadingSlug(owned ? 'heading-' + base : base, used);
 	}
 }
 
@@ -1622,11 +1774,17 @@ async function _rapierPlainTextFileAsync(context) {
 async function _rapierCloneRootAsync(root, work) { return finishAsync(cloneTree(root), work); }
 
 function _rapierSourceTokenValue(node) {
-	if (!node?.hasAttribute('data-rapier-source') || !node.hasAttribute('data-rapier-visible') ||
-			Array.from(node.childNodes).some(child => child.nodeType !== Node.TEXT_NODE)) return null;
+	if (!node?.hasAttribute('data-rapier-source') || !node.hasAttribute('data-rapier-visible')) return null;
 	try {
+		const source = decodeURIComponent(node.getAttribute('data-rapier-source'));
+		if (node.classList.contains('rapier-source-token--wiki') || node.classList.contains('rapier-source-token--wiki-embed')) {
+			const token = md.parseInline(source, {rapierWikiLinks: 'links'})[0]?.children;
+			if (token?.length !== 1 || token[0].type !== 'rapier_wiki') return null;
+			if (!node.hasAttribute('data-rapier-wiki-ready') && (node.children.length !== 1 || node.firstElementChild.tagName !== 'A' ||
+				node.firstElementChild.getAttribute('href') !== wikiAddress(token[0].meta.target))) return null;
+		} else if (Array.from(node.childNodes).some(child => child.nodeType !== Node.TEXT_NODE)) return null;
 		return node.textContent === decodeURIComponent(node.getAttribute('data-rapier-visible'))
-			? decodeURIComponent(node.getAttribute('data-rapier-source')) : null;
+			? source : null;
 	} catch (_) { return null; }
 }
 
@@ -1634,7 +1792,7 @@ function _rapierResolveSoftBreakTokens(root) { return finish(_rapierResolveSoftB
 
 function* _rapierResolveSoftBreakTokensSteps(root) {
 	for (const token of root.querySelectorAll('.rapier-source-token--softbreak')) { yield;
-		if (_rapierSourceTokenValue(token) === '\n') token.replaceWith(document.createTextNode(' '));
+		if (_rapierSourceTokenValue(token) === '\n') token.replaceWith(document.createTextNode(token.closest('pre') ? '\n' : ' '));
 		else token.replaceWith(...token.childNodes);
 	}
 	return root;

package/dist/kit/render-print.mjs

@@ -3,7 +3,7 @@ import {collectPdfVectors} from './pdf-vectors.mjs';
 import {collectPdfGlyphs} from './pdf-glyphs.mjs';
 import {pdfFontSources, waitForFonts} from './export-fonts.mjs';
 import {apply as applyTypography} from '../layout/typography.mjs';
-import {documentLanguage, pageSizeOf} from '../spec/document-settings.mjs';
+import {documentLanguage, pageSizeOf, paperForLanguage} from '../spec/document-settings.mjs';
 import {applyPrintCapitals} from './print-capitals.mjs';
 import {stripOneTerminator as _rapierWillStripOneTerminator} from '../agent/will.mjs';
 import {quotedWillSpan} from '../spec/md-marks.mjs';
@@ -220,7 +220,7 @@ async function _rapierWritePrintPdf({root, css, fontCss = '', canonical, bom = f
 		if (current?.() === false) refuse('document_changed');
 	};
 	if (!root?.ownerDocument || typeof capture !== 'function') refuse('pdf_render_unavailable');
-	const paper = settings?.papersize || (templatePage ? pageSizeOf(settings) : {width: 11906, height: 16838});
+	const paper = settings?.papersize || (templatePage ? pageSizeOf(settings) : paperForLanguage(root.ownerDocument.defaultView?.navigator?.language));
 	const width = paper.width / 20, height = paper.height / 20;
 	const margins = Object.fromEntries(['top', 'right', 'bottom', 'left'].map(side =>
 		[side, settings?.geometry ? settings.geometry[side] / 20 : (side === 'top' ? 12 : 14) * 72 / 25.4]));
@@ -841,7 +841,7 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 					const characters = fallbackCharacters(part, run.carrier); if (!characters.length) continue;
 					const {slots, count} = _rapierPrintSlots(part.text, part.rtl);
 					const advance = part.width * .75 / count;
-					const baseline = decimal(height - margins.top - (part.y + part.height * .8) * .75);
+					const baseline = decimal(height - margins.top - (part.baseline ?? part.y + part.height * .8) * .75);
 					for (let letter = 0; letter < characters.length; letter++) {
 						const size = Math.max(.1, advance * 2 * [...characters[letter].replace(/\n/g, '')].length), scaleY = Math.max(.1, part.height * .75) / size;
 						const value = (codes.get(characters[letter]) || codes.get(characters[letter].codePointAt(0))).toString(16).padStart(4, '0');

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 hyphens '
+	+ '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;
 }