rapier-markdown-kit 1.1.104 → 1.2.3

package/dist/kit/ledger/format.mjs

@@ -62,6 +62,15 @@ function readLedgerState(input, expectedText, expectedMetadata) {
       (expectedText !== undefined && text !== expectedText)) throw fault('history does not describe this document');
   return {value: {ledger, text, metadata, root, revision, complete: ledger.complete}, prepared, source};
 }
+// A stored copy may hold the head text alone. Its start is that text with every record reversed; readLedger proves it.
+export function ledgerWithStart(input, text) {
+  let source = new HistorySource(documentText(text));
+  for (let i = input.records.length - 1; i >= 0; i--) {
+    source = source.apply(input.records[i].splices, true);
+    if (source === null) throw fault('history does not reverse from this document');
+  }
+  return {...input, start: {...input.start, text: source.slice()}};
+}
 export function readLedger(input, expectedText, expectedMetadata) {
   return readLedgerState(input, expectedText, expectedMetadata).value;
 }
@@ -182,8 +191,8 @@ export async function prepareLedgerAsync(input, {yield: yieldWork, signal} = {})
   return step.value;
 }
 // Derived navigation, never a second history. A target older than start is intentionally unavailable.
-export function historyEnvelope(input, segmentIdentity = []) {
-  const {value: {ledger, text, metadata}, prepared, source} = readLedgerState(input);
+export function historyEnvelope(input, segmentIdentity = [], expectedText, expectedMetadata) {
+  const {value: {ledger, text, metadata}, prepared, source} = readLedgerState(input, expectedText, expectedMetadata);
   const {byId, effects: {pictures}} = prepared;
   let branch = [], cursor = 0;
   for (const {transaction: tx} of ledger.records) {
@@ -198,7 +207,7 @@ export function historyEnvelope(input, segmentIdentity = []) {
   }
   const step = (source, id, redo) => {
     const target = byId.get(id), folded = pictures.size
-      ? pictureHistorySplices({source: source.slice(), records: prepared.records}, target, redo) : null;
+      ? pictureHistorySplices({get source() { return source.slice(); }, records: prepared.records}, target, redo) : null;
     return source.apply(folded || target.splices, !folded && !redo);
   };
   let traversed = source, traversedMetadata = {...metadata};

package/dist/kit/ledger/hash.mjs

@@ -30,13 +30,11 @@ const K = new Uint32Array([
   0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2,
 ]);
 const rotate = (x, n) => (x >>> n) | (x << (32 - n));
-// A bounded encoder and one compression block. No full UTF-8 or padded-input copy.
-// Updates retain a trailing high surrogate so an arbitrary string boundary stays exact.
-export function createSHA256() {
+// One bounded SHA-256 compression state for file bytes and encoded source text.
+export function sha256State() {
   const h = new Uint32Array([0x6a09e667,0xbb67ae85,0x3c6ef372,0xa54ff53a,0x510e527f,0x9b05688c,0x1f83d9ab,0x5be0cd19]);
-  const w = new Uint32Array(64), block = new Uint8Array(64), encoded = new Uint8Array(65536);
-  const encoder = new TextEncoder();
-  let used = 0, bytes = 0, high = '', finished = false;
+  const w = new Uint32Array(64), block = new Uint8Array(64);
+  let used = 0, bytes = 0, finished = false;
   const compress = (input, offset) => {
     for (let i = 0; i < 16; i++) {
       const at = offset + i * 4;
@@ -65,13 +63,37 @@ export function createSHA256() {
     for (; at + 64 <= size; at += 64) compress(input, at);
     if (at < size) { block.set(input.subarray(at, size), 0); used = size - at; }
   };
+  return {
+    update(input) {
+      if (finished || !(input instanceof Uint8Array)) throw new TypeError('SHA-256 needs bytes before finish');
+      if (!Number.isSafeInteger(bytes + input.length)) throw new Error('SHA-256 input length is not exact');
+      feed(input, input.length);
+    },
+    finish() {
+      if (finished) throw new Error('SHA-256 is already finished');
+      finished = true;
+      block[used++] = 0x80; block.fill(0, used);
+      if (used > 56) { compress(block, 0); block.fill(0); }
+      const view = new DataView(block.buffer);
+      view.setUint32(56, Math.floor(bytes / 0x20000000)); view.setUint32(60, (bytes * 8) >>> 0);
+      compress(block, 0);
+      return Array.from(h, x => x.toString(16).padStart(8, '0')).join('');
+    },
+    get bytes() { return bytes; },
+  };
+}
+// UTF-16 chunks share that byte state. Retain a trailing high surrogate so a
+// caller can split a character between updates without changing its UTF-8 digest.
+export function createSHA256() {
+  const hash = sha256State(), encoded = new Uint8Array(65536), encoder = new TextEncoder();
+  let high = '', finished = false;
   const write = text => {
     for (let at = 0; at < text.length;) {
       // Bound both the substring and byte allocation; encodeInto never cuts a scalar.
       let end = Math.min(text.length, at + 32768);
       if (end < text.length && (text.charCodeAt(end - 1) & 0xfc00) === 0xd800 && (text.charCodeAt(end) & 0xfc00) === 0xdc00) end--;
       const part = encoder.encodeInto(text.slice(at, end), encoded);
-      feed(encoded, part.written); at += part.read;
+      hash.update(encoded.subarray(0, part.written)); at += part.read;
     }
   };
   return {
@@ -85,15 +107,9 @@ export function createSHA256() {
       if (finished) throw new Error('SHA-256 is finished');
       if (high) { write(high); high = ''; }
       finished = true;
-      const bits = bytes * 8;
-      block[used++] = 0x80; block.fill(0, used);
-      if (used > 56) { compress(block, 0); block.fill(0); }
-      const view = new DataView(block.buffer);
-      view.setUint32(56, Math.floor(bits / 0x100000000)); view.setUint32(60, bits >>> 0);
-      compress(block, 0);
-      return Array.from(h, x => x.toString(16).padStart(8, '0')).join('');
+      return hash.finish();
     },
-    get bytes() { return bytes; },
+    get bytes() { return hash.bytes; },
   };
 }
 export function sha256Parts(parts) {

package/dist/kit/ledger/history.mjs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Transient projections and selective inverses of the existing canonical journal.
-import {_rapierTransformSplices, _rapierRecordSplices, _rapierRecordMetadata, _rapierValidMetadata, _rapierTransformMetadata, _rapierMetadataDelta, _rapierHistoryEffects, _rapierMetadataState, _rapierReplayMetadata, _rapierPrepareHistoryRecords} from './journal-records.mjs';
+import {_rapierTransformSplices, _rapierValidMetadata, _rapierTransformMetadata, _rapierMetadataDelta, _rapierHistoryEffects, _rapierMetadataState, _rapierPrepareHistoryRecords} from './journal-records.mjs';
 import {projectInverseSource, HistorySource} from './inverse-source.mjs';
 import {textRootParts, rootAfter} from './hash.mjs';
 import {authoredHistory} from './transport.mjs';
@@ -43,11 +43,15 @@ export function groupHistoryActs(acts) {
 
 // A picture's codec replacement travels with its original navigation step.
 // Match every complete replacement exactly before moving any source bytes.
-export function pictureHistorySplices({source, records}, target, redo) {
+export function pictureHistorySplices(input, target, redo) {
+	const {records} = input;
 	const id = target?.transaction?.id, at = records.indexOf(target);
 	if (!id || at < 0 || target.transaction.operation === 'document.finish-picture' || !Array.isArray(target.splices)) return null;
 	const later = records.slice(at + 1).filter(row => row?.transaction?.operation === 'document.finish-picture' && Array.isArray(row.splices) && row.splices.length);
 	if (!later.length) return null;
+	// A caller may hold a persistent source tree: request its text only when
+	// a later picture replacement can actually affect this navigation step.
+	const source = input.source;
 	const own = new Set(later.filter(row => row.transaction.sourceTransactionId === id));
 	const step = redo ? target.splices : target.splices.slice().reverse().map(row => ({pos: row.pos, removed: row.inserted, inserted: row.removed}));
 	const plan = moveOthers => {
@@ -116,7 +120,9 @@ function prepareHistory(input) {
 			row.beforeSource = initial; row.beforeMetadata = initialMetadata;
 		}
 		const earliestRevision = records[0]?.transaction.baseRevision ?? revision;
-		let root = earliestRevision === 0 ? textRootParts(initial.parts()) : null, rootRevision = earliestRevision;
+		// The window's owner may name its root (the source store mints it once per text); otherwise hash the initial text.
+		let root = earliestRevision === 0 ? (typeof input.earliestRoot === 'string' && input.earliestRoot || textRootParts(initial.parts())) : null,
+			rootRevision = earliestRevision;
 		for (const {record, splices} of rows) {
 			const hashed = Object.hasOwn(record, 'beforeHash') || Object.hasOwn(record, 'afterHash');
 			if (hashed && (![record.beforeHash, record.afterHash].every(value =>
@@ -281,9 +287,15 @@ export function historyPlaces(input, blocks) {
 			}
 			touched.set(node, after);
 		});
+		// Blocks one splice covers share its range (a whole-document delete maps every block to all it removed): slice each range once.
+		const slices = new Map(), cut = (source, side, from, to) => {
+			const key = side + from + ':' + to;
+			if (!slices.has(key)) slices.set(key, source.slice(from, to));
+			return slices.get(key);
+		};
 		for (const [node, afterRange] of touched) {
-			const beforeRange = ranges.range(node), previous = {...beforeRange, source: beforeSource.slice(beforeRange.from, beforeRange.to)},
-				after = {...afterRange, source: afterSource.slice(afterRange.from, afterRange.to)};
+			const beforeRange = ranges.range(node), previous = {...beforeRange, source: cut(beforeSource, 'b', beforeRange.from, beforeRange.to)},
+				after = {...afterRange, source: cut(afterSource, 'a', afterRange.from, afterRange.to)};
 			if (previous.source !== after.source) node.block.acts.push({...historyAct(record), before: previous, after});
 		}
 	}

package/dist/kit/ledger/merge.mjs

@@ -190,7 +190,9 @@ export function merge(first, second) {
     const local = localIds.get(record.transaction.id);
     if (local) mappedIds.set(record.transaction.id, local.transaction.id);
   }
-  const keepDiffers = canonicalJSON(kept(ours.text)) !== canonicalJSON(kept(theirs.text));
+  // Kept text arriving from the other copy waits for the person; this copy's own kept edits merge like any other.
+  const incomingKept = canonicalJSON(kept(theirs.text));
+  const keepDiffers = incomingKept !== canonicalJSON(kept(ours.text)) && incomingKept !== canonicalJSON(kept(common.text));
   let conflicted = keepDiffers && unseen.length > 0, incomingSource = common.text;
   if (!conflicted) for (const record of incoming) {
     const beforeSource = incomingSource;
@@ -240,8 +242,7 @@ export function merge(first, second) {
   let conflicts = [];
   if (conflicted) {
     if (unseen.length !== incoming.length) return refused('history', 'record_transport_conflict');
-    if (incomingFields.size || unseen.some(record => incomingEffects.references.get(record.transaction.id)?.length))
-      return metadataConflict('record_transport_conflict', {fields: [...incomingFields]});
+    if (incomingFields.size) return metadataConflict('record_transport_conflict', {fields: [...incomingFields]});
     // Restart from the original local head: partially transported records never leak into a conflict result.
     records.splice(ours.ledger.records.length); text = ours.text; metadata = {...ours.metadata}; root = ours.root;
     const merged = mergeText(keepDiffers ? null : common.text, ours.text, theirs.text, {oursId: 'copy-' + ours.ledger.sha256.slice(0, 16), theirsId: 'copy-' + theirs.ledger.sha256.slice(0, 16)});

package/dist/kit/pdf-vectors.mjs

@@ -151,7 +151,10 @@ export async function collectPdfVectors(main, {width, height, count, capture, si
           const left = Math.max(0, bounds.left - box.left - 2), top = Math.max(0, bounds.top - box.top - 2);
           const right = Math.min(box.width, bounds.right - box.left + 2), bottom = Math.min(box.height, bounds.bottom - box.top + 2);
           if (!(right > left && bottom > top)) return;
-          const result = await capture({root: wrap, clip: {x: left, y: top, width: right - left, height: bottom - top}, transparent: true, scale: 2, signal, current}); check();
+          const result = await capture({root: wrap, clip: {x: left, y: top, width: right - left, height: bottom - top}, transparent: true, scale: 2, signal, current, pixels: true}); check();
+          if (result?.rgb instanceof Uint8Array && result?.alpha instanceof Uint8Array) {
+            return {image: {rgb: await compress(result.rgb), alpha: await compress(result.alpha), width: result.width, height: result.height}, x: box.left - origin.left + left, y: box.top - origin.top + top, width: right - left, height: bottom - top};
+          }
           const image = new window.Image(); image.src = 'data:' + result.mimeType + ';base64,' + result.data; await image.decode(); check();
           const canvas = document.createElement('canvas'); canvas.width = image.naturalWidth; canvas.height = image.naturalHeight;
           try {

package/dist/kit/rapier-ledger.mjs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
-import {exportLedger, replaceLedgerText, readLedger, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
-export {exportLedger, replaceLedgerText, readLedger, textRoot, rootAfter, historyEnvelope, agentActorId};
+import {exportLedger, replaceLedgerText, readLedger, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
+export {exportLedger, replaceLedgerText, readLedger, 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-ink.mjs

@@ -63,7 +63,7 @@ export async function freezePublishedInk(root, {document: doc, css, fontCss = ''
     frame.srcdoc = '<!doctype html><html lang="' + documentLanguage(settings, language) + '" data-rapier-theme="' + theme + '"><head><meta charset="utf-8">'
       + '<meta http-equiv="Content-Security-Policy" content="' + policy + '"><meta name="referrer" content="no-referrer">'
       + '<style>' + css + '</style></head><body class="' + (theme === 'light' ? 'light' : '')
-      + '"><main class="rapier-page md-render" data-md-theme="' + theme + '"' + (settings?.space ? ' data-md-space' : '') + '>' + root.innerHTML + '</main></body></html>';
+      + '"><main class="rapier-page md-render" data-md-theme="' + theme + '">' + root.innerHTML + '</main></body></html>';
     doc.body.appendChild(frame);
     await wait(loaded);
     const paper = frame.contentDocument, main = paper?.querySelector('main.rapier-page');

package/dist/kit/render-markdown.mjs

@@ -1,5 +1,5 @@
-import {htmlPlaceholder, mountHtmlBlocks, htmlImageRecord, htmlLayoutEdit} from '../spec/html-blocks.mjs';
 // 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';
 const RAPIER_TABLE_CAPTION_PREFIX_RE = /^(?:Table:|:) /;
 const RAPIER_PORTABLE_HIGHLIGHT_HEX = Object.freeze({
@@ -72,10 +72,8 @@ function initMarkdownIt() {
 			'data-md-typography-close="' + md.utils.escapeHtml(encodeURIComponent(held.close)) + '"');
 		return '<span ' + attrs.join(' ') + ' style="' + md.utils.escapeHtml(css.join(';')) + '">';
 	};
-	for (const kind of ['typography', 'color', 'font']) {
-		md.renderer.rules['rapier_' + kind + '_open'] = renderTypography;
-		md.renderer.rules['rapier_' + kind + '_close'] = () => '</span>';
-	}
+	md.renderer.rules.rapier_typography_open = renderTypography;
+	md.renderer.rules.rapier_typography_close = () => '</span>';
 	// Ink: the span carries its opener's body (the grammar's inkOpenBody: a sanitizer drops an attribute holding the
 	// comment's close); the ink layer reads it back through the one grammar and draws the stroke over the words' own boxes.
 	// The span itself shows nothing.
@@ -138,8 +136,8 @@ function initMarkdownIt() {
 		const asset = globalThis.RapierImageAssets.dataImage(src), reference = token.meta?.mdImage?.reference;
 		// A connected host's own asset; a host without one (the server) supplies no port.
 		if (!env.rapierPage && typeof globalThis.RapierEmbeddedImages?.imageHtml === 'function' &&
-			(_rapierEmbedAssetSource?.(src) || asset && (reference || asset.codec === 'image/jxl' || asset.codec === 'image/svg+xml'))) return globalThis.RapierEmbeddedImages.imageHtml(
-			reference, alt, title, size, layout, rawAlt, token.meta?.mdImage?.source, src);
+			(_rapierEmbedAssetSource?.(src) || asset && (reference || asset.codec === 'image/jxl' || asset.codec === 'image/gif' || asset.codec === 'image/svg+xml'))) return globalThis.RapierEmbeddedImages.imageHtml(
+			reference, alt, title, size, layout, rawAlt, token.meta?.mdImage?.source, src, env.rapierImagePresentation !== false);
 		const drawingAlt = typeof rawAlt === 'string' && alt === '' && asset?.codec === 'image/svg+xml' ? globalThis.RapierImageAssets.drawingImageAlt(src) : null;
 		const shownAlt = drawingAlt ?? alt;
 		let loadable = false;
@@ -158,19 +156,28 @@ function initMarkdownIt() {
 			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)) + '" ' : ''));
 		}
+		let animation = null;
+		try {animation = globalThis.RapierImageAssets.imageAnimation?.(src);} catch (_) {}
 		const attrs = [
 			'data-rapier-markdown-image=""',
-			'src="' + md.utils.escapeHtml(src) + '"',
+			'src="' + md.utils.escapeHtml(animation?.first || src) + '"',
 			'alt="' + md.utils.escapeHtml(shownAlt) + '"',
 			'loading="lazy"',
 			'decoding="async"',
 		];
+		if (animation) attrs.push('data-rapier-animation="' + md.utils.escapeHtml(src) + '"',
+			'data-rapier-natural-width="' + animation.width + '"', 'data-rapier-natural-height="' + animation.height + '"');
 		if (token.meta?.mdImage?.source && token.meta.mdImage.source.length <= 4096)
 			attrs.push('data-rapier-image-source="' + md.utils.escapeHtml(encodeURIComponent(token.meta.mdImage.source)) + '"');
 		if (title) attrs.push('title="' + md.utils.escapeHtml(title) + '"');
 		if (shownAlt !== alt || size && !token.meta?.mdLayout?.layout?.width) attrs.push('data-rapier-image-alt-source="' + md.utils.escapeHtml(rawAlt) + '"');
 		if (layout) attrs.push('data-rapier-image-layout="' + md.utils.escapeHtml(encodeURIComponent(layout)) + '"');
-		return '<img ' + attrs.join(' ') + _rapierImageSizeAttributes(size, layout) + '>';
+		// Portable semantic consumers keep their existing native image attributes. Only
+		// live editor/reader presentation needs provisional geometry and its load consumer.
+		if (env.rapierImagePresentation === false) return '<img ' + attrs.join(' ') + _rapierImageSizeAttributes(size, layout) + '>';
+		const geometry = !env.rapierPage && globalThis.RapierEmbeddedImages?.geometry
+			? globalThis.RapierEmbeddedImages.geometry(src) : globalThis.RapierImageAssets.imagePlaceholderDimensions(src);
+		return '<img ' + attrs.join(' ') + _rapierImageSizeAttributes(size, layout, geometry || {}) + '>';
 	};
 
 	md.renderer.rules.hr = function (tokens, idx) {
@@ -186,7 +193,9 @@ function initMarkdownIt() {
 	// markup reaches DOMPurify: sanitizing each HTML token closes containers before their body.
 	// The harness runs this installer alone for the parser's acceptance; without the page's sanitizer the tokens pass.
 	const inPage = typeof sanitizeRapierHtml === 'function' && typeof _rapierChromeOwnsId === 'function';
-	const rawAttribute = /\s+([A-Za-z_:][A-Za-z0-9_.:-]*)(?:\s*=\s*("[^"]*"|'[^']*'|[^"'=<>`\s]+))?/g;
+	// HTML separates attributes and ends an unquoted value only at ASCII whitespace: JavaScript's \s also takes U+00A0,
+	// which would read a quoted value the browser never sees and keep the attributes hidden inside it.
+	const rawAttribute = /[\t\n\f\r ]+([A-Za-z_:][A-Za-z0-9_.:-]*)(?:[\t\n\f\r ]*=[\t\n\f\r ]*("[^"]*"|'[^']*'|[^"'=<>`\t\n\f\r ]+))?/g;
 	// The id is read as HTML reads it: a numeric character reference (`&#115;ource-textarea` is `source-textarea`,
 	// `&#x73;` the same) and the named references that spell a character an id can hold are decoded before the
 	// chrome's ids are asked; every other name stays literal (no named reference spells a letter, a digit or a
@@ -196,7 +205,7 @@ function initMarkdownIt() {
 		equals: '=', comma: ',', lpar: '(', rpar: ')', lsqb: '[', lbrack: '[', rsqb: ']', rbrack: ']', lcub: '{', lbrace: '{',
 		rcub: '}', rbrace: '}', verbar: '|', vert: '|', VerticalLine: '|', bsol: '\\', Hat: '^', grave: '`', DiacriticalGrave: '`', Tab: '\t', NewLine: '\n' };
 	const attributeText = value => String(value || '').replace(/^["']|["']$/g, '')
-		.replace(/&(?:#(\d{1,7})|#[xX]([0-9a-fA-F]{1,6})|([A-Za-z][A-Za-z0-9]{0,31}));?/g, (whole, dec, hex, name) => {
+		.replace(/&(?:#(\d+)|#[xX]([0-9a-fA-F]+)|([A-Za-z][A-Za-z0-9]{0,31}));?/g, (whole, dec, hex, name) => {
 			const code = dec ? Number(dec) : hex ? parseInt(hex, 16) : -1;
 			if (code >= 0) return code > 0 && code <= 0x10ffff ? String.fromCodePoint(code) : '\ufffd';
 			return Object.hasOwn(RAW_ID_NAMED, name) ? RAW_ID_NAMED[name] : whole;
@@ -213,9 +222,15 @@ function initMarkdownIt() {
 			return key.startsWith('data-') || key === 'for' || key === 'id' && _rapierChromeOwnsId(attributeText(value)) ? '' : whole;
 		}) : tag;
 		md.renderer.rules.html_inline = (tokens, idx) => cleanTag(tokens[idx].content);
-		md.renderer.rules.html_block = (tokens, idx, _options, env) => _rapierRawHtmlFragment(tokens[idx].content,
-			tag => env?.rapierDocumentSpace ? cleanTag(tag).replace(/^<([A-Za-z][A-Za-z0-9:-]*)(?=[\s/>])/, '<$1 data-md-html-block="' + idx + '"') : cleanTag(tag), md);
+		md.renderer.rules.html_block = (tokens, idx) => _rapierRawHtmlFragment(tokens[idx].content, cleanTag, md);
 	}
+	// A highlight written in one of the picker's colours is that swatch, as `==🟢x==` is, and follows the theme.
+	const inlineHtml = md.renderer.rules.html_inline || ((tokens, idx) => tokens[idx].content);
+	md.renderer.rules.html_inline = (tokens, idx, ...rest) => {
+		const swatch = /^<mark style="background-color:(#[0-9a-f]{6});?">$/i.exec(tokens[idx].content);
+		const colour = swatch && Object.keys(RAPIER_PORTABLE_HIGHLIGHT_HEX).find(name => RAPIER_PORTABLE_HIGHLIGHT_HEX[name] === swatch[1].toLowerCase());
+		return colour ? '<mark data-rapier-highlight="' + colour + '">' : inlineHtml(tokens, idx, ...rest);
+	};
 
 	const _ulOpenDefault = md.renderer.rules.bullet_list_open
 		|| function (tokens, idx, opts, _env, self) { return self.renderToken(tokens, idx, opts); };
@@ -308,8 +323,7 @@ function initMarkdownIt() {
 					'</code> fence. Text below is still inside the block.</p>' + sourceHtml + '</figure>\n';
 			}
 			const provider = env.rapierProviders === false ? null : _rapierProviders.mermaid;
-			const native = globalThis.RapierFlowchart?.parseFlowchart(src).ok === true ||
-				provider?.status === 'ready' && globalThis.RapierDiagrams?.parseDiagram(src).ok === true;
+			const native = globalThis.RapierFlowchart?.parseFlowchart(src).ok === true;
 			const ready = native || !!(provider && provider.status === 'ready' && typeof provider.renderToString === 'function');
 			if (!ready && env.rapierProviders !== false && !_diagramPromptedOnce) {
 				_diagramPromptedOnce = true;
@@ -360,11 +374,33 @@ function initMarkdownIt() {
 						 + literal + '</span>';
 			}
 			try {
-				const rendered = mathProvider.renderToString(src, { displayMode });
+				// The explicit output-only call keeps structured results beside the unchanged SVG
+				// islands. MathML never enters editable text projections or source serialization.
+				let rendered;
+				if (env.rapierMathEquations) {
+					const combined = mathProvider.renderWithMathML(src, {displayMode});
+					if (!combined || typeof combined.svg !== 'string' || !combined.semantics ||
+						typeof combined.semantics !== 'object' || Array.isArray(combined.semantics) || !Array.isArray(combined.errors))
+						throw new TypeError('The Rapier Math shared result is invalid.');
+					rendered = combined.svg;
+					env.rapierMathEquations.push({source, tex: src, displayMode,
+						semantics: combined.semantics, errors: combined.errors});
+				} else rendered = mathProvider.renderToString(src, {displayMode});
+				let encoded;
+				try { encoded = encodeURIComponent(source); }
+				catch (error) {
+					// An ill-formed UTF-16 source cannot enter the URI-encoded edit marker.
+					// Keep the ordinary source-only HTML and the collected refusal diagnostic.
+					if (!(error instanceof URIError)) throw error;
+					return '<span data-rapier-math-source="">' + literal + '</span>';
+				}
 				return '<span class="math-rendered" data-math-src="'
-						 + encodeURIComponent(source) + '">' + rendered + '</span>';
+						 + encoded + '">' + rendered + '</span>';
+			}
+			catch (error) {
+				if (env.rapierMathEquations) throw error;
+				return '<span data-rapier-math-source="">' + literal + '</span>';
 			}
-			catch (_) { return '<span data-rapier-math-source="">' + literal + '</span>'; }
 		};
 		md.renderer.rules.math_inline = (tokens, idx, _opts, env) => _renderMath(tokens[idx].content, false, env, tokens[idx].meta?.mathSource);
 		md.renderer.rules.math_block  = (tokens, idx, _opts, env) => wrapDisplayMath(_renderMath(tokens[idx].content, true, env, tokens[idx].meta?.mathSource)) + '\n';
@@ -393,9 +429,10 @@ function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
 	const markdown = _rapierSplitOpeningFrontmatter(canonical).body;
 	// Source-semantic output is independent of installed rendering providers. Complete
 	// artifacts keep the default provider path and materialize their visual content.
-	const env = {...(options.page ? {rapierPage: true} : {}), ...(options.providers === false ? {rapierProviders: false} : {})};
-	env.rapierDocumentSpace = !!globalThis.RapierMarkdownSpec?.readDocumentSettings?.(canonical)?.space;
-	if (env.rapierDocumentSpace) root.setAttribute('data-md-space', '');
+	// A portable projection keeps natural sizing. Live readers opt into the same transient
+	// AUTO policy as the editor; neither a saved page nor its source inherits that choice.
+	const env = {rapierImagePresentation: options.imagePresentation === true, ...(options.page ? {rapierPage: true} : {}), ...(options.providers === false ? {rapierProviders: false} : {})};
+	if (options.mathEquations) env.rapierMathEquations = options.mathEquations;
 	let rendered = md
 		? md.render(markdown, env)
 		: '<pre><code>' + escapeRapierHtmlText(markdown) + '</code></pre>';
@@ -430,11 +467,10 @@ async function _rapierRenderSemanticRootAsync(canonical, metadata, options = {})
 	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))));
+	env = {...env, rapierImagePresentation: options.imagePresentation === true};
 	await pause(work, .3);
-	env.rapierDocumentSpace = !!globalThis.RapierMarkdownSpec?.readDocumentSettings?.(canonical)?.space;
 	const root = document.createElement('div'), part = document.createElement('div'), boundary = htmlBoundary();
 	root.setAttribute('data-rapier-semantic-root', 'true');
-	if (env.rapierDocumentSpace) root.setAttribute('data-md-space', '');
 	let html = '', began = performance.now(), complete = false;
 	const append = () => {
 		if (md.renderer.rapierTransformHtml) html = md.renderer.rapierTransformHtml(html);
@@ -653,16 +689,81 @@ function _rapierImageAltText(value, env = {}) {
 	return md.renderer.renderInlineAsText(tokens[0]?.children || [], md.options, env);
 }
 
-function _rapierImageSizeAttributes(size, marker) {
+// Intrinsic facts are a presentation input, never an authored width or a resource admission.
+// Contain both edges within the column, sharing a 1.6-column sum-of-edges budget.
+// Reciprocal portraits/landscapes have equal weight; the native-width cap never enlarges art.
+function _rapierImageGeometryFacts(geometry, automatic) {
+    const w = Number(geometry?.width), h = Number(geometry?.height);
+    const known = Number.isFinite(w) && Number.isFinite(h) && w > 0 && h > 0 && Number.isFinite(w / h) && w / h > 0;
+    const width = known ? w : 0, height = known ? h : 0;
+    const styles = known ? [['aspect-ratio', width + '/' + height]] : automatic ? [['aspect-ratio', '1/1']] : [];
+    if (automatic) {
+        const ratio = known ? width / height : 1;
+        const share = Math.min(1, ratio, 1.6 / (1 + 1 / ratio));
+        styles.push(['--rapier-image-auto-width', Number((share * 100).toFixed(6)) + '%'],
+            ['--rapier-image-natural-width', known ? width + 'px' : '100%']);
+    }
+    return {width, height, styles};
+}
+
+// Native loads supply their current element's dimensions synchronously. Embedded images
+// supply an admitted row only after their existing document/resource ticket checks.
+function _rapierApplyImageGeometry(image, geometry) {
+    if (image?.tagName !== 'IMG' || image.hasAttribute('data-rapier-html')) return false;
+    const mode = image.getAttribute('data-rapier-image-geometry');
+    if (!['auto', 'sized', 'natural'].includes(mode)) return false;
+    const native = geometry === undefined;
+    if (native) {
+        if (!image.isConnected || !image.complete || image.hasAttribute('data-rapier-asset') || image.hasAttribute('data-rapier-image-url')) return false;
+        geometry = {width: image.naturalWidth, height: image.naturalHeight};
+    }
+    const facts = _rapierImageGeometryFacts(geometry, mode === 'auto');
+    if (!facts.width || !facts.height) return false;
+    const attributes = [
+        ['data-rapier-natural-width', String(facts.width)], ['data-rapier-natural-height', String(facts.height)],
+        ...(!image.hasAttribute('data-rapier-image-size') ? [['width', String(facts.width)]] : []), ['height', String(facts.height)],
+    ].filter(([name, value]) => image.getAttribute(name) !== value);
+    const styles = facts.styles.filter(([name, value]) => (name === 'aspect-ratio'
+        ? image.style.getPropertyValue(name).replace(/\s/g, '') : image.style.getPropertyValue(name)) !== value);
+    // Ordinary mutations revisit mounted images. Settled facts need no source-URL
+    // read or parse (which can be the entire inline image), nor any DOM writes.
+    if (!attributes.length && !styles.length) return false;
+    if (native) {
+        const src = image.getAttribute('src'), current = image.currentSrc;
+        if (!src || !current) return false;
+        try { if (src !== current && new URL(src, image.ownerDocument.baseURI).href !== current) return false; }
+        catch (_) { return false; }
+    }
+    for (const [name, value] of attributes) image.setAttribute(name, value);
+    for (const [name, value] of styles) image.style.setProperty(name, value);
+    return true;
+}
+
+function _rapierImageSizeAttributes(size, marker, geometry, automatic = true) {
     const layout = globalThis.RapierMarkdownLayout.parseLayout(marker || '');
     // Plain (rung 0, docs/standard-adoption.md): every picture renders at its natural width, the
     // same as a reader with no layout facts at all -- Obsidian's `![alt|N]` alt-text width (the
     // `size` fallback below) is a different, established convention and is unaffected.
-    const style = layout && !_rapierPlainLayout() ? globalThis.RapierMarkdownLayout.imageStyle(layout) : '';
-    if (layout?.width != null && style) return ' data-md-image-width="' + layout.width + '" style="' + style + '"';
+    let style = layout && !_rapierPlainLayout() ? globalThis.RapierMarkdownLayout.imageStyle(layout) : '';
+    let attributes = '';
+    if (layout?.width != null && style) attributes = ' data-md-image-width="' + layout.width + '"';
     // A fade rides beside any width, the alt-text's own included.
-    return size ? ' width="' + size.width + '" data-rapier-image-size="' + size.width +
-        '" style="--md-image-width:' + size.width + 'px' + (style ? ';' + style : '') + '"' : style ? ' style="' + style + '"' : '';
+    else if (size) {
+        attributes = ' width="' + size.width + '" data-rapier-image-size="' + size.width + '"';
+        style = '--md-image-width:' + size.width + 'px' + (style ? ';' + style : '');
+    }
+    if (geometry !== undefined) {
+        const mode = size || layout?.width != null || layout?.lines != null ? 'sized' : automatic ? 'auto' : 'natural';
+        const facts = _rapierImageGeometryFacts(geometry, mode === 'auto');
+        attributes += ' data-rapier-image-geometry="' + mode + '"';
+        if (facts.width) {
+            attributes += ' data-rapier-natural-width="' + facts.width + '" data-rapier-natural-height="' + facts.height + '"';
+            if (!size || !attributes.includes(' width=')) attributes += ' width="' + facts.width + '"';
+            attributes += ' height="' + facts.height + '"';
+        }
+        style = [...facts.styles.map(([name, value]) => name + ':' + value), ...(style ? [style] : [])].join(';');
+    }
+    return attributes + (style ? ' style="' + style + '"' : '');
 }
 
 function _rapierRawHtmlFragment(source, rewrite, parser) {
@@ -1216,7 +1317,8 @@ function* _rapierProjectPortableNodesSteps(semanticRoot, options) {
 					(name === 'data-rapier-remote-src' || name === 'data-rapier-remote-alt')) continue;
 			if (keepLayoutData && (name === 'data-rapier-image-layout' || name === 'data-md-layout' || name === 'data-md-align' || name === 'data-rapier-ink'
 					|| name === 'data-md-first-line-end' || name === 'data-md-initial-font' || name === 'data-md-initial-size'
-					|| name === 'data-md-picture-cap-height' || name === 'data-md-picture-cap-top')) continue;
+					|| name === 'data-md-picture-cap-height' || name === 'data-md-picture-cap-top' || name === 'data-rapier-highlight' || name === 'data-rapier-animation'
+					|| name === 'data-rapier-list-ordinal' || name === 'data-rapier-list-delimiter' || name === 'data-md-layout-tight')) continue;
 			if (name === 'class' || name === 'style' || name.startsWith('data-')
 					|| name === 'contenteditable' || name === 'spellcheck'
 					|| name === 'tabindex' || name === 'disabled' || name === 'aria-disabled') {
@@ -1627,8 +1729,21 @@ function _rapierBidiStrong(cp) {
 	return null;
 }
 
-  return {_rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
+// A consuming operation, not an editable DOM mode. Both outputs share one admitted
+// parse per equation; callers decide whether and how to expose the MathML to people.
+function renderWithMathML(source, metadata = {}) {
+	const provider = _rapierProviders.math;
+	if (!provider || provider.status !== 'ready' || typeof provider.renderToString !== 'function' ||
+		typeof provider.renderWithMathML !== 'function')
+		throw new Error('The Rapier Math shared-result renderer is unavailable.');
+	if (!md) initMarkdownIt();
+	const equations = [];
+	const html = _rapierRenderSemanticRoot(source, metadata, {mathEquations: equations}).innerHTML;
+	return {html, equations};
+}
+
+  return {renderWithMathML, _rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierApplyImageGeometry, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
 }
 export {RAPIER_TABLE_CAPTION_PREFIX_RE as tableCaptionPrefix, RAPIER_PORTABLE_HIGHLIGHT_HEX as portableHighlightHex, _RAPIER_RTL_SCRIPT as rtlScripts, createMarkdownRenderer};
 
-export {mountHtmlBlocks, htmlImageRecord, htmlLayoutEdit};
+export {mountHtmlBlocks, materializeObjects, objectPosterLabel, htmlImageRecord, htmlLayoutEdit, htmlModeEdit, mergeHtmlObjectBlocks};