rapier-markdown-kit 1.2.29 → 1.2.31

package/dist/kit/conformance/README.md

@@ -1,7 +1,7 @@
 # The conformance kit
 
 Thirteen small documents, each covering one placement fact from [the Markdown
-standard](https://rapier.website/markdown-standard): inline (no layout comment), width/x/align, `wrap=around`
+standard](https://github.com/jackskip22/rapier/blob/main/docs/markdown-standard.md): inline (no layout comment), width/x/align, `wrap=around`
 with a real alpha silhouette, `wrap=box`, `behind`, `front`, `rotate=` on a plain raster, a foreign
 SVG "drawing" already turned in its own bytes, a ring drawing whose unfilled interior takes a line of
 text, both-sides wrapping around a centred picture, the neighbour search skipping a second, unrelated

package/dist/kit/render-markdown.mjs

@@ -1054,6 +1054,8 @@ function _rapierRemoveCalloutMarker(first) {
 	);
 }
 
+const mathSource = /^\$\$[\s\S]+\$\$$|^\$[^$\n]+\$$/;
+
 function _rapierMathSource(node) {
 	if (!node) return '';
 	const carrier = node.matches && node.matches('[data-math-src]')
@@ -1404,7 +1406,7 @@ function* _rapierPortableInlineTextSteps(node, options) {
 	}
 	if (tag === 'CODE' && !opts.inPre) {
 		const source = String(node.textContent || '');
-		return opts.visible ? source : source ? '`' + source + '`' : '';
+		return opts.visible || mathSource.test(source) ? source : source ? '`' + source + '`' : '';
 	}
 	const parts = [];
 	for (let child = node.firstChild; child; child = child.nextSibling) parts.push(yield* _rapierPortableInlineTextSteps(child, opts));

package/dist/kit/render-print.mjs

@@ -171,6 +171,31 @@ function _rapierPrintWillPageCss() {
 
 const CAPTURE_EDGE = 4096, CAPTURE_PIXELS = 4 * 1024 * 1024;
 
+function wrapMasks(main) {
+	const doc = main.ownerDocument;
+	for (const float of main.querySelectorAll('.rapier-wrap-picture')) {
+		const image = float.querySelector('img'), layout = decodeURIComponent(image?.getAttribute('data-rapier-image-layout') || '');
+		if (!image || !/\bwrap=around\b/.test(layout) || /\b(rotate|y)=/.test(layout) || image.dataset.rapierContour?.endsWith('-box')) continue;
+		if (/^(inset|polygon)\(/.test(float.style.getPropertyValue('shape-outside'))) continue;
+		const bounds = image.getBoundingClientRect(), width = Math.ceil(bounds.width), height = Math.ceil(bounds.height);
+		float.style.removeProperty('shape-outside');
+		if (!(width > 0 && height > 0) || width * height > 4e6) continue;
+		const canvas = doc.createElement('canvas');
+		canvas.width = width; canvas.height = height;
+		try {
+			const context = canvas.getContext('2d', {willReadFrequently: true});
+			context.drawImage(image, 0, 0, width, height);
+			const alpha = context.getImageData(0, 0, width, height).data;
+			let clear = false;
+			for (let index = 3; index < alpha.length && !clear; index += 4) clear = alpha[index] < 250;
+			if (!clear) continue;
+			float.style.setProperty('shape-outside', 'url("' + canvas.toDataURL('image/png') + '")');
+			float.style.setProperty('shape-image-threshold', '0.1');
+			float.style.setProperty('shape-margin', '1rem');
+		} catch (_) {  }
+	}
+}
+
 async function _rapierWritePrintPdf({root, css, fontCss = '', canonical, bom = false, filename, title, settings, templatePage = null}, {capture, signal, current, maxBytes = 8 * 1024 * 1024, film, ink} = {}) {
 	const refuse = code => { throw Object.assign(new Error(code), {code}); };
 	const check = () => {
@@ -240,6 +265,7 @@ async function _rapierWritePrintPdf({root, css, fontCss = '', canonical, bom = f
 		if (fontCss) await step(waitForFonts(main, {fontCss, css, settings}));
 		await step(into.fonts.ready);
 		for (const image of main.querySelectorAll('img')) { image.loading = 'eager'; await step(image.decode()); }
+		wrapMasks(main);
 		check();
 		for (const node of [main, ...main.querySelectorAll('*')]) {
 			const style = into.defaultView.getComputedStyle(node);

package/dist/kit/render-styles.mjs

@@ -16,7 +16,7 @@ body{
 	--color-text-subtle:var(--md-color-text-subtle);--color-accent-text:var(--md-color-accent-text);
 	margin:0;background:var(--md-color-bg);color:var(--md-color-text);font-family:var(--md-font-sans);-webkit-font-smoothing:antialiased
 }
-.rapier-page{width:min(100%,calc(var(--md-measure,39.6rem) + 32px));margin:0 auto;padding:48px 16px 72px}
+.rapier-page{width:min(100%,calc(var(--md-measure,39.6rem) + 32px));margin:0 auto;padding:48px 16px 72px;isolation:isolate}
 .rapier-page [id]{scroll-margin-top:var(--md-space-8)}
 .artifact-flat{margin:0;white-space:pre-wrap;overflow-wrap:anywhere;tab-size:2}
 .artifact-flat--text{font:var(--md-fw-regular) 1rem/1.7 var(--md-font-sans)}

package/dist/kit/render.mjs

@@ -763,7 +763,7 @@ function* _rapierSharedPageLayoutSteps(root) {
 			if (layout.width != null || image.getAttribute('width')) image.style.width = '100%';
 		}
 		if (layout.rotate) { image.style.transform = 'rotate(' + layout.rotate + 'deg)'; image.style.transformOrigin = '50% 50%'; }
-		if (layout.wrap === 'around' && !layout.rotate && !layout.y && !image.dataset.rapierContour?.endsWith('-box')) {
+		if (layout.wrap === 'around' && !layout.rotate && !layout.y && layout.width == null && !image.dataset.rapierContour?.endsWith('-box')) {
 			const src = image.getAttribute('src');
 			if (src) {
 				paragraph.style.setProperty('shape-outside', 'url("' + src + '")');

package/dist/spec/md-assets.mjs

@@ -515,9 +515,10 @@ export function retireDeletedImageDefinitions(before, after, splices, factory) {
     return retired.sort((a, b) => b.start - a.start).map(row => {
       const gap = /(?:\r\n\r\n|\n\n|\r\r)$/.exec(after.slice(Math.max(0, row.start - 4), row.start));
       let tail = after.slice(row.end);
+      const last = /^(?:\r\n|\n|\r)?$/.test(tail);
       for (const other of retired) if (other.start >= row.end) tail = tail.replace(other.source, '');
       const whole = gap && !/\S/.test(tail) && row.start - gap[0].length > markdownBodyOffset(after);
-      return whole ? {pos: row.start - gap[0].length, removed: gap[0] + row.source, inserted: ''} : {pos: row.start, removed: row.source, inserted: ''};
+      return whole ? {pos: row.start - gap[0].length, removed: gap[0] + row.source + (last ? after.slice(row.end) : ''), inserted: ''} : {pos: row.start, removed: row.source, inserted: ''};
     });
   } catch (_) { return []; }
 }

package/package.json

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

@@ -335,8 +335,10 @@
 	   depend on it would go wrong quietly. */
 	color: inherit;
 	position: relative;
-	left: calc(-1 * var(--md-space-5) - 16px);
-	margin: -16px calc(var(--md-space-1) - 16px) -16px 0;
+	/* The 48px target overhangs the drawn box by 16px on every side; the overhangs take no room in the line, so the words
+	   stand where they stood beside the box before the target grew (the left overhang in the line pushed them 16px on). */
+	left: calc(-1 * var(--md-space-5));
+	margin: -16px calc(var(--md-space-1) - 16px) -16px -16px;
 	width: 48px; height: 48px;
 	font: inherit;
 	-webkit-appearance: none; appearance: none;