rapier-markdown-kit 1.1.104 → 1.2.5

package/dist/spec/md-assets.mjs

@@ -22,7 +22,7 @@ export function installMarkdownImages(md) {
   const normalize = md.normalizeLink;
   // An exact base64 data URL contains no URI escapes or host name to normalize.
   // Preserve its spelling and avoid allocating one URI-normalizer item per raster byte.
-  md.normalizeLink = url => /^data:image\/(?:jxl|png|jpeg|webp|svg\+xml);base64,[A-Za-z0-9+/]+={0,2}$/i.test(url) ? url : normalize(url);
+  md.normalizeLink = url => /^data:image\/(?:jxl|png|jpeg|webp|gif|svg\+xml);base64,[A-Za-z0-9+/]+={0,2}$/i.test(url) ? url : normalize(url);
   const reference = md.block.ruler.__rules__.find(row => row.name === 'reference').fn;
   md.block.ruler.at('reference', (state, start, end, silent) => {
     if (silent) return reference(state, start, end, silent);
@@ -199,7 +199,7 @@ export function dataImage(url) {
   if (typeof url !== 'string' || url.length > IMAGE_LIMITS.sourceChars) return null;
   const prepared = preparedDefinitions.find(row => row.image.url === url)?.image;
   if (prepared) return {codec: prepared.codec, byteLength: prepared.byteLength, payloadStart: url.indexOf(',') + 1};
-  const match = /^data:(image\/(?:jxl|png|jpeg|webp|svg\+xml));base64,([A-Za-z0-9+/]+={0,2})$/i.exec(url);
+  const match = /^data:(image\/(?:jxl|png|jpeg|webp|gif|svg\+xml));base64,([A-Za-z0-9+/]+={0,2})$/i.exec(url);
   if (!match || match[2].length % 4) return null;
   const padding = match[2].endsWith('==') ? 2 : match[2].endsWith('=') ? 1 : 0;
   const byteLength = match[2].length / 4 * 3 - padding;
@@ -451,7 +451,7 @@ function occurrenceChange(image, splices) {
 
 // A permissive gate keeps ordinary typing out of full-document image parsing.
 // Recognition and retirement proof still belong to Markdown-it below.
-export function mayRetireImageDefinitions(source, splices, factory) {
+export function mayRetireImageDefinitions(source, splices, factory, hint) {
   const store = typeof source === 'string' ? null : source;
   // A definition's closing bracket is immediately followed by its colon (parseAssets uses the same necessary condition).
   if (store ? !store.contains(']:') || !store.contains('data:image/', true)
@@ -468,13 +468,36 @@ export function mayRetireImageDefinitions(source, splices, factory) {
     if (!row.removed && !row.inserted) return false;
     const start = original(row.pos, false, index), end = original(row.pos + row.removed.length, true, index);
     if (store) {
+      // No image use exists without this marker. A definition appendix alone must
+      // not make a prose keystroke join the document to prove that.
+      if (!store.contains('![')) return false;
       const from = Math.max(0, start - 8192);
       const local = store.readSlice(from, Math.min(store.length, end + 4));
       const image = local.lastIndexOf('![', end - from);
       const separator = Math.max(local.lastIndexOf('\n\n', start - from),
         local.lastIndexOf('\r\n\r\n', start - from), local.lastIndexOf('\r\r', start - from));
       if (image >= 0) return image + from >= start || separator < image;
-      return from > 0 && separator < 0;
+      const exclude = left => {
+        if (hint && splices.length === 1) hint.excluded = {start: left, end};
+        return false;
+      };
+      if (separator >= 0 || from === 0) return exclude(separator >= 0 ? from + separator + 4 : 0);
+      // Still inside a longer paragraph. Walk back in slices to the blank line.
+      // Finding an image there is the same "possible" answer as the 8KiB window;
+      // finding the break, or none, does not read the joined document.
+      let cursor = from;
+      while (cursor > 0) {
+        const sliceFrom = Math.max(0, cursor - 8192);
+        const chunk = store.readSlice(sliceFrom, Math.min(store.length, cursor + 3));
+        const limit = cursor - sliceFrom;
+        const sep = Math.max(chunk.lastIndexOf('\n\n', limit), chunk.lastIndexOf('\r\n\r\n', limit),
+          chunk.lastIndexOf('\r\r', limit));
+        const imageAt = chunk.lastIndexOf('![', limit);
+        if (imageAt >= 0 && (sep < 0 || imageAt > sep)) return true;
+        if (sep >= 0 || sliceFrom === 0) return exclude(sep >= 0 ? sliceFrom + sep + 4 : 0);
+        cursor = sliceFrom;
+      }
+      return false;
     }
     const image = source.lastIndexOf('![', end);
     return image >= 0 && (image >= start || Math.max(source.lastIndexOf('\n\n', start),
@@ -562,10 +585,10 @@ export function serializeAsset(asset) {
 }
 // Pure: re-derived at commit against the moved document; appends only at the text's end.
 // A replay supplies the retained definition's line ending instead of choosing one from later prose.
-export function appendAssetText(source, asset, lineEnding) {
+export function appendAssetText(source, asset, lineEnding, {preserveLabel = false} = {}) {
   if (typeof source !== 'string' || !asset || normalizeLabel(asset.label) !== asset.id) return fail('image_source_invalid');
   const parsed = documentAssets(source), title = assetTitle(asset.title);
-  const existing = [...parsed.assets.values()].find(row => row.url === asset.url && row.title === title);
+  const existing = !preserveLabel && [...parsed.assets.values()].find(row => row.url === asset.url && row.title === title);
   if (existing) return {source, id: existing.id, reference: existing.label, added: false, suffix: ''};
   const previous = parsed.references[asset.id];
   const block = serializeAsset(asset);

package/dist/spec/md-layout.mjs

@@ -152,6 +152,14 @@ export function imageStyle(value) {
 
 export const linesHeightCss = lines => lines === 1 ? '1cap' : 'calc(' + (lines - 1) + ' * var(--md-line, 1.6em) + 1cap)';
 
+// An HTML object has an outer clip box and an independent browser viewport.
+// SCALE keeps that authored viewport; REFLOW keeps measured content height.
+export function objectHeight(width, naturalHeight, attrs, line) {
+  if (attrs.height && attrs.height !== 'auto') return Math.min(4096, Number(attrs.height) * line);
+  const [w, h] = (attrs.viewport || '640x360').split('x').map(Number);
+  return attrs.resize === 'scale' ? Math.min(4096, width * h / w) : naturalHeight;
+}
+
 // Controls remain real DOM nodes while their surrounding text flows. A checkbox, link or
 // disclosure is not a reason to exclude its entire block from picture placement.
 export function wrapTextBlock(element) {
@@ -159,7 +167,7 @@ export function wrapTextBlock(element) {
     element.textContent.trim() && !element.querySelector('img,table,pre,figure,math,.math-rendered') ? element : null;
 }
 
-// The one wrap-owner rule (layout/browser.js, layout/interchange.js, editor/share.js): text after, else before, skipping pictures,
+// The one wrap-owner rule (layout/browser.js, kit/render.mjs, editor/share.js): text after, else before, skipping pictures,
 // metadata and empty paragraphs; any other block is a barrier in that direction.
 export function wrapNeighbour(node, classify) {
   for (const step of [n => n && n.nextElementSibling, n => n && n.previousElementSibling]) {

package/dist/spec/md-marks.mjs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// The one owner of inline typography, authored colour/font comments, ink and page breaks.
+// The one owner of inline typography, ink and page breaks.
 import {markdownSourcePositions} from './md-source.mjs';
 
 // The exported page retains this reader alone. The editor uses the same closure, then adds its writers and scans.
@@ -17,8 +17,8 @@ const inkReader = () => {
 	// size when the stroke was drawn and at the frame's offset from the words' box, both in hundredths of an em; w is the pen's width as Draw
 	// counts a nib (2 to 24; 9 is the default and is never written): the stroke is drawn 0.11 em wide at 9 and in proportion to w otherwise; PATH
 	// is the stroke, its first point absolute in the frame and the rest as moves, hundredths of an em. One spelling: the fields in this order,
-	// one space between, integers only. A comment that does not read this way is ordinary comment text and marks nothing. Ink pairs do not nest
-	// in each other. Arrow/end alone take a pairing number, an end takes no other data; under, strike and arrow may omit a path for a line
+	// one space between, integers only. A comment that does not read this way is ordinary comment text and marks nothing. Ink pairs nest:
+	// each closer takes the innermost open ink opener. Arrow/end alone take a pairing number, an end takes no other data; under, strike and arrow may omit a path for a line
 	// derived from their words.
 	const INK_KINDS = Object.freeze(['under', 'strike', 'ring', 'bracket', 'free', 'arrow', 'end']);
 
@@ -29,9 +29,6 @@ const inkReader = () => {
 		+ '(?: (' + INK_INT + ',' + INK_INT + '(?: ' + INK_INT + ',' + INK_INT + ')*))?';
 	const INK_OPEN_PATTERN = '<!--ink ' + INK_OPEN_BODY + '-->';
 
-	// Relocated into the parse Worker by .toString() with parseInkOpen and isInkClose (engine.js _buildParseWorkerSource):
-	// reads only its parameter and the planted INK_PATH_MAX, INK_INT_MAX and TEXT_COLOR_NAMES; parseInkOpen reads
-	// INK_OPEN_PATTERN and this function; isInkClose reads INK_CLOSE.
 	function readInkMatch(match) {
 		const linked = match[1] === 'arrow' || match[1] === 'end';
 		if (linked !== (match[2] != null) || (!linked && match[1] !== 'under' && match[1] !== 'strike' && match[9] == null)) return null;
@@ -69,73 +66,20 @@ const inkReader = () => {
 	}
 	return { TEXT_COLOR_NAMES, COLOR_NAME_ALT, COLOR_VALUE, INK_KINDS, INK_PATH_MAX, INK_INT_MAX, INK_OPEN_PATTERN, readInkMatch, parseInkOpen, parseInkBody };
 };
-const { TEXT_COLOR_NAMES, COLOR_NAME_ALT, COLOR_VALUE, INK_KINDS, INK_PATH_MAX, INK_INT_MAX, INK_OPEN_PATTERN, readInkMatch, parseInkOpen, parseInkBody } = inkReader();
+const { TEXT_COLOR_NAMES, COLOR_VALUE, INK_KINDS, INK_PATH_MAX, INK_INT_MAX, INK_OPEN_PATTERN, readInkMatch, parseInkOpen, parseInkBody } = inkReader();
 export { readInkMatch, parseInkOpen, parseInkBody };
 
 const TEXT_COLOR_HEX_TO_NAME = Object.freeze(
 	Object.fromEntries(Object.entries(TEXT_COLOR_NAMES).map(([name, hex]) => [hex, name]))
 );
-const COLOR_CLOSE = '<!--/c-->';
 const PAGE_BREAK_MARKER = '<!--md-break:v1 page-->';
 
-export { TEXT_COLOR_NAMES, TEXT_COLOR_HEX_TO_NAME, COLOR_CLOSE, PAGE_BREAK_MARKER };
-
-export function formatColorOpen(hex) {
-	return '<!--c ' + (TEXT_COLOR_HEX_TO_NAME[hex] || hex) + '-->';
-}
+export { TEXT_COLOR_NAMES, PAGE_BREAK_MARKER };
 
 export function formatColorRun(hex, content) {
 	return typography.wrap({color: hex}, content);
 }
 
-// Relocated into the parse Worker by .toString() (engine.js _buildParseWorkerSource): read only parameters, TEXT_COLOR_NAMES and COLOR_CLOSE.
-
-// Returns {hex, length in UTF-16 units} or null; not end-anchored.
-export function matchColorOpen(text) {
-	if (typeof text !== 'string') return null;
-	const match = new RegExp('^<!--c (#[0-9a-f]{6}|' + Object.keys(TEXT_COLOR_NAMES).join('|') + ')-->').exec(text);
-	if (!match) return null;
-	const value = match[1];
-	return { hex: value.charCodeAt(0) === 0x23 /* '#' */ ? value : TEXT_COLOR_NAMES[value], length: match[0].length };
-}
-
-export function parseColorOpen(comment) {
-	if (typeof comment !== 'string') return null;
-	const match = new RegExp('^<!--c (#[0-9a-f]{6}|' + Object.keys(TEXT_COLOR_NAMES).join('|') + ')-->$').exec(comment);
-	if (!match) return null;
-	const value = match[1];
-	return value.charCodeAt(0) === 0x23 /* '#' */ ? value : TEXT_COLOR_NAMES[value];
-}
-
-export function isColorClose(comment) {
-	return comment === COLOR_CLOSE;
-}
-
-export function scanColorMarkers(source) {
-	const text = String(source == null ? '' : source);
-	const scan = new RegExp('<!--c (?:(#[0-9a-f]{6})|(' + COLOR_NAME_ALT + '))-->|<!--/c-->', 'g');
-	const markers = [];
-	let match;
-	while ((match = scan.exec(text))) {
-		const hex = match[1] || (match[2] ? TEXT_COLOR_NAMES[match[2]] : null) || null;
-		markers.push({ start: match.index, end: match.index + match[0].length, hex });
-	}
-	return markers;
-}
-
-export function pairColorMarkers(source) {
-	return pairMarkers(source, 'color');
-}
-
-export function stripColorMarkers(text) {
-	return String(text == null ? '' : text).replace(new RegExp('<!--(?:c ' + COLOR_VALUE + '|/c)-->', 'g'), '');
-}
-
-export function hasColorMarker(text) {
-	return new RegExp('<!--(?:c ' + COLOR_VALUE + '|/c)-->').test(String(text == null ? '' : text));
-}
-
-export const FONT_CLOSE = '<!--/f-->';
 export const FONT_STACKS = Object.freeze({
 	sans: Object.freeze({stack: 'sans', css: '', word: ''}),
 	serif: Object.freeze({stack: 'serif', css: "Georgia,'Palatino Linotype',Palatino,'Times New Roman',Times,serif", word: 'Georgia'}),
@@ -144,8 +88,7 @@ export const FONT_STACKS = Object.freeze({
 	hand: Object.freeze({stack: 'hand', css: 'cursive', word: 'Segoe Print'}),
 });
 
-// A family is one font-table name, never a CSS list or an HTML fragment. These readers are also
-// relocated into the parse worker with FONT_CLOSE and their original function names.
+// A family is one font-table name, never a CSS list or an HTML fragment.
 export function normalizeFontFamily(value) {
 	if (typeof value !== 'string') return null;
 	const family = value.trim();
@@ -159,60 +102,13 @@ export function fontFamilyCss(value) {
 	return generic ? generic.css || "'Geist',system-ui,sans-serif" : '"' + family.replace(/[\\"]/g, '\\$&') + '"';
 }
 
-export function formatFontOpen(family) {
-	const name = normalizeFontFamily(family);
-	if (!name) throw new TypeError('font: use one family name');
-	return '<!--f ' + name + '-->';
-}
-
 export function formatFontRun(family, content) {
 	return typography.wrap({family}, content);
 }
 
-export function matchFontOpen(text) {
-	if (typeof text !== 'string') return null;
-	const match = /^<!--f ([^<>\r\n]{1,256})-->/.exec(text);
-	const family = match && normalizeFontFamily(match[1]);
-	return family ? {family, length: match[0].length} : null;
-}
-
-export function parseFontOpen(comment) {
-	const match = matchFontOpen(comment);
-	return match && match.length === comment.length ? match.family : null;
-}
-
-export function isFontClose(comment) {
-	return comment === FONT_CLOSE;
-}
-
-export function scanFontMarkers(source) {
-	const text = String(source ?? ''), markers = [];
-	const scan = /<!--(?:f [^<>\r\n]{1,256}|\/f)-->/g;
-	for (const match of text.matchAll(scan)) {
-		const family = match[0] === FONT_CLOSE ? null : parseFontOpen(match[0]);
-		if (family || match[0] === FONT_CLOSE) markers.push({start: match.index, end: match.index + match[0].length, family});
-	}
-	return markers;
-}
-
-export function pairFontMarkers(source, markers = null) {
-	return pairMarkers(source, 'font', markers);
-}
-
-export function stripFontMarkers(source) {
-	const text = String(source ?? '');
-	let result = '', at = 0;
-	for (const marker of scanFontMarkers(text)) { result += text.slice(at, marker.start); at = marker.end; }
-	return result + text.slice(at);
-}
-
-export function hasFontMarker(source) {
-	return scanFontMarkers(source).length > 0;
-}
-
 // One typed interpretation for source, DOM and native-file adapters. The worker carries this
 // exact factory and its explicit grammar inputs; no DOM, CSS evaluator or resource loader.
-export function createTypography({normalizeFontFamily, fontFamilyCss, parseColorOpen, parseFontOpen, FONT_STACKS}) {
+export function createTypography({normalizeFontFamily, fontFamilyCss, FONT_STACKS}) {
 	const LIMIT = 4096, DEPTH = 64;
 	const generics = {serif: 'serif', 'sans-serif': 'sans', monospace: 'mono', cursive: 'hand',
 		fantasy: 'fantasy', 'system-ui': 'system', 'ui-serif': 'ui-serif', 'ui-sans-serif': 'ui-sans-serif',
@@ -383,34 +279,23 @@ export function createTypography({normalizeFontFamily, fontFamilyCss, parseColor
 				const stack = []; let depth = 0, overflow = 0;
 				for (const token of block.children) {
 					if (token.type !== 'html_inline') { depth += token.nesting || 0; continue; }
-					const source = token.content, htmlClose = /^<\/span\s*>$/i.test(source);
-					const kind = htmlClose || /^<span(?=[\s>])/i.test(source) ? 'span'
-						: source === '<!--/c-->' || parseColorOpen(source) ? 'color'
-						: source === '<!--/f-->' || parseFontOpen(source) ? 'font' : '';
-					if (!kind) continue;
-					const close = htmlClose || source === '<!--/c-->' || source === '<!--/f-->';
+					const source = token.content, close = /^<\/span\s*>$/i.test(source);
+					if (!close && !/^<span(?=[\s>])/i.test(source)) continue;
 					if (overflow) { overflow += close ? -1 : 1; continue; }
 					if (!close) {
-						// Authored comment marks retain their original first-opener rule. Ordinary
-						// canonical spans nest; a repeated old opener remains an inert stray.
-						if (kind !== 'span' && stack.some(held => held.kind === kind)) continue;
 						if (stack.length === DEPTH) { overflow = 1; continue; }
-						const facts = kind === 'span' ? parseOpen(source, value => md.utils.unescapeAll(value.replace(/\\/g, '\\\\')))
-							: kind === 'color' ? normalize({color: parseColorOpen(source)}) : normalize({family: parseFontOpen(source)});
-						stack.push({token, kind, facts, depth, source}); continue;
+						const facts = parseOpen(source, value => md.utils.unescapeAll(value.replace(/\\/g, '\\\\')));
+						stack.push({token, facts, depth, source}); continue;
 					}
-					const held = stack.at(-1);
-					if (!held || held.kind !== kind) continue;
-					stack.pop();
-					if (!held.facts || depth !== held.depth) continue;
-					const type = kind === 'span' ? 'typography' : kind, opener = held.token;
+					const held = stack.pop();
+					if (!held || !held.facts || depth !== held.depth) continue;
+					const type = 'typography', opener = held.token;
 					opener.type = 'rapier_' + type + '_open'; opener.tag = 'span'; opener.nesting = 1; opener.content = '';
 					(opener.meta ||= {}).typography = Object.freeze({style: held.facts, open: held.source, close: source});
 					opener.attrSet('style', style(held.facts));
 					if (held.facts.color) opener.attrSet('data-md-color', held.facts.color);
 					if (held.facts.size) opener.attrSet('data-md-size', held.facts.size);
 					if (held.facts.family) opener.attrSet('data-md-font', held.facts.family.name);
-					if (kind === 'font') { opener.attrSet('data-md-font-open', encodeURIComponent(held.source)); opener.meta.mdFont = {source: held.source, family: held.facts.family.name}; }
 					token.type = 'rapier_' + type + '_close'; token.tag = 'span'; token.nesting = -1; token.content = '';
 					(token.meta ||= {}).typography = opener.meta.typography;
 				}
@@ -421,7 +306,7 @@ export function createTypography({normalizeFontFamily, fontFamilyCss, parseColor
 	return Object.freeze({size, color, family, familyCss, normalize, parseStyle, style, open, wrap, parseOpen, nodeStyle, runs, install});
 }
 
-export const typography = createTypography({normalizeFontFamily, fontFamilyCss, parseColorOpen, parseFontOpen, FONT_STACKS});
+export const typography = createTypography({normalizeFontFamily, fontFamilyCss, FONT_STACKS});
 export function typographySourceRanges(source, parser) { return markdownSourcePositions(source, parser).typography; }
 
 const INK_CLOSE = '<!--/ink-->';
@@ -485,7 +370,7 @@ export function matchInkOpen(text) {
 // The opener's body is what a rendered span carries (a renderer's sanitizer drops an attribute whose value holds the
 // comment's own close): the opener after `<!--ink ` and before `-->`, so the attribute reads `under red box=… 0,95 …`,
 // and only a body that reads as a mark goes back. Read and write through the same grammar, so an invalid body cannot
-// invent a mark. Relocated into the parse Worker with the three above: reads INK_OPEN_PATTERN and readInkMatch alone.
+// invent a mark.
 export function inkOpenBody(opener) {
 	if (typeof opener !== 'string') return null;
 	const match = new RegExp('^' + INK_OPEN_PATTERN + '$').exec(opener);
@@ -557,7 +442,7 @@ export function pairInkSpans(source, markers = null) {
 	return pairSpanMarkers(source, 'ink', markers);
 }
 
-// Colour and font keep their first opener; ink pairs each closer with the innermost opener. The shared range
+// Colour keeps its first opener; ink pairs each closer with the innermost opener. The shared range
 // shape lets custody owners keep every independent stroke, including strokes on identical words.
 export function pairMarkers(source, kind, markers = null) {
 	const paired = pairSpanMarkers(source, kind, markers);
@@ -585,8 +470,8 @@ export function pairMarkers(source, kind, markers = null) {
 	return { runs, strays, arrows };
 }
 
-// Where a Will marker may stand (docs/will.md, Conversion). A pair inside a fence, a raw block
-// (`<pre>`, `<div>`, a raw table cell) or the opening front matter is text: the line is quoted,
+// Where a Will marker may stand (docs/will.md, Conversion). A pair inside a fence, a raw HTML block
+// (until its blank line) or the opening front matter is text: the line is quoted,
 // and a Word or PDF writer that met it as a marker would govern the wrong region. The same frame
 // as spec/frontmatter.mjs, copied here so this grammar stays inside the MIT kit's closure.
 const WILL_BLOCK_TAGS = new Set('address article aside base basefont blockquote body caption center col colgroup dd details dialog dir div dl dt fieldset figcaption figure footer form frame frameset h1 h2 h3 h4 h5 h6 head header hr html iframe legend li link main menu menuitem nav noframes ol optgroup option p param search section summary table tbody td tfoot th thead title tr track ul'.split(' '));
@@ -724,7 +609,7 @@ function willQuotedWhere(stack) {
 			if (item.tags.includes('pre')) return 'raw-pre';
 			if (item.tags.includes('td') || item.tags.includes('th')) return 'raw-table';
 			if (item.tags.includes('div')) return 'raw-div';
-			return null;
+			return 'raw-html';
 		}
 	}
 	return null;
@@ -737,7 +622,7 @@ function willLeaf(stack) {
 
 // `spans` are [start, end) of marker lines in `source` (the Will reader's own offsets).
 // Returns the first quoted span, {start, end, where}, or null when every span may stand.
-// `where` is `fence`, `raw-pre`, `raw-div`, `raw-table` or `frontmatter`.
+// `where` is `fence`, `raw-pre`, `raw-div`, `raw-table`, `raw-html` (any other raw HTML block) or `frontmatter`.
 export function quotedWillSpan(source, spans) {
 	const text = String(source ?? '');
 	const marks = Array.isArray(spans) ? spans : [];
@@ -804,19 +689,13 @@ export function quotedWillSpan(source, spans) {
 }
 
 function pairSpanMarkers(source, kind, markers = null) {
-	if (kind !== 'ink' && kind !== 'color' && kind !== 'font') throw new TypeError('Unknown paired marker kind');
-	const color = kind === 'color', font = kind === 'font';
+	if (kind !== 'ink') throw new TypeError('Unknown paired marker kind');
 	const runs = [], strays = [], stack = [];
-	for (const marker of markers || (color ? scanColorMarkers(source) : font ? scanFontMarkers(source) : scanInkMarkers(source))) {
-		if (color ? marker.hex !== null : font ? marker.family !== null : !marker.close) {
-			if ((color || font) && stack.length) { strays.push(marker); continue; }
-			stack.push(marker);
-			continue;
-		}
+	for (const marker of markers || scanInkMarkers(source)) {
+		if (!marker.close) { stack.push(marker); continue; }
 		const open = stack.pop();
 		if (!open) { strays.push(marker); continue; }
-		runs.push({ start: open.start, end: marker.end, innerStart: open.end, innerEnd: marker.start,
-			...(color ? { hex: open.hex } : font ? {family: open.family} : { mark: open.mark }) });
+		runs.push({ start: open.start, end: marker.end, innerStart: open.end, innerEnd: marker.start, mark: open.mark });
 	}
 	strays.push(...stack);
 	runs.sort((a, b) => a.start - b.start);
@@ -897,7 +776,6 @@ export function isPageBreakLine(text) {
 	return typeof text === 'string' && /^<!--md-break:v1 page-->\r?$/.test(text);
 }
 
-// Also relocated by .toString(); reads only its own regex.
 export function isPageBreakBlock(text) {
 	return typeof text === 'string' && /^<!--md-break:v1 page-->\r?\n?$/.test(text);
 }

package/dist/spec/md-source.mjs

@@ -28,7 +28,11 @@ export function markdownSourcePositions(source, parser) {
     }
     return matched;
   });
-  const tokens = owner.parse(body, {});
+  // A core rule may rewrite an inline token's content after its children were parsed (a task item drops
+  // its `[ ] `). Map rows from the text the inline rules read.
+  const read = new WeakMap();
+  inline.parse = function (text, md, env, children) { read.set(children, text); return parser.inline.parse.call(this, text, md, env, children); };
+  const {tokens, cells} = markdownTableSources(body, owner, {}, lines);
   const readInline = (children, content, rawOffset) => {
     for (const child of children || []) {
       const span = observed.get(child);
@@ -50,20 +54,7 @@ export function markdownSourcePositions(source, parser) {
       }
     }
   };
-  let table = null;
   for (const token of tokens) {
-    if (token.type === 'tr_open' && token.map) {
-      // GFM unescapes a pipe before parsing a cell. Preserve that one-character projection and
-      // consume cells in order, so repeated cells and backticks across a separator never alias.
-      const start = lineAt(token.map[0]), end = lineAt(token.map[0] + 1), offsets = [];
-      let text = '';
-      for (let at = start; at < end; at++) {
-        if (source[at] === '\\' && source[at + 1] === '|') at++;
-        offsets.push(at); text += source[at] === '\0' ? '\ufffd' : source[at];
-      }
-      offsets.push(end); table = {text, offsets, at: 0};
-    }
-    if (token.type === 'tr_close') table = null;
     if (token.map && ['fence', 'code_block', 'html_block', 'reference_definition'].includes(token.type)) {
       const start = lineAt(token.map[0]), end = lineAt(token.map[1]);
       add(start, end);
@@ -81,29 +72,30 @@ export function markdownSourcePositions(source, parser) {
       }
       continue;
     }
-    if (token.type !== 'inline' || !token.content) continue;
+    const content = read.get(token.children) ?? token.content;
+    if (token.type !== 'inline' || !content) continue;
     let rawOffset;
     if (token.map) {
-      const offsets = [], starts = [], rows = token.content.split('\n');
+      const offsets = [], starts = [], spaces = [], rows = content.split('\n');
       let local = 0;
       for (let i = 0; i < rows.length; i++) {
-        const start = lineAt(token.map[0] + i), end = lineAt(token.map[0] + i + 1);
-        const at = source.slice(start, end).replace(/\0/g, '\ufffd').indexOf(rows[i]);
+        const start = lineAt(token.map[0] + i), end = lineAt(token.map[0] + i + 1), line = source.slice(start, end).replace(/\0/g, '\ufffd');
+        let at = line.indexOf(rows[i]), lead = 0;
+        // A container that consumes part of a tab leaves the rest as spaces the source does not hold.
+        // They all stand for that tab.
+        if (at < 0) { const rest = rows[i].replace(/^ +/, ''); lead = rows[i].length - rest.length; at = line.indexOf(rest); if (!lead || line[at - 1] !== '\t') at = -1; }
         if (at < 0) throw new Error('Markdown inline source mapping failed');
-        starts.push(local); offsets.push(start + at); local += rows[i].length + 1;
+        starts.push(local); spaces.push(lead); offsets.push(start + at - lead); local += rows[i].length + 1;
       }
       rawOffset = pos => {
         let row = starts.length - 1;
         while (row > 0 && starts[row] > pos) row--;
-        return offsets[row] + pos - starts[row];
+        return offsets[row] + Math.max(pos - starts[row], spaces[row] - 1);
       };
-    } else if (table) {
-      const at = table.text.indexOf(token.content, table.at);
-      if (at < 0) throw new Error('Markdown table source mapping failed');
-      table.at = at + token.content.length;
-      rawOffset = pos => table.offsets[at + pos];
+    } else if (cells.has(token)) {
+      rawOffset = cells.get(token);
     } else continue;
-    readInline(token.children, token.content, rawOffset);
+    readInline(token.children, content, rawOffset);
   }
   literal.sort((a, b) => a.start - b.start || b.end - a.end);
   const merged = [];
@@ -120,3 +112,54 @@ export function markdownSourcePositions(source, parser) {
   };
   return {isText, isComment: (start, end) => comments.get(start) === end, typography: typography.sort((a, b) => a.start - b.start)};
 }
+
+// Capture only table-cell provenance while the parser still owns container-adjusted row
+// bounds. Looking for cell text in a whole row aliases literal pipes and quote/list markers.
+export function markdownTableSources(source, parser, environment, lineStarts = null) {
+  const cells = new WeakMap();
+  if (!source.includes('|')) return {tokens: parser.parse(source, environment), cells};
+  const lines = lineStarts || [0];
+  if (!lineStarts) for (const row of source.matchAll(/\r\n?|\n/g)) lines.push(row.index + row[0].length);
+  const owner = Object.create(parser), block = Object.create(parser.block), ruler = Object.create(parser.block.ruler);
+  owner.block = block; block.ruler = ruler;
+  ruler.getRules = chain => parser.block.ruler.getRules(chain).map(rule => (state, start, end, silent) => {
+    const first = state.tokens.length, matched = rule(state, start, end, silent);
+    if (matched && !silent && state.tokens[first]?.type === 'table_open') {
+      let cell;
+      for (let at = first; at < state.tokens.length; at++) {
+        const token = state.tokens[at];
+        if (token.type === 'tr_open') {
+          const row = token.map[0], from = state.bMarks[row] + state.tShift[row];
+          const line = state.src.lastIndexOf('\n', from - 1) + 1;
+          cell = tableSource(state.src.slice(from, state.eMarks[row]), lines[row] + from - line);
+        } else if (token.type === 'inline' && cell) cells.set(token, cell(token.content));
+        else if (token.type === 'tr_close') cell = null;
+      }
+    }
+    return matched;
+  });
+  return {tokens: owner.parse(source, environment), cells};
+}
+
+function tableSource(row, base) {
+  const trim = row.trimStart();
+  base += row.length - trim.length; row = trim.trimEnd();
+  const offsets = [], stops = [];
+  let text = '', cursor = 0;
+  for (let at = 0; at < row.length; at++) {
+    if (row[at] === '\\' && row[at + 1] === '|') at++;
+    else if (row[at] === '|') stops.push(text.length);
+    offsets.push(base + at); text += row[at];
+  }
+  offsets.push(base + row.length);
+  let next = stops[0] === 0 ? 1 : 0;
+  if (next) cursor = 1;
+  if (stops.at(-1) !== text.length - 1) stops.push(text.length);
+  return content => {
+    const stop = stops[next++] ?? text.length, raw = text.slice(cursor, stop);
+    const start = Math.min(text.length, cursor + raw.length - raw.trimStart().length);
+    if (raw.trim() !== content) throw new Error('Markdown table source mapping failed');
+    cursor = stop + 1;
+    return pos => offsets[start + pos];
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rapier-markdown-kit",
-  "version": "1.1.104",
+  "version": "1.2.5",
   "description": "Read, render and write Self-contained Markdown: one .md file that carries its pictures, drawings and layout, and that any Markdown app can read. HTML renderer, stylesheet, text layout, Will/1 agent permissions, and an edit history with authorship and offline merge. MIT, no dependencies.",
   "keywords": [
     "markdown",

package/style.css

@@ -407,7 +407,7 @@
 	border-inline-start:3px dotted var(--md-color-line);
 	z-index:0;
 }
-.md-render:not([data-md-space]):not([data-md-space] *) :is(h1,h2,h3,h4,h5,h6)[data-rapier-list-through]:has(+:is(h1,h2,h3,h4,h5,h6)){--md-list-heading-after:var(--md-gap-heading-before)}
+.md-render :is(h1,h2,h3,h4,h5,h6)[data-rapier-list-through]:has(+:is(h1,h2,h3,h4,h5,h6)){--md-list-heading-after:var(--md-gap-heading-before)}
 .md-render li{margin:0 0 calc(var(--md-line) / 4)}
 .md-render li:last-child{margin-bottom:0}
 .md-render li>ul,.md-render li>ol{margin:calc(var(--md-line) / 4) 0 0}
@@ -499,8 +499,8 @@
 	vertical-align:middle;
 }
 .md-render p>.math-display-wrap{margin:calc(var(--md-line) / 4) 0 var(--md-gap-block)}
-.md-render:not([data-md-space]):not([data-md-space] *) p:has(>:is(.math-display-wrap,.rapier-hscroll--math):only-child){margin-bottom:var(--md-gap-block)}
-.md-render:not([data-md-space]):not([data-md-space] *) p>:is(.math-display-wrap,.rapier-hscroll--math):only-child{margin:0}
+.md-render p:has(>:is(.math-display-wrap,.rapier-hscroll--math):only-child){margin-bottom:var(--md-gap-block)}
+.md-render p>:is(.math-display-wrap,.rapier-hscroll--math):only-child{margin:0}
 /* Diagram MathML keeps the metrics used by its renderer. */
 .md-render math[display="block"]:not(svg *){font-size:1.12em}
 .md-render math:not([display="block"]):not(svg *){font-size:1em}
@@ -650,6 +650,9 @@ html[data-invert-image-alpha="off"] :is(img,.md-render svg.rapier-native-flowcha
 	vertical-align:middle;
 }
 .md-render img[data-rapier-image-size]{width:min(var(--md-image-width),100%);height:auto}
+/* AUTO stays relative to its column. Authored and gesture-owned inline sizing wins;
+   Plain reads the intrinsic attributes without rerendering ordinary image blocks. */
+html:not([data-layout="plain"]) .md-render img[data-rapier-image-geometry="auto"]{width:min(var(--rapier-image-auto-width),var(--rapier-image-natural-width));height:auto}
 .md-render img:is([data-rapier-asset],[data-rapier-image-url]):not([data-rapier-asset-state="ready"]){background:color-mix(in srgb,var(--md-color-text) 5%,transparent)}
 
 .md-render dl{margin:0 0 var(--md-gap-block)}
@@ -697,7 +700,7 @@ html[data-invert-image-alpha="off"] :is(img,.md-render svg.rapier-native-flowcha
 .md-render [data-md-color="#be185d"]{--md-color-dark:#f9a8d4}
 .md-render [data-md-color="#57606a"]{--md-color-dark:#aab1bb}
 .md-render abbr[title]{text-decoration:underline dotted;text-decoration-color:var(--md-color-text-muted);text-underline-offset:2px;cursor:help}
-.md-render ins{text-decoration:underline;color:var(--md-color-success)}
+.md-render :is(ins,u){text-decoration:underline;color:var(--md-color-success)}
 /* The document owns its selection accent, including on an exported page. */
 .md-render ::selection{background:color-mix(in srgb,var(--md-color-accent) 48%,transparent)}
 .md-render del,.md-render s{color:var(--md-color-text-muted);text-decoration:line-through}
@@ -747,52 +750,5 @@ html[data-invert-image-alpha="off"] :is(img,.md-render svg.rapier-native-flowcha
   .md-render [data-md-break]::after{content:none!important}
 }
 
-/* Authored spacing: one body line, native collapsed gaps, and whole-line block boxes. */
-:is(.md-render[data-md-space],[data-md-space] .md-render){
-	--md-list-heading-before:var(--md-line);
-	--md-list-heading-after:calc(var(--md-line) / 2);
-	--md-gap-paragraph:calc(var(--md-space-paragraph,.5) * var(--md-line));
-	--md-gap-heading-before:calc(var(--md-space-heading-before,1.5) * var(--md-line));
-	--md-gap-heading-after:calc(var(--md-space-heading-after,.5) * var(--md-line));
-	--md-gap-block:calc(var(--md-space-block,1) * var(--md-line));
-}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :where(p,h1,h2,h3,h4,h5,h6,ul,ol,blockquote,pre,details,dl,figure,.diagram-block,.math-display-wrap,.table-scroll-wrap,.rapier-hscroll,.md-space-block){
-	margin-block:var(--md-gap-block);
-	height:calc-size(auto,round(up,size,var(--md-line)));
-}
-:is(.md-render[data-md-space],[data-md-space] .md-render) .md-space-block{display:flow-root}
-:is(.md-render[data-md-space],[data-md-space] .md-render) p{margin-block:0 var(--md-gap-paragraph)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(h1,h2,h3,h4,h5,h6){margin-block:var(--md-gap-heading-before) var(--md-gap-heading-after)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(h2,h3){line-height:calc(2 * var(--md-line))}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(p[data-md-picture],p:has(>.math-display-wrap:only-child)){margin-block:var(--md-gap-block)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) p[data-md-picture]{line-height:0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(li,dd){margin-block:0 var(--md-gap-paragraph)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(li:last-child,dd:last-child){margin-block-end:0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) dt{margin-block:var(--md-gap-paragraph) 0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) blockquote{padding-block:calc(var(--md-line) / 2)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) .callout__label{margin-block:0 var(--md-gap-paragraph);height:auto}
-:is(.md-render[data-md-space],[data-md-space] .md-render) pre{padding-block:calc(var(--md-line) / 2 - 1px);line-height:var(--md-line)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) pre code{display:block;line-height:var(--md-line)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) pre[data-rapier-code-lines]{padding-block-start:calc(var(--md-line) * 1.5 - 1px)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) details{padding-block:calc(var(--md-line) / 2 - var(--md-hair));}
-:is(.md-render[data-md-space],[data-md-space] .md-render) summary{padding-block:0;line-height:var(--md-line)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) details[open]>summary{margin-block-end:var(--md-gap-paragraph)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) details[open]:not(:has(>:not(summary))){padding-block-end:calc(var(--md-line) * 1.5 - var(--md-hair))}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(th,td){line-height:var(--md-line);padding-block:calc(var(--md-line) / 2 - var(--md-hair) / 2);
-	border:0;border-inline-end:var(--md-hair) solid color-mix(in srgb,var(--md-color-line) 74%,transparent);border-block-end:var(--md-hair) solid color-mix(in srgb,var(--md-color-line) 74%,transparent)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) thead th{border-block-end:2px solid var(--md-color-line);padding-block-end:calc(var(--md-line) / 2 + var(--md-hair) / 2 - 2px)}
-:is(.md-render[data-md-space],[data-md-space] .md-render) table{margin-block:var(--md-gap-block);border:0;border-collapse:separate;border-spacing:0;outline:calc(2 * var(--md-hair)) solid var(--md-color-line);outline-offset:calc(-2 * var(--md-hair))}
-:is(.md-render[data-md-space],[data-md-space] .md-render) thead{outline:calc(2 * var(--md-hair)) solid var(--md-color-line);outline-offset:calc(-2 * var(--md-hair))}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(.table-scroll-wrap,.rapier-hscroll--table){padding-block:0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(.table-scroll-wrap,.rapier-hscroll)>:is(table,pre,.math-display-wrap),
-:is(.md-render[data-md-space],[data-md-space] .md-render) p>.math-display-wrap{margin-block:0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) hr{margin-block:var(--md-gap-block);height:var(--md-line);box-sizing:border-box}
-:is(.md-render[data-md-space],[data-md-space] .md-render)>:first-child,
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(blockquote,li,td,th,dd,details,.md-space-block)>:first-child{margin-block-start:0}
-:is(.md-render[data-md-space],[data-md-space] .md-render) :is(blockquote,td,th,dd,details,.md-space-block)>:last-child{margin-block-end:0}
-@media print{
-	:is(.md-render[data-md-space],[data-md-space] .md-render) pre[data-rapier-code-lines]{padding-block-start:calc(var(--md-line) / 2 - 1px)!important}
-}
-
 /* Authored run sizes supply their own line box; surrounding block rhythm is unchanged. */
 .md-render [data-md-size]{line-height:normal}