rapier-markdown-kit 1.2.33 → 1.2.40

package/dist/kit/ledger/history.mjs

@@ -5,6 +5,7 @@ import {sourceView, HistorySource} from './source.mjs';
 import {textRootParts, rootAfter} from './hash.mjs';
 import {authoredHistory, authoredPlacements} from './transport.mjs';
 import {plainData, canonicalJSON} from './data.mjs';
+import {evaluateWill} from '../../agent/will.mjs';
 
 const historyFailure = reason => ({ok: false, reason});
 const historyInteger = value => Number.isSafeInteger(value) && value >= 0 && !Object.is(value, -0);
@@ -323,6 +324,8 @@ export function selectiveUndo(input, actIds, options = {}) {
 		(options.splitSplice !== undefined && typeof options.splitSplice !== 'function')) return historyFailure('act_invalid');
 	const requested = new Set(actIds), available = prepared.byId;
 	if ([...requested].some(id => !available.has(id))) return historyFailure('act_unavailable');
+	if (options.actor?.kind === 'agent' && [...requested].some(id => available.get(id).record.transaction.actor.kind !== 'agent'))
+		return historyFailure('act_forbidden');
 	const selected = new Set([...requested].filter(id => prepared.effects.active.has(id)));
 	const records = prepared.records;
 	let inverseId = 'planned-inverse'; while (available.has(inverseId)) inverseId += ':';
@@ -359,6 +362,9 @@ export function selectiveUndo(input, actIds, options = {}) {
 			sourceIndices: transported.sourceIndices.get(record.transaction.id)})) : prepared.rows;
 		const result = projectInverseSource(transported ? {...prepared, rows, records: transported.records} : prepared, selected, projectedEffects, options);
 		if (!result.ok) return result;
+		if (options.actor?.kind === 'agent' && prepared.metadata.docKind === 'markdown' &&
+			evaluateWill(prepared.source, result.splices).outcome !== 'applied')
+			return historyFailure('will_refused');
 		return {...result, actIds: [...requested], sourceTransactionIds: [...selected], metadata, afterMetadata,
 			effectChanged, unchanged: result.after === prepared.source && !metadata && !effectChanged};
 	} catch (_) { return historyFailure('history_invalid'); }

package/dist/kit/ledger/inverse-source.mjs

@@ -10,7 +10,7 @@ const historyBoundary = (source, at) => Number.isSafeInteger(at) && at >= 0 && !
 	!(at > 0 && at < source.length && (source.charCodeAt(at - 1) & 0xFC00) === 0xD800 &&
 	(source.charCodeAt(at) & 0xFC00) === 0xDC00);
 
-function minimalHistorySplice(before, after, pos = 0) {
+export function minimalHistorySplice(before, after, pos = 0) {
 	let first = 0, a = before.length, b = after.length;
 	while (first < a && first < b && before[first] === after[first]) first++;
 	if (!historyBoundary(before, first) || !historyBoundary(after, first)) first--;
@@ -262,7 +262,11 @@ export function projectInverseSource(prepared, selected, projectedEffects, optio
 					const start = boundary(row.pos), end = boundary(row.pos + row.removed.length);
 					let at = start.last, count = Math.max(0, end.first - at);
 					if (!row.removed.length) {
-						const marker = pieces.slice(start.first, start.last).findIndex(item => item.mark?.inserted.length);
+						const run = pieces.slice(start.first, start.last), next = pieces[start.last];
+						let before = start.first - 1; while (before >= 0 && !pieces[before].text) before--;
+						const leftAct = before >= 0 ? byId.get(pieces[before].owner)?.actId : undefined;
+						const sameAct = leftAct !== undefined && run.some(item => item.mark?.actId === leftAct);
+						const marker = run.findIndex(item => item.mark?.inserted.length && (next && owns(next, item.mark) || !sameAct));
 						at = marker < 0 ? start.last : start.first + marker; count = 0;
 					}
 					const removed = pieces.slice(at, at + count);

package/dist/kit/ledger/journal-records.mjs

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 import {fields, scalar, plainPrototype} from './data.mjs';
 import {transformText} from './source.mjs';
+import {dataImage} from '../../spec/md-assets.mjs';
 
 const _RAPIER_TRANSACTION_ACTOR_LIMIT = 160;
 const _RAPIER_TRANSACTION_OPERATION_LIMIT = 96;
@@ -175,10 +176,10 @@ function _rapierPictureFinish(record, original, earlier, lookup) {
 	if (!reference || !/^\]\[[a-z0-9-]+\]$/i.test(reference.inserted) || reference.removed === reference.inserted) return false;
 	const definition = rows.find(row => row !== reference), oldLabel = reference.removed.slice(2, -1), newLabel = reference.inserted.slice(2, -1);
 	const body = (text, label) => {
-		const prefix = '[' + label + ']: data:image/svg+xml;base64,';
+		const prefix = '[' + label + ']: ';
 		if (typeof text !== 'string' || !text.startsWith(prefix)) return null;
 		const value = text.slice(prefix.length), end = value.indexOf(' '), bytes = end < 0 ? value : value.slice(0, end), title = end < 0 ? '' : value.slice(end);
-		return /^[A-Za-z0-9+/]+={0,2}$/.test(bytes) && !/[\r\n]/.test(title) ? title : null;
+		return dataImage(bytes)?.codec === 'image/svg+xml' && !/[\r\n]/.test(title) ? title : null;
 	};
 	const title = body(definition.removed, oldLabel);
 	if (title === null || body(definition.inserted, newLabel) !== title) return false;
@@ -292,6 +293,7 @@ function _rapierWalkHistoryEffects(records, lookup, visit = null, observe = null
 				}
 			}
 			if (refs.some(id => typeof id !== 'string' || !nodes.has(id) || pictures.has(id))) return {ok: false};
+			if (tx.actor?.kind === 'agent' && refs.some(id => byId.get(id).transaction.actor?.kind !== 'agent')) return {ok: false};
 			nodes.set(tx.id, {active: true, blockers: 0, references: refs, dependents: []}); references.set(tx.id, refs.slice());
 			byId.set(tx.id, record); earlier.push(record);
 			for (const ref of refs) {

package/dist/kit/ledger/merge.mjs

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 import {readLedger, exportLedger, rootAfter} from './format.mjs';
 import {_rapierTransformSplices, _rapierTransformMetadata, _rapierMetadataDelta, _rapierHistoryEffects, _rapierMetadataState} from './journal-records.mjs';
-import {mergeText} from './text-merge.mjs';
+import {mergeText, willMergeConflict} from './text-merge.mjs';
 import {transposeAuthored, authoredPlacements} from './transport.mjs';
-import {parseWill, stripOneTerminator} from '../../agent/will.mjs';
 import {sha256} from './hash.mjs';
 import {canonicalJSON, fault} from './data.mjs';
 export function transportInterval(start, end, splices) {
@@ -58,17 +57,6 @@ function checkpointList(read) {
   }
   return list;
 }
-function kept(text) {
-  const will = parseWill(text);
-  if (will.fault) return {fault: will.fault, text};
-  return will.regions.filter(region => region.law !== 'edit').map(({law, intent, start, end}) =>
-    law === 'keep' ? {law, intent, text: text.slice(start, end)} : {law, intent});
-}
-function appended(from, to) {
-  const regions = text => parseWill(text).regions.filter(region => region.law === 'append');
-  const was = regions(from), now = regions(to), core = (text, region) => stripOneTerminator(text.slice(region.start, region.end));
-  return was.length === now.length && was.every((region, index) => core(to, now[index]).startsWith(core(from, region)));
-}
 function expandRetainedStart(shorter, longer) {
   if (shorter.ledger.documentAuthority !== longer.ledger.documentAuthority ||
       shorter.ledger.start.revision <= longer.ledger.start.revision) return null;
@@ -191,10 +179,8 @@ export function merge(first, second) {
     const local = localIds.get(record.transaction.id);
     if (local) mappedIds.set(record.transaction.id, local.transaction.id);
   }
-  const incomingKept = canonicalJSON(kept(theirs.text));
-  const keepDiffers = incomingKept !== canonicalJSON(kept(ours.text)) && incomingKept !== canonicalJSON(kept(common.text)) ||
-    !appended(common.text, theirs.text) && !appended(ours.text, theirs.text);
-  let conflicted = keepDiffers && unseen.length > 0, incomingSource = common.text;
+  const keepDiffers = willMergeConflict(common.text, ours.text, theirs.text);
+  let conflicted = keepDiffers, incomingSource = common.text;
   if (!conflicted) for (const record of incoming) {
     const beforeSource = incomingSource;
     incomingSource = _rapierTransformSplices(incomingSource, record.splices);

package/dist/kit/ledger/text-merge.mjs

@@ -1,4 +1,28 @@
 // SPDX-License-Identifier: MIT
+import {parseWill, stripOneTerminator} from '../../agent/will.mjs';
+
+export function willMergeConflict(base, ours, theirs) {
+	const snapshot = text => {
+		const will = parseWill(text);
+		return {fault: will.fault, regions: will.regions.filter(region => region.law !== 'edit').map(region => ({
+			law: region.law, intent: region.intent, text: text.slice(region.start, region.end),
+		}))};
+	};
+	const a = snapshot(ours), b = snapshot(theirs);
+	if (a.fault || b.fault) return ours !== theirs;
+	const kept = value => JSON.stringify(value.regions.map(({law, intent, text}) => ({law, intent, ...(law === 'keep' ? {text} : {})})));
+	if (kept(a) !== kept(b)) return true;
+	if (base === null) return false;
+	const prior = snapshot(base);
+	if (prior.fault) return base !== ours || base !== theirs;
+	const appended = value => {
+		const before = prior.regions.filter(region => region.law === 'append'), after = value.regions.filter(region => region.law === 'append');
+		return before.length === after.length && before.every((region, index) =>
+			stripOneTerminator(after[index].text).startsWith(stripOneTerminator(region.text)));
+	};
+	return !appended(a) || !appended(b);
+}
+
 function textFault(code, message) { return Object.assign(new Error(message), {code}); }
 export function canonicalNote(text) {
 	if (typeof text !== 'string') throw textFault('note_text', 'A note must be text');
@@ -430,8 +454,9 @@ export function mergeText(base, ours, theirs, options = {}) {
 	canonicalNote(ours); canonicalNote(theirs); if (base !== null) canonicalNote(base);
 	const unchanged = value => ({text: value, clean: !value.includes(TEXT_CONFLICT), conflicts: value.includes(TEXT_CONFLICT) ? [{kind: 'existing-conflict', advisory: true}] : []});
 	if (ours === theirs) return unchanged(ours);
-	if (base === ours) return unchanged(theirs);
-	if (base === theirs) return unchanged(ours);
+	const willConflict = willMergeConflict(base, ours, theirs);
+	if (!willConflict && base === ours) return unchanged(theirs);
+	if (!willConflict && base === theirs) return unchanged(ours);
 	const conflicts = []; let text = '', a, b;
 	const conflict = (before, a, b, kind) => {
 		const ab = inspectTextConflicts(a), bb = inspectTextConflicts(b);
@@ -468,6 +493,7 @@ export function mergeText(base, ours, theirs, options = {}) {
 	const [units, oursUnits, theirsUnits] = base === null ? [] : [base, ours, theirs].map(textUnits);
 	const declared = base !== null && textDeclarations(units);
 	if (base === null) conflict(null, ours, theirs, 'no-ancestor');
+	else if (willConflict) conflict(base, ours, theirs, 'will');
 	else if (textDeclarations(oursUnits) !== declared || textDeclarations(theirsUnits) !== declared) conflict(base, ours, theirs, 'document-bindings');
 	else {
 		const reordered = textPermuted(units, oursUnits, theirsUnits);

package/dist/kit/rapier-ledger.mjs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
-import {exportLedger, replaceLedgerText, readLedger, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
-export {exportLedger, replaceLedgerText, readLedger, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId};
+import {exportLedger, prepareLedgerAsync, replaceLedgerText, readLedger, readLedgerAsync, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
+export {exportLedger, prepareLedgerAsync, replaceLedgerText, readLedger, readLedgerAsync, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId};
 import {authorship, readAuthorship, ledgerFromAuthorship} from './ledger/authorship.mjs';
 export {authorship, readAuthorship, ledgerFromAuthorship};
 import {merge, transportInterval, transportTouchedInterval} from './ledger/merge.mjs';

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)) + '" ' : ''));
@@ -402,8 +465,20 @@ 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 rendered;
+	if (nesting || md && options.closeDetails) {
+		const saved = md.options.maxNesting;
+		if (nesting) md.options.maxNesting = nesting;
+		try {
+			const tokens = md.parse(markdown, env);
+			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) {
@@ -435,8 +510,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});
-	let {tokens, env} = parsed, labels = env.footnotes?.list?.map((item, index) => String(item?.label || ('inline-' + (index + 1))));
+	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;
+	if (options.closeDetails) tokens = _rapierCloseOpenDetails(tokens);
+	let labels = env.footnotes?.list?.map((item, index) => String(item?.label || ('inline-' + (index + 1))));
 	env = {...env, rapierImagePresentation: options.imagePresentation === true};
 	await pause(work, .3);
 	const inert = document.createElement('template').content.ownerDocument;
@@ -727,6 +810,38 @@ 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') _rapierRawHtmlFragment(token.content, tag => { 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 +907,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 +1739,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 +1757,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 '
+	+ '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};
 }