rapier-markdown-kit 1.1.93 → 1.1.95

package/dist/kit/render-markdown.mjs

@@ -673,9 +673,9 @@ function _rapierAssignHeadingSlugs(root, selector, reserveExisting) { return fin
 function* _rapierAssignHeadingSlugsSteps(root, selector = RAPIER_RENDERED_HEADING_SELECTOR, reserveExisting = true) {
 	if (!root || !root.querySelectorAll) return;
 	const used = Object.create(null);
-	const headings = Array.from(root.querySelectorAll(selector)).concat(_rapierDormantHeadings(root, selector));
+	const headings = _rapierDormantHeadings(root, selector, true);
 	const headingSet = new Set(headings);
-	if (reserveExisting) for (const element of (root.isConnected ? document : root).querySelectorAll('[id]')) { yield;
+	if (reserveExisting) for (const element of _rapierDormantHeadings(root.isConnected ? document : root, '[id]', true)) { yield;
 		if (!headingSet.has(element) && element.id) used[element.id] = 0;
 	}
 	for (const heading of headings) { yield;
@@ -687,8 +687,8 @@ function _rapierDisambiguateRenderedAnchors(root) { return finish(_rapierDisambi
 
 function* _rapierDisambiguateRenderedAnchorsSteps(root) {
 	if (!root || !root.querySelectorAll) return;
-	const headings = new Set(root.querySelectorAll(RAPIER_RENDERED_HEADING_SELECTOR));
-	const candidates = Array.from(root.querySelectorAll('[id]'))
+	const headings = new Set(_rapierDormantHeadings(root, RAPIER_RENDERED_HEADING_SELECTOR, true));
+	const candidates = _rapierDormantHeadings(root, '[id]', true)
 		.filter(element => !headings.has(element));
 	for (const element of candidates) { yield;
 		const original = _rapierRenderedAnchorOriginalIds.get(element);
@@ -718,7 +718,7 @@ function* _rapierDisambiguateRenderedAnchorsSteps(root) {
 	const add = (map, key, link) => { if (!map.has(key)) map.set(key, new Set()); map.get(key).add(link); };
 	for (const selector of ['.footnote-ref a[href^="#"]', '.footnote-backref[href^="#"]']) {
 		const index = {hash: new Map(), label: new Map(), order: new Map()};
-		for (const link of root.querySelectorAll(selector)) {
+		for (const link of _rapierDormantHeadings(root, selector, true)) {
 			index.order.set(link, index.order.size);
 			add(index.hash, _rapierDecodeHash(link.getAttribute('href')), link);
 			add(index.label, link.getAttribute('data-footnote-label'), link);
@@ -1022,6 +1022,11 @@ function* _rapierProjectPortableRootSteps(semanticRoot, options) {
 	const root = yield* cloneTree(semanticRoot), nativeElements = new Set();
 	// A source soft break is a reading space, never the editor's invisible token.
 	yield* _rapierResolveSoftBreakTokensSteps(root);
+	// Word consumes these source-bearing islands as pictures with TeX alternatives. Keep
+	// their SVG through this projection; the normal export sanitizer still owns admission.
+	if (opts.keepMath) for (const math of root.querySelectorAll('.math-rendered[data-math-src],.math-placeholder,[data-rapier-math-source]')) {
+		for (const element of [math, ...math.querySelectorAll('*')]) nativeElements.add(element);
+	}
 	if (opts.keepDiagrams) for (const figure of root.querySelectorAll('.diagram-block[data-diagram-native]')) {
 		const svg = figure.querySelector('.diagram-cache > svg.rapier-native-flowchart');
 		if (figure.getAttribute('data-diagram-state') === 'ready' && svg) {
@@ -1049,6 +1054,13 @@ function* _rapierProjectPortableRootSteps(semanticRoot, options) {
 	}
 
 	for (const wrapper of root.querySelectorAll('.math-display-wrap')) { yield;
+		if (opts.keepMath && wrapper.querySelector('.math-rendered,.math-placeholder,[data-rapier-math-source]')) {
+			const paragraph = document.createElement('p');
+			paragraph.setAttribute('data-md-align', 'center');
+			while (wrapper.firstChild) paragraph.appendChild(wrapper.firstChild);
+			wrapper.replaceWith(paragraph);
+			continue;
+		}
 		const source = _rapierMathSource(wrapper);
 		const p = document.createElement('p');
 		const code = document.createElement('code');
@@ -1057,6 +1069,7 @@ function* _rapierProjectPortableRootSteps(semanticRoot, options) {
 		wrapper.replaceWith(p);
 	}
 	for (const math of root.querySelectorAll('.math-rendered,.math-placeholder')) { yield;
+		if (nativeElements.has(math)) continue;
 		const code = document.createElement('code');
 		code.textContent = _rapierMathSource(math) || '[equation]';
 		math.replaceWith(code);

package/dist/kit/render-print.mjs

@@ -247,6 +247,7 @@ async function _rapierWritePrintPdf({root, css, canonical, filename, title, sett
 			'max-width': 'none', 'min-height': '0', padding: '0', margin: '0', overflow: 'visible',
 			'column-width': bodyWidth + 'px', 'column-gap': '0', 'column-count': 'auto', 'column-fill': 'auto'}))
 			main.style.setProperty(name, value, 'important');
+		globalThis.RapierMath?.fit(main);
 		const count = Math.max(1, Math.ceil((main.scrollWidth - 1) / bodyWidth));
 		if (!Number.isSafeInteger(count)) refuse('pdf_page_geometry_invalid');
 		const textPages = await _rapierPrintTextPages(main, bodyWidth, count, check);
@@ -310,18 +311,34 @@ async function _rapierWritePrintPdf({root, css, canonical, filename, title, sett
 // its line and page boundaries keeps a PDF search on the page that carries those words.
 async function _rapierPrintTextPages(main, pageWidth, count, check) {
 	const into = main.ownerDocument, origin = main.getBoundingClientRect();
-	const pages = Array.from({length: count}, () => []), walker = into.createTreeWalker(main, 4);
+	const pages = Array.from({length: count}, () => []);
+	// The renderer's outlines have no text ranges. Read each equation's exact TeX
+	// alternative at its SVG box, and reject its subtree so titles cannot duplicate it.
+	const walker = into.createTreeWalker(main, 5, {acceptNode(node) {
+		if (node.parentElement?.closest('.math-rendered svg[aria-label]')) return 2;
+		return node.nodeType === 3 || node.matches('.math-rendered svg[aria-label]') ? 1 : 3;
+	}});
 	const range = into.createRange();
+	const pageOf = x => Math.max(0, Math.min(count - 1, Math.floor((x - origin.left + .01) / pageWidth)));
 	let nodes = 0, operations = 0;
 	for (let node; (node = walker.nextNode());) {
 		if (++nodes % 128 === 0) { await new Promise(resolve => setTimeout(resolve, 0)); check(); }
-		const style = into.defaultView.getComputedStyle(node.parentElement);
+		const math = node.nodeType === 1;
+		const style = into.defaultView.getComputedStyle(math ? node : node.parentElement);
 		if (style.visibility === 'hidden' || style.visibility === 'collapse') continue;
+		if (math) {
+			const rect = node.getBoundingClientRect(), text = node.getAttribute('aria-label');
+			if (rect.width > 0 && rect.height > 0 && text) {
+				const page = pageOf(rect.left);
+				pages[page].push({text, x: rect.left - origin.left - page * pageWidth, y: rect.top - origin.top,
+					width: rect.width, height: rect.height, math: true});
+			}
+			continue;
+		}
 		const preserve = /pre|break-spaces/.test(style.whiteSpace);
 		const block = node.parentElement.closest('p,h1,h2,h3,h4,h5,h6,li,pre,td,th,figcaption,blockquote,.rapier-will-carrier') || node.parentElement;
 		const carrier = node.parentElement.closest('.rapier-will-carrier');
 		const value = node.data;
-		const pageOf = x => Math.max(0, Math.min(count - 1, Math.floor((x - origin.left + .01) / pageWidth)));
 		const visit = (start, end) => {
 			if (++operations % 128 === 0) check();
 			range.setStart(node, start); range.setEnd(node, end);
@@ -340,7 +357,7 @@ async function _rapierPrintTextPages(main, pageWidth, count, check) {
 			const right = Math.max(...rects.map(rect => rect.right)) - origin.left - page * pageWidth;
 			const bottom = Math.max(...rects.map(rect => rect.bottom)) - origin.top;
 			const last = pages[page].at(-1);
-			if (last && last.block === block && last.carrier === carrier && Math.abs(last.y - y) < Math.max(2, Math.min(last.height, bottom - y) * .2)) {
+			if (last && !last.math && last.block === block && last.carrier === carrier && Math.abs(last.y - y) < Math.max(2, Math.min(last.height, bottom - y) * .2)) {
 				last.text = preserve ? last.text + text : (last.text + text).replace(/[ \t\r\n\f]+/g, ' ');
 				last.width = Math.max(last.x + last.width, right) - Math.min(last.x, x);
 				last.height = Math.max(last.y + last.height, bottom) - Math.min(last.y, y);
@@ -404,7 +421,9 @@ async function writeRasterPdf({pages, textPages, canonical, filename, title, fon
 			const value = characters.map(character => codes.get(character.codePointAt(0)).toString(16).padStart(4, '0')).join('');
 			const size = Math.max(.1, run.height * .75);
 			const scale = run.width * .75 / (characters.length * size * .5) * 100;
+			if (run.math) commands += '/Span << /ActualText <feff' + hex(run.text) + '> >> BDC\n';
 			commands += `BT\n/F1 ${decimal(size)} Tf\n${decimal(scale)} Tz\n3 Tr\n1 0 0 1 ${decimal(margins.left + run.x * .75)} ${decimal(height - margins.top - (run.y + run.height * .8) * .75)} Tm\n<${value}> Tj\nET\n`;
+			if (run.math) commands += 'EMC\n';
 		}
 		if (numberFont) commands += `BT\n/F2 9 Tf\n0 Tr\n1 0 0 1 ${decimal(width / 2 - String(index + 1).length * 2.5)} ${decimal(margins.bottom / 2)} Tm\n(${index + 1}) Tj\nET\n`;
 		const content = stream('/Filter /FlateDecode', await compressed(encode(commands)));

package/dist/kit/render-sanitize.mjs

@@ -423,16 +423,32 @@ function _rapierCssPresentationIsRemote(property, value) {
 	return declaration.length ? _rapierDropRemoteDeclarations(declaration) : false;
 }
 
+// A reference with no scheme and no host of its own ("photo.png", "#top", each word of a class) resolves on the base's scheme and
+// host whatever its path, so its answer is the base's, found once for each base and page: a long document's render asked
+// this of every token of every attribute, a URL built each time.
+const relativeReference = {base: null, here: null, origin: ''};
 function _rapierRemoteSubresourceOrigin(value) {
 	const raw = String(value == null ? '' : value)
 		.replace(/[\u0009\u000a\u000d]+/g, '').replace(/^[\u0000-\u0020]+|[\u0000-\u0020]+$/g, '');
 	if (!raw) return '';
+	if (!/^[a-z][a-z0-9+.\-]*:/i.test(raw) && !/^[\\/]{2}/.test(raw)) {
+		const base = document.baseURI, here = location.protocol.toLowerCase() + '//' + location.host;
+		if (relativeReference.base !== base || relativeReference.here !== here) {
+			relativeReference.origin = _rapierRemoteSubresourceOriginOf('a', base, here);
+			relativeReference.base = base; relativeReference.here = here;
+		}
+		return relativeReference.origin;
+	}
+	return _rapierRemoteSubresourceOriginOf(raw, document.baseURI, location.protocol.toLowerCase() + '//' + location.host);
+}
+
+function _rapierRemoteSubresourceOriginOf(raw, base, here) {
 	let url;
-	try { url = new URL(raw, document.baseURI); } catch (_) { return ''; }
+	try { url = new URL(raw, base); } catch (_) { return ''; }
 	const host = String(url.host || '');
 	if (!host) return '';
 	const place = String(url.protocol || '').toLowerCase() + '//' + host;
-	return place === location.protocol.toLowerCase() + '//' + location.host ? '' : place;
+	return place === here ? '' : place;
 }
 
 function _rapierStyleWithoutRemoteUrls(value) {

package/dist/kit/render-styles.mjs

@@ -56,7 +56,7 @@ function _rapierDocumentPrintCss(hostSelector) {
 	${list('.md-render pre','.artifact-flat')}{white-space:pre-wrap!important;overflow-wrap:anywhere!important;word-break:break-word!important;overflow:visible!important;max-height:none!important}
 	${p('.artifact-flat')}{margin:0;font:400 12pt/1.55 var(--md-font-sans);tab-size:2}
 	${p('.artifact-flat--code')}{font:400 10pt/1.5 var(--md-font-mono)}
-	${p('.table-scroll-wrap')}{overflow:visible!important;padding:0!important}
+	${list('.table-scroll-wrap','.math-display-wrap')}{overflow:visible!important;padding:0!important}
 	${list('.table-scroll-wrap table','.md-render table')}{width:100%!important;min-width:0!important;max-width:100%!important;table-layout:auto}
 	${list('.md-render th','.md-render td')}{overflow-wrap:anywhere;word-break:normal}
 	${p('.md-render thead')}{display:table-header-group}

package/dist/kit/render.mjs

@@ -48,7 +48,7 @@ async function _rapierBuildArtifact(options, providedContext) {
 	if (opts.kind === 'standalone') {
 		if (context.semanticRoot.querySelector('.math-placeholder'))
 			throw new Error('Web page not written; the math plug-in is required to include its equations');
-		// MathJax represents invalid TeX as a static error SVG. A source-only span means
+		// Invalid TeX renders as a static error SVG. A source-only span means
 		// rendering itself failed, so publishing it would silently omit the equation.
 		if (context.semanticRoot.querySelector('span[data-rapier-math-source]'))
 			throw new Error('Web page not written; a required equation could not be rendered');

package/dist/layout/model.mjs

@@ -375,13 +375,13 @@ export function slotsForBand(width, obstacles, top, height, minWidth = 40) {
 
 // A picture moves a block's words only where its outline (with its standoff) meets them. The block is laid as it lies with no
 // picture beside it, balanced and aligned in the whole column; when no line of words there meets an obstacle, that is its
-// layout. Otherwise its lines flow around the outline. A block set from the side its lines start on, and not balanced, lies
-// the same both ways whenever the outline misses its words, so it is laid once.
+// layout. Otherwise its lines flow around the outline. A short heading can fit beside the outline in a slot narrower
+// than minWidth, so start-aligned, unbalanced words need the same contact check.
 export function flowLines(flow, width, top, obstacles, lineHeight, minWidth, direction = 'ltr', balance = 0, align = 'start') {
   const plan = linePlan(flow, width, top, obstacles, lineHeight, minWidth, direction, balance, slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
   const side = align === 'center' ? 'center' : align === 'left' || align === 'right' ? align
     : (align === 'end') === (direction === 'rtl') ? 'left' : 'right';
-  if (!plan || !obstacles?.length || !balance && side === (direction === 'rtl' ? 'right' : 'left')) return plan;
+  if (!plan || !obstacles?.length) return plan;
   const free = linePlan(flow, width, top, [], lineHeight, minWidth, direction, balance, slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
   if (!free) return plan;
   const meets = free.lines.some(line => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rapier-markdown-kit",
-  "version": "1.1.93",
+  "version": "1.1.95",
   "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

@@ -467,6 +467,8 @@
 	-webkit-overflow-scrolling:touch;
 	text-align:center;
 }
+.md-render .math-display-wrap:has(svg[data-rapier-math]){overflow:visible}
+.md-render svg[data-rapier-math]{max-width:100%;height:auto}
 .md-render .math-display-wrap>math{
 	display:inline-block;
 	width:auto;