rapier-markdown-kit 1.2.5 → 1.2.7

package/LICENSE

@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-Files under this licence carry `SPDX-License-Identifier: MIT` in their first lines: the standard's
+Files under this license carry `SPDX-License-Identifier: MIT` in their first lines: the standard's
 grammar, marks and reference style (`spec/md-layout.mjs`, `spec/md-marks.mjs`, `spec/md-source.mjs`, `spec/flowchart.mjs`, `spec/markdown-style.css`), ink geometry
 (`spec/ink.mjs`),
 the layout model and line planner (`layout/model.mjs`, `layout/line-plan.mjs`, `layout/typography.mjs`, `layout/preparation.mjs`,
@@ -42,8 +42,8 @@ AGPL-3.0-only. The page wrapper (`skills/rapier-html/wrap.mjs`, `skills/rapier-h
 `kit/pdf-vectors.mjs`, `kit/pdf-glyphs.mjs`, `kit/stage.mjs` and MIT-marked conformance
 modules are covered too. These names describe the Rapier-owned files carrying the
 MIT notice, not a grant over the editor or third-party code. Other Rapier-owned
-files retain their stated licence; the editor is AGPL-3.0-only (see `LICENSE`).
-Third-party components retain their own copyright and licence notices.
+files retain their stated license; the editor is AGPL-3.0-only (see `LICENSE`).
+Third-party components retain their own copyright and license notices.
 
 The portable font helpers read document definitions and accept explicit host validation and
 subsetting functions. The application binding (`editor/export-fonts.mjs`), captured-font

package/README.md

@@ -4,7 +4,7 @@ Read, render and write Self-contained Markdown in browsers and Node: one `.md` f
 drawings, layout and precise inline typography. Build portable documents for people and agents. Will/1 regions mark what an agent
 may edit, append to or preserve. MIT, no dependencies.
 
-- Typography uses ordinary inline HTML spans with validated size, colour and family. Comments and references
+- Typography uses ordinary inline HTML spans with validated size, color and family. Comments and references
   carry other optional facts; each reader chooses its HTML, style, extension and resource support.
 - One stylesheet renders the document as the editor and its exported page do.
 - The line planner flows text around a picture's real shape; a conformance suite of thirteen documents runs
@@ -93,7 +93,7 @@ DOM objects between document realms.
 
 This **DOM-hosted library** requires a DOM and sanitizer, the Rapier grammar,
 portable image preparation, style access and the named codec/layout ports it uses.
-Those dependencies keep their own licences: the MIT grant here does not relicense a
+Those dependencies keep their own licenses: the MIT grant here does not relicense a
 separately supplied host or vendor. The [editor host binding](https://github.com/jackskip22/rapier/blob/main/src/editor/render-host.js)
 lists the renderer's dependencies. [rapier-server](https://github.com/jackskip22/rapier/blob/main/server/README.md)
 provides a complete local host with a pinned Chromium process. Its Word exporter and filesystem service are AGPL,
@@ -118,7 +118,7 @@ Browser hosts additionally check the exact captured container with an uninstalle
 Without `FontFace`, only the host validator's admission is established; it does not establish
 browser container support. The HTML font helpers do not bundle the application's font importer,
 container codecs or subsetter. Rapier binds its existing materializer and shared importer at `editor/render-host.js` through
-`editor/export-fonts.mjs`; those implementations retain their application licence.
+`editor/export-fonts.mjs`; those implementations retain their application license.
 An embedded family named Geist or Geist Mono remains custom data and takes precedence over the
 factory family. Custom fonts have no optional factory size limit.
 
@@ -140,7 +140,7 @@ family name share the host's font namespace. Print retains its existing factory
 | Import | What it is |
 | --- | --- |
 | `rapier-markdown-kit/layout` | The `md-layout:v1` comment a picture carries: parse it, validate it, write it back. |
-| `rapier-markdown-kit/marks` | Unified typography values, span writer and parser installer; preserved colour/font comments, ink and page breaks. |
+| `rapier-markdown-kit/marks` | Unified typography values, span writer and parser installer; preserved color/font comments, ink and page breaks. |
 | `rapier-markdown-kit/model` | Occupancy profiles and the line planner: the wrapping itself. |
 | `rapier-markdown-kit/typography` | Source-preserving paragraph refinement through `createTypography()`. |
 | `rapier-markdown-kit/will` | The Will/1 grammar (a separate, optional standard): the markers around an agent's intent regions. |
@@ -244,11 +244,11 @@ font-data authority, including a name that collides with a factory face.
 inline span; split block selections and keep their `#`, list markers and separators outside. `typography.parseStyle`
 returns only admitted facts. `typography.install(md)` installs that interpretation on the caller's markdown-it
 parser, and `typographySourceRanges(source, md)` reports original UTF-16 wrapper ranges through that parser.
-These calls neither mutate the source nor load resources. The installer also reads already-authored colour and
+These calls neither mutate the source nor load resources. The installer also reads already-authored color and
 font comments into the same facts; an ordinary open/save must preserve their bytes, not rewrite them as spans.
 
 Sizes accept positive decimal `pt`/`px`, at most 12 fractional digits, up to 1638pt/2184px; 96px = 72pt. New values
-use lowercase units and omit insignificant zeros. Colours become lowercase six-digit RGB hex; opaque integer
+use lowercase units and omit insignificant zeros. Colors become lowercase six-digit RGB hex; opaque integer
 RGB CSSOM values are also read. Families are one validated name, an unquoted CSS generic, or an existing preset
 stack. `sans`, `serif`, `mono`, `system`, `hand` are reserved choice aliases, not quoted custom identities. Styles
 are bounded to 4096 characters, 32 declarations and 64 paired levels. Invalid declarations and unknown properties
@@ -271,7 +271,7 @@ unit, independent of editor zoom. No mapping claims identical glyphs or line bre
 See the original [typography guidance](https://github.com/jackskip22/rapier/blob/main/docs/markdown-standard.md#inline-typography),
 [CommonMark raw HTML](https://spec.commonmark.org/0.31.2/#raw-html), [CSS absolute units](https://www.w3.org/TR/css-values-4/#absolute-lengths),
 [Pandoc spans](https://pandoc.org/MANUAL.html#extension-bracketed_spans) and [Quarto spans](https://quarto.org/docs/authoring/markdown-basics.html#divs-and-spans).
-Those specifications retain their own licences.
+Those specifications retain their own licenses.
 
 ## Render with the reference style
 
@@ -351,9 +351,9 @@ export const exampleSource = [
   'plain code',
   '~~~',
   '',
-  'A centred paragraph.' + formatLayout({align: 'center'}),
+  'A centered paragraph.' + formatLayout({align: 'center'}),
   '',
-  'A ' + formatColorRun(TEXT_COLOR_NAMES.blue, 'blue phrase') + ' keeps its colour.',
+  'A ' + formatColorRun(TEXT_COLOR_NAMES.blue, 'blue phrase') + ' keeps its color.',
   '',
   'And ' + typography.wrap({size: '13.5pt', color: '#175dc4', family: 'serif'}, '**precise words**') + ' keep their emphasis.',
   '',
@@ -499,11 +499,11 @@ Its historical line counts are not a current-engine or font-shaping acceptance g
 `--impl path/to/module.mjs` runs another implementation against the same documents; `--tolerance 2` sets the pixel
 tolerance.
 
-## Licence
+## License
 
-MIT, the full text in `LICENSE`; Rapier-owned modules and the stylesheet keep their MIT line. Pretext's complete licence,
+MIT, the full text in `LICENSE`; Rapier-owned modules and the stylesheet keep their MIT line. Pretext's complete license,
 notice and pinned source inventory are in `dist/agent/vendor/pretext/`. The selected upstream is unreleased main
-`bac1774c0f8b7a92e44b9da43b6d5443d55d0d9b`, despite its package version `0.0.9`. Its upstream licence includes
+`bac1774c0f8b7a92e44b9da43b6d5443d55d0d9b`, despite its package version `0.0.9`. Its upstream license includes
 Chromium/WebKit BSD, Unicode and ICU notices for derived code and generated data; those notices travel with the kit
 and the exported wrapping runtime. The history projection uses the MIT diff core;
 its full grant is in `dist/packages/rapier-diff/LICENSE`. The Rapier editor is AGPL-3.0-only and

package/dist/kit/pdf-glyphs.mjs

@@ -77,6 +77,14 @@ function shape(value, font, preserve, ligatures) {
   const result = [];
   for (let at = 0; at < value.length;) {
     const code = value.codePointAt(at), character = String.fromCodePoint(code), start = at;
+    if (code === 0x00ad) {
+      at += character.length;
+      const own = font.glyph(code), hyphen = font.glyph(0x2d), glyph = own || hyphen;
+      // A discretionary hyphen with no glyph stays in the page paint. Do not skip the lookup.
+      if (!glyph || glyph >= font.glyphCount) return null;
+      result.push({start, end: at, text: own ? character : '-', glyph, soft: true});
+      continue;
+    }
     if (/[\p{Mark}\p{Format}]/u.test(character) || (/[\p{Letter}]/u.test(character) && !/\p{Script=Latin}/u.test(character)) || code === 0xfb01 || code === 0xfb02) return null;
     at += character.length;
     if (!preserve && /[ \t\r\n\f]/.test(character)) {while (at < value.length && /[ \t\r\n\f]/.test(value[at])) at++;}
@@ -97,7 +105,13 @@ export async function collectPdfGlyphs(main, {width, check, faces = []}) {
   const document = main.ownerDocument, window = document.defaultView, origin = main.getBoundingClientRect();
   const nodes = new Map(), hidden = [], canvas = document.createElement('canvas'); canvas.width = canvas.height = 1;
   const context = canvas.getContext('2d', {willReadFrequently: true});
-  const restore = () => {for (const row of hidden) {if (row.value) row.node.style.setProperty('-webkit-text-fill-color', row.value, row.priority); else row.node.style.removeProperty('-webkit-text-fill-color');} canvas.width = canvas.height = 0;};
+  const restore = () => {
+    for (const row of hidden) {
+      if (row.wrap) {row.wrap.replaceWith(...row.wrap.childNodes); continue;}
+      if (row.value) row.node.style.setProperty('-webkit-text-fill-color', row.value, row.priority); else row.node.style.removeProperty('-webkit-text-fill-color');
+    }
+    canvas.width = canvas.height = 0;
+  };
   if (!context) return {nodes, restore};
   const colorCache = new Map(), styles = new Map(), styleOf = node => {if (!styles.has(node)) styles.set(node, window.getComputedStyle(node)); return styles.get(node);};
   const color = value => {if (!colorCache.has(value)) {context.clearRect(0, 0, 1, 1); context.fillStyle = value; context.fillRect(0, 0, 1, 1); colorCache.set(value, Array.from(context.getImageData(0, 0, 1, 1).data, item => item / 255));} return colorCache.get(value);};
@@ -118,7 +132,7 @@ export async function collectPdfGlyphs(main, {width, check, faces = []}) {
       if (++visited % 128 === 0) {await new Promise(resolve => setTimeout(resolve, 0)); check();}
       // Leaving the existing element in place preserves selectors, counters, line breaking and inline marks.
       // Keep preformatted blocks, their inline struts and syntax paint together.
-      if (element.namespaceURI !== 'http://www.w3.org/1999/xhtml' || element.children.length || element.closest('svg,pre,.rapier-will-carrier') || element.localName === 'li') continue;
+      if (element.namespaceURI !== 'http://www.w3.org/1999/xhtml' || element.children.length || element.closest('svg,pre,.rapier-will-carrier')) continue;
       const textNodes = Array.from(element.childNodes).filter(node => node.nodeType === 3);
       if (textNodes.length !== 1 || !textNodes[0].data.trim() || !safe(element)) continue;
       const language = (element.closest('[lang]')?.getAttribute('lang') || document.documentElement.lang || '').toLowerCase();
@@ -142,15 +156,39 @@ export async function collectPdfGlyphs(main, {width, check, faces = []}) {
       if (!Number.isFinite(ascent)) continue;
       const rgba = color(style.webkitTextFillColor || style.color), range = document.createRange();
       let valid = true;
+      const placed = [];
       for (const item of shaped) {
         range.setStart(node, item.start); range.setEnd(node, item.end);
-        const rects = Array.from(range.getClientRects()).filter(rect => rect.height > 0), first = rects[0];
-        if (!first || rects.some(rect => Math.abs(rect.top - first.top) > .25)) {valid = false; break;}
+        const ink = Array.from(range.getClientRects()).filter(rect => rect.height > 0);
+        // A break after a soft hyphen can leave the next letter with a phantom box on the
+        // hyphen's line. Keep the line that actually holds the ink.
+        const lines = [];
+        for (const rect of ink) {
+          const line = lines.find(row => Math.abs(row[0].top - rect.top) <= .25);
+          if (line) line.push(rect); else lines.push([rect]);
+        }
+        lines.sort((a, b) => b.reduce((sum, rect) => sum + rect.width, 0) - a.reduce((sum, rect) => sum + rect.width, 0));
+        const previous = shaped[shaped.indexOf(item) - 1];
+        if (lines.length > 1 && !item.soft && !previous?.soft) {valid = false; break;}
+        const rects = lines[0] || [];
+        const first = (item.soft ? rects.find(rect => rect.width > 0) : null) || rects[0];
+        // An unbroken soft hyphen has no ink. Leave it out of the vector run.
+        if (item.soft && !(first?.width > 0)) continue;
+        if (!first) {valid = false; break;}
         const page = Math.max(0, Math.floor((first.left - origin.left + .01) / width));
         Object.assign(item, {font, size, rgba, x: first.left - origin.left - page * width, baseline: first.top - origin.top + ascent});
+        placed.push(item);
+      }
+      if (!valid || !placed.length) continue;
+      nodes.set(node, placed);
+      if (element.localName === 'li') {
+        // A list item's marker inherits its fill and is not vectorized: hide only the words.
+        const wrap = document.createElement('span');
+        node.replaceWith(wrap); wrap.append(node);
+        wrap.style.setProperty('-webkit-text-fill-color', 'transparent', 'important');
+        hidden.push({wrap});
+        continue;
       }
-      if (!valid) continue;
-      nodes.set(node, shaped);
       hidden.push({node: element, value: element.style.getPropertyValue('-webkit-text-fill-color'), priority: element.style.getPropertyPriority('-webkit-text-fill-color')});
       element.style.setProperty('-webkit-text-fill-color', 'transparent', 'important');
     }

package/dist/kit/render-markdown.mjs

@@ -325,7 +325,7 @@ function initMarkdownIt() {
 			const provider = env.rapierProviders === false ? null : _rapierProviders.mermaid;
 			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) {
+			if (!ready && !provider?.request?.() && env.rapierProviders !== false && !_diagramPromptedOnce) {
 				_diagramPromptedOnce = true;
 				try { _rapierUiDiagram.request(); } catch (_) {}
 			}
@@ -366,7 +366,7 @@ function initMarkdownIt() {
 			if (env.rapierPage) return '<span data-rapier-math-source="">' + literal + '</span>';
 			const mathProvider = env.rapierProviders === false ? null : _rapierProviders.math;
 			if (!mathProvider || mathProvider.status !== 'ready' || typeof mathProvider.renderToString !== 'function') {
-				if (env.rapierProviders !== false && !_mathPromptedOnce) {
+				if (!mathProvider?.request?.() && env.rapierProviders !== false && !_mathPromptedOnce) {
 					_mathPromptedOnce = true;
 					try { _rapierUiMath.request(); } catch (_) {}
 				}

package/dist/kit/render-print.mjs

@@ -42,8 +42,12 @@ function _rapierPrintWillAdmit(canonical, plan) {
 	if (new Set(plan.markers.flatMap(marker => Array.from(marker))).size > 65000) throw _rapierPrintWillLost('the markers use more distinct characters than a font can hold', 'Shorten them');
 }
 
-function _rapierPrintWillFont(markers) {
-	const { size, advance } = _rapierPrintWillMetrics(markers);
+function _rapierPrintWillFont(markers, advanceOverride) {
+	const metrics = _rapierPrintWillMetrics(markers);
+	const size = metrics.size;
+	// The page's carrier face keeps the short marker advance. Searchable text is
+	// positioned at 500 units, which is also /DW, so this copy can be asked to match it.
+	const advance = advanceOverride ?? metrics.advance;
 	const scalars = Array.from(new Set(markers.flatMap(marker => Array.from(marker, ch => ch.codePointAt(0)))));
 	const order = scalars.filter(code => code < 0x10000).sort((a, b) => a - b)
 		.concat(scalars.filter(code => code >= 0x10000).sort((a, b) => b - a));
@@ -296,7 +300,7 @@ async function _rapierWritePrintPdf({root, css, fontCss = '', canonical, bom = f
 			glyphs.add(character);
 			if (glyphs.size > 65000) refuse('pdf_text_glyph_limit');
 		}
-		const font = _rapierPrintWillFont(text);
+		const font = _rapierPrintWillFont(text, 500);
 		strip.style.width = count * bodyWidth + 'px';
 		strip.style.transform = 'none';
 		// One styled film is reused for every page window. Batches stay inside the capture edge

package/dist/kit/render-sanitize.mjs

@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: MIT
 import {typography} from '../spec/md-marks.mjs';
 const RAPIER_SANITIZE_FORBID_TAGS = Object.freeze(['form', 'style', 'dialog', 'template', 'iframe']);
-const RAPIER_SANITIZE_FORBID_ATTR = Object.freeze(['action', 'formaction', 'form', 'for']);
+// Invokers (DOMPurify 3.4.16 allows them) act on another element by id, and a document shares the page with the editor's own
+// controls: a document's button could open or close them.
+const RAPIER_SANITIZE_FORBID_ATTR = Object.freeze(['action', 'formaction', 'form', 'for', 'command', 'commandfor', 'popover', 'popovertarget', 'popovertargetaction']);
 // The document profiles use one allowlist in a browser and in an inert server parser.
 const RAPIER_SANITIZE_PROFILES = Object.freeze({
 	htmlTags: Object.freeze(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","search","section","select","shadow","slot","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),
 	svgTags: Object.freeze(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","enterkeyhint","exportparts","filter","font","g","glyph","glyphref","hkern","image","inputmode","line","lineargradient","marker","mask","metadata","mpath","part","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),
 	mathTags: Object.freeze(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),
-	htmlAttributes: Object.freeze(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","exportparts","face","for","headers","height","hidden","high","href","hreflang","id","inert","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","part","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","slot","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","wrap","xmlns"]),
+	htmlAttributes: Object.freeze(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","command","commandfor","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","exportparts","face","for","headers","height","hidden","high","href","hreflang","id","inert","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","part","pattern","placeholder","playsinline","popover","popovertarget","popovertargetaction","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","slot","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","wrap","xmlns"]),
 	svgAttributes: Object.freeze(["accent-height","accumulate","additive","alignment-baseline","amplitude","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dominant-baseline","dur","edgemode","elevation","end","exponent","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","intercept","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","mask-type","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","pointer-events","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","slope","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","tablevalues","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-orientation","text-rendering","textlength","type","u1","u2","unicode","values","vector-effect","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),
 	mathAttributes: Object.freeze(["accent","accentunder","align","bevelled","close","columnalign","columnlines","columnspacing","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lquote","lspace","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),
 	xmlAttributes: Object.freeze(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),
@@ -270,7 +272,7 @@ function _rapierInstallSanitizeHooks() {
 		if (!/^data:/i.test(compact)) return;
 		const tag = node?.nodeName === 'IMG' ? 'img'
 			: node?.namespaceURI === DIAGRAM_LABEL_SVG_NAMESPACE && node.localName === 'image' ? 'image' : '';
-		const rasterAllowed = (/^(?:render|export|raw|source)$/.test(_rapierSanitizeRuntime.context)
+		const rasterAllowed = (/^(?:paste|render|export|raw|source)$/.test(_rapierSanitizeRuntime.context)
 			|| _rapierSanitizeRuntime.context === 'diagram' && tag === 'image')
 			&& _rapierImageDataAttributeAllowed(tag, data.attrName.toLowerCase(), compact, _rapierSafeRasterDataUrl);
 		if (!rasterAllowed) data.keepAttr = false;
@@ -309,14 +311,14 @@ function _rapierInstallSanitizeHooks() {
 	// know: a marker's style is only `mso-list:Ignore`. The paste carries both as data-* first, where they stay,
 	// for the conversion that reads them (_rapierPasteWordLists).
 	DOMPurify.addHook('uponSanitizeElement', node => {
-		if (_rapierSanitizeRuntime.context !== 'paste' || !node || !/^(?:P|SPAN)$/.test(node.nodeName)) return;
+		if (_rapierSanitizeRuntime.context !== 'paste' || !node || !/^(?:P|LI|H[1-6]|SPAN)$/.test(node.nodeName)) return;
 		// Only the style names them: a page cannot bring these attributes of its own.
 		node.removeAttribute('data-rapier-word-level');
 		node.removeAttribute('data-rapier-word-marker');
 		const style = node.getAttribute('style');
 		if (!style || !/mso-list/i.test(style)) return;
 		const {wordListLevel, wordListIsMarker} = globalThis.RapierMarkdownSpec;
-		const level = node.nodeName === 'P' ? wordListLevel(style) : 0;
+		const level = /^(?:P|LI|H[1-6])$/.test(node.nodeName) ? wordListLevel(style) : 0;
 		if (level) node.setAttribute('data-rapier-word-level', String(level));
 		else if (node.nodeName === 'SPAN' && wordListIsMarker(style)) node.setAttribute('data-rapier-word-marker', '1');
 	});

package/dist/kit/render-styles.mjs

@@ -54,7 +54,7 @@ function _rapierDocumentPrintCss(hostSelector) {
 @page{size:auto;margin:12mm 14mm 14mm}
 @media print{
 	${p('.md-render')}{--md-color-line:#000000!important}
-	${list('.md-render h1','.md-render h2','.md-render h3','.md-render h4','.md-render h5','.md-render h6')}{break-after:avoid-page;page-break-after:avoid;color:#111}
+	${list('.md-render h1','.md-render h2','.md-render h3','.md-render h4','.md-render h5','.md-render h6')}{page-break-after:avoid;break-after:avoid-page;color:#111}
 	${list('.md-render p','.md-render li','.md-render blockquote')}{orphans:3;widows:3}
 	${p('.md-render img')}{max-width:100%!important;height:auto!important;break-inside:avoid-page}
 	${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}
@@ -66,7 +66,7 @@ function _rapierDocumentPrintCss(hostSelector) {
 	${list('.md-render th','.md-render td')}{overflow-wrap:anywhere;word-break:normal}
 	${p('.md-render thead')}{display:table-header-group}
 	${p('.md-render tfoot')}{display:table-footer-group}
-	${p('.md-render tr')}{break-inside:avoid-page;page-break-inside:avoid}
+	${p('.md-render tr')}{page-break-inside:avoid;break-inside:avoid-page}
 	${p('.md-render details>*:not(summary)')}{display:block!important}
 	${p('.md-render details')}{break-inside:auto}
 	${p('.md-render a')}{color:#111!important;text-decoration:underline}

package/dist/kit/render-work.mjs

@@ -8,7 +8,7 @@ export function finish(iterator) {
 
 export function check(work) {
 	work?.check?.();
-  if (work?.signal?.aborted) throw Object.assign(new Error('The operation was cancelled.'), {name: 'AbortError', code: 'cancelled'});
+  if (work?.signal?.aborted) throw Object.assign(new Error('The operation was canceled.'), {name: 'AbortError', code: 'cancelled'});
 }
 
 export async function pause(work, fraction, label) {

package/dist/kit/render.mjs

@@ -161,7 +161,9 @@ async function _rapierBuildArtifact(options, providedContext) {
 		+ (printWidth > 0 ? '.rapier-page.md-render{width:' + printWidth + 'px!important}' : '') + '}' : '';
 	const pageTitle = settings && settings.title ? globalThis.RapierMarkdownSpec.documentTitle(settings) : metadata.filename;
 	let css = _rapierArtifactStyles(theme, includeFonts, !!opts.print || completePage, false, opts.print && opts.kind === 'standalone' ? '' : null)
-		+ (completePage ? '\n\n' + _rapierSharedPageFallbackCss() : '')
+		// Print already floats pictures. Tables, code, figures and rules clear them
+		// through the same clearing rule a complete page uses; print keeps its own page flow.
+		+ (completePage || opts.print ? '\n\n' + _rapierSharedPageFallbackCss(!completePage) : '')
 		+ (opts.extraCss ? '\n\n' + opts.extraCss : '')
 		+ (willFont ? '\n\n@font-face{font-family:' + willFont.family + ';src:url(' + await _rapierBlobDataUrl(new Blob([willFont.bytes], { type: 'font/ttf' })) + ') format("truetype")}' : '')
 		+ (settingsCss ? '\n' + settingsCss : '')
@@ -340,7 +342,7 @@ function _rapierDocxRenderStyles(root) {
 		const surface = into.createElement('div'); surface.className = 'md-render'; into.body.appendChild(surface);
 		const canvas = into.createElement('canvas'); canvas.width = canvas.height = 1;
 		const paint = canvas.getContext('2d'), colours = new Map();
-		if (!paint) throw new Error('Word text colours could not be read.');
+		if (!paint) throw new Error('Word text colors could not be read.');
 		const hex = colour => {
 			if (!colours.has(colour)) {
 				// CSS may resolve an accent to oklch/color-mix. The browser supplies its
@@ -671,13 +673,13 @@ async function _rapierReadSharedDocument(text, filename) {
 	return {source, filename: name, kind, bom, ...parts, comparisonBase};
 }
 
-function _rapierSharedPageFallbackCss() {
-	return `
+function _rapierSharedPageFallbackCss(clearOnly = false) {
+	const clear = '.rapier-page>:is(pre,table,hr,figure,.table-scroll-wrap,.math-display-wrap){clear:both}\n';
+	return clearOnly ? clear : `
 .rapier-page{display:flow-root}
 .rapier-page>:first-child{margin-top:0}
 .md-render h1{display:flow-root}
-.rapier-page>:is(pre,table,hr,figure,.table-scroll-wrap,.math-display-wrap){clear:both}
-`;
+` + clear;
 }
 
 function _rapierShareWrapKind(element) {

package/dist/packages/rapier-diff/concerns.mjs

@@ -39,7 +39,7 @@ export function separate(c, endA = c.before.length, endB = c.after.length) {
       for (const span of p.slice(0, 2)) { span[0] += shift; span[1] += shift; }
   }
   // Adjacent blocks deleted or inserted together: when the first carries the line break before it, each carries
-  // its own, so any one restores apart from its neighbours.
+  // its own, so any one restores apart from its neighbors.
   if (!raw) for (let i = 1; i < c.result.length; i++) {
     const p = c.result[i - 1], q = c.result[i], kind = p[3][0], side = kind ? 1 : 0, text = side ? after : before;
     if (kind % 2 || q[3][0] !== kind || p[2] || q[2] || p[side][1] !== q[side][0] || p[1 - side][0] !== q[1 - side][0]) continue;

package/dist/packages/rapier-diff/walk.mjs

@@ -109,7 +109,7 @@ export function walker(c) {
   }
 
   // Unequal lines pair in order by shared words. A line sharing under a quarter of its words with every candidate is
-  // replaced whole: an inserted line never borrows a neighbour's words, and a rewrite never reads as stray fragments.
+  // replaced whole: an inserted line never borrows a neighbor's words, and a rewrite never reads as stray fragments.
   function lines(x, y, context) {
     const n = x.length - 1, m = y.length - 1;
     if (n * m > 4096 || !spend(n * m + x[n] - x[0] + y[m] - y[0])) return row(x[0], x[n], y[0], y[m], context);

package/dist/spec/document-settings.mjs

@@ -10,6 +10,91 @@ import {normalizeFontFamily, fontFamilyCss, FONT_STACKS} from './md-marks.mjs';
 const NUMBER = /^(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
 export const DOCUMENT_LEADING = 1.75 / 1.1;
 
+// Before/after are points; line is a multiple of the element's own type size.
+// Presets and native exports read this same table. Explicit measures do not grow with font size.
+export const SPACING_TYPES = Object.freeze(['paragraph', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+	'list', 'item', 'table', 'picture', 'drawing', 'quote', 'code', 'rule', 'footnote', 'toc']);
+export const SPACING_PRESETS = Object.freeze({compact: .7, standard: 1, roomy: 1.5});
+const SPACING_SELECTORS = Object.freeze({paragraph: 'p', h1: 'h1', h2: 'h2', h3: 'h3', h4: 'h4', h5: 'h5', h6: 'h6',
+	list: ':is(ul,ol)', item: 'li', table: ':is(table,.table-scroll-wrap)', picture: 'p[data-md-picture]',
+	drawing: ':is(.diagram-block,p[data-md-picture]:has(img[data-md-svg],img[src^="data:image/svg+xml"]))', quote: 'blockquote',
+	code: 'pre', rule: 'hr:not(.footnotes-sep):not([data-md-break])', footnote: '.footnotes', toc: '.rapier-jump-list'});
+const HEADING_LINE = [2 / 2.6, 1.5 / 1.9, 1.2 / 1.5, 1 / 1.25, .9 / 1.1, .82];
+
+export function normalizeDocumentSpacing(value) {
+	if (typeof value === 'string') {
+		if (Object.hasOwn(SPACING_PRESETS, value)) value = {preset: value};
+		else { try { value = JSON.parse(value); } catch (_) { return null; } }
+	}
+	if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+	const result = {};
+	for (const [key, entry] of Object.entries(value)) {
+		if (key === 'preset') {
+			if (!Object.hasOwn(SPACING_PRESETS, entry)) return null;
+			result.preset = entry; continue;
+		}
+		if (!SPACING_TYPES.includes(key) || !entry || typeof entry !== 'object' || Array.isArray(entry)) return null;
+		const row = {};
+		for (const [field, number] of Object.entries(entry)) {
+			if (!['before', 'after', 'line'].includes(field) || typeof number !== 'number' || !Number.isFinite(number) ||
+				number < (field === 'line' ? .5 : 0) || number > (field === 'line' ? 4 : 720)) return null;
+			row[field] = number;
+		}
+		result[key] = Object.freeze(row);
+	}
+	return Object.freeze(result);
+}
+
+export function documentSpacing(settings, kind = 'paragraph') {
+	const type = SPACING_TYPES.includes(kind) ? kind : 'paragraph', spacing = settings?.spacing;
+	const preset = spacing?.preset || 'standard', scale = SPACING_PRESETS[preset];
+	const size = (settings?.fontsize?.unit || 1.1) / 1.1;
+	const heading = /^h([1-6])$/.exec(type), leading = settings?.linestretch?.factor ??
+		(preset === 'compact' ? 1.3 : preset === 'roomy' ? 1.85 : DOCUMENT_LEADING);
+	const before = heading ? 15 : type === 'footnote' ? 9 : 0;
+	const after = heading ? 3 : type === 'paragraph' ? 6 : type === 'item' ? 3 : type === 'footnote' ? 0 : 9;
+	const line = heading ? leading * HEADING_LINE[Number(heading[1]) - 1] : type === 'code' ? leading * .75 / .7386 : leading;
+	if (settings?.word) return {before: (heading ? 12 : type === 'footnote' ? 9 : 0) * scale,
+		after: (heading ? 6 : type === 'paragraph' ? 8 : type === 'item' || type === 'footnote' ? 0 : 9) * scale,
+		line: leading, ...spacing?.[type]};
+	return {before: before * scale * size, after: after * scale * size, line, ...spacing?.[type]};
+}
+
+// Word's widely supported Calibri/11 pt Normal template. Explicit document settings always win.
+export function wordDocumentSettings(settings) {
+	return {...settings, word: true, fontsize: settings?.fontsize || fontSize('11pt'),
+		mainfont: settings?.mainfont || documentFont('Calibri'), sansfont: settings?.sansfont || documentFont('Calibri'),
+		linestretch: settings?.linestretch || leading('1.08')};
+}
+export function documentHeadingSize(settings, level) {
+	const body = (settings?.fontsize?.unit || 1.1) * 12;
+	return body * (settings?.word ? [16/11,13/11,12/11,1,1,1] : [2.6,1.9,1.5,1.25,1.1,1])[level - 1];
+}
+
+export function documentSpacingCss(settings, scope = '.md-render', defaults = false) {
+	if (!defaults && !settings?.spacing && !settings?.linestretch && !settings?.fontsize) return '';
+	const length = points => 'calc(' + Number((points / 12).toFixed(8)) + ' * var(--md-unit))';
+	let css = '';
+	for (const type of SPACING_TYPES) {
+		const row = documentSpacing(settings, type), selector = scope + ' ' + SPACING_SELECTORS[type];
+		css += selector + '{margin-block:' + length(row.before) + ' ' + length(row.after) + ';line-height:' + row.line + '}';
+		if (settings?.word && /^h[1-6]$/.test(type)) css += selector + '{font-size:' + length(documentHeadingSize(settings, Number(type[1]))) + '}';
+	}
+	// Compound blocks own the outside gap; the last child does not add it again.
+	css += scope + ' :is(li,td,th,blockquote)>:last-child{margin-bottom:0}' +
+		scope + ' li:last-child{margin-bottom:0}' + scope + ' li>:is(ul,ol){margin-bottom:0}' +
+		scope + ' .table-scroll-wrap>table{margin-block:0}' +
+		scope + ' pre{font-size:calc(var(--md-text-body) * .7386)}' +
+		scope + ' pre code{line-height:inherit}' + scope + ' .footnotes{padding-top:0}' +
+		scope + ' .footnotes-list{margin-block:0}' + scope + ' blockquote:not(.callout){padding-block:0}';
+	const item = documentSpacing(settings, 'item');
+	css += scope + ' ul.rapier-jump-list>li{padding-block:0;margin-block:' + length(item.before) + ' ' + length(item.after) + '}' +
+		scope + ' ul.rapier-jump-list>li:last-child{margin-bottom:0}';
+	for (const [type, selector] of [['item','li>p'], ['table',':is(td,th)>p'], ['quote','blockquote>p'], ['footnote','.footnotes p'], ['toc','.rapier-jump-list li']])
+		css += scope + ' ' + selector + '{line-height:' + documentSpacing(settings, type).line + '}';
+	return css;
+}
+
 function measure(value, positive = false) {
 	const text = unquote(value);
 	const number = NUMBER.test(text) ? Number(text) : NaN;
@@ -40,7 +125,7 @@ const PAPERS = Object.freeze({
 });
 const EMPTY = Object.freeze({
 	title: null, subtitle: null, lang: null, fontsize: null, mainfont: null, sansfont: null, monofont: null, defaultfont: null, linestretch: null,
-	papersize: null, geometry: null, pagestyle: null,
+	papersize: null, geometry: null, pagestyle: null, spacing: null,
 });
 
 function unquote(value) {
@@ -257,6 +342,7 @@ export function readDocumentSettings(markdown) {
 	return Object.freeze({
 		title: take('title') || null, subtitle: take('subtitle') || null, lang: languageTag(take('lang')),
 		fontsize, mainfont, sansfont, monofont, defaultfont, linestretch, papersize, geometry,
+		spacing: normalizeDocumentSpacing(take('spacing')),
 		pagestyle: page === 'plain' || page === 'empty' ? page : null,
 	});
 }
@@ -276,14 +362,14 @@ export function updateDocumentSettings(markdown, patch) {
 		text: (source[field.start - 1] === ':' ? ' ' : '') + text + (source[field.end] === '#' ? ' ' : '')});
 	for (const [key, supplied] of Object.entries(patch || {})) {
 		const font = ['mainfont', 'sansfont', 'monofont', 'defaultfont'].includes(key);
-		if (!font && !['fontsize', 'linestretch'].includes(key)) throw new TypeError('Unknown document setting: ' + key);
+		if (!font && !['fontsize', 'linestretch', 'spacing'].includes(key)) throw new TypeError('Unknown document setting: ' + key);
 		const matches = fields.filter(item => item.key === key);
 		if (matches.length > 1) throw new RangeError('Duplicate document setting: ' + key);
 		const field = matches[0];
-		const value = supplied === null ? null : font ? documentFont(supplied) : key === 'fontsize' ? fontSize(supplied) : leading(supplied);
+		const value = supplied === null ? null : font ? documentFont(supplied) : key === 'fontsize' ? fontSize(supplied) : key === 'spacing' ? normalizeDocumentSpacing(supplied) : leading(supplied);
 		if (supplied !== null && !value) throw new TypeError('Invalid document setting: ' + key);
-		const encoded = value === null ? '' : font ? JSON.stringify(value.family) : key === 'fontsize' ? value.step : String(value.factor);
-		if (value !== null && before[key] && (font ? before[key].family === value.family : key === 'fontsize' ? same(before.fontsize.unit, value.unit) : before.linestretch.factor === value.factor)) continue;
+		const encoded = value === null ? '' : font ? JSON.stringify(value.family) : key === 'fontsize' ? value.step : key === 'spacing' ? JSON.stringify(value) : String(value.factor);
+		if (value !== null && before[key] && (font ? before[key].family === value.family : key === 'fontsize' ? same(before.fontsize.unit, value.unit) : key === 'spacing' ? JSON.stringify(before.spacing) === encoded : before.linestretch.factor === value.factor)) continue;
 		if (key === 'fontsize' && value !== null && fontSize(encoded)?.unit !== value.unit) refuse(key);
 		if (!field) { if (value !== null) append.push(key + ': ' + encoded + eol); continue; }
 		if (field.opaque || field.invalid || field.multiline || field.block) refuse(key);
@@ -327,7 +413,7 @@ export function documentSettingsStyle(settings, defaultFont) {
 	if (sans) decls.push('--md-font-sans:' + (sans.css || fontFamilyCss(sans.family)));
 	if (main) decls.push('font-family:' + (main.css || fontFamilyCss(main.family)));
 	if (mono) decls.push('--md-font-mono:' + (mono.css || fontFamilyCss(mono.family)));
-	return decls.length ? '.md-render{' + decls.join(';') + '}' : '';
+	return (decls.length ? '.md-render{' + decls.join(';') + '}' : '') + documentSpacingCss(settings);
 }
 
 // Null when the page keys do not change the print sheet. The view never asks.

package/dist/spec/md-assets.mjs

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Pure text and markdown-it tokens: no DOM, no byte decoding, no globalThis.Rapier* (MIT kit; decoders stay in images/assets.mjs).
+import {isWordSidecarBlock} from './word-sidecar.mjs';
 
 export const IMAGE_LIMITS = Object.freeze({bytes: 16 * 1024 * 1024, sourceChars: 64 * 1024 * 1024, dimension: 16384, pixels: 24000000, assets: 1024});
 const parsers = new WeakMap();
@@ -93,6 +94,11 @@ const unheldLines = new Proxy(Array.prototype, {
 // lines begins (undefined when the source ends before it). `env` is the whole pass's. The tables hold at most
 // the lines between two visits: BLOCK_WINDOW of them, or as many as one block's rules read.
 export function eachBlockWindow(source, bodyOffset, parser, env, visit, keepNul = false) {
+  for (const window of blockWindows(source, bodyOffset, parser, env, keepNul)) visit(window);
+}
+
+// The same tokenizer can pause between complete top-level windows; no grammar rule is suspended.
+export function* blockWindows(source, bodyOffset, parser, env, keepNul = false) {
   const lineEnds = source.slice(bodyOffset).replace(/\r\n?/g, '\n'), body = keepNul ? lineEnds : lineEnds.replace(/\0/g, '\ufffd');
   // The body is the source with every CRLF one unit shorter: count the pairs before a body offset, from the last
   // offset asked.
@@ -105,7 +111,7 @@ export function eachBlockWindow(source, bodyOffset, parser, env, visit, keepNul
   const tokens = [];
   let origin = 0, first = 0, state;
   // A line begins after the newline that ends the line before it. No rule writes eMarks.
-  const report = () => visit({tokens, firstLine: first, lineStart: line => {
+  const report = () => ({tokens, firstLine: first, lineStart: line => {
     if (!line) return sourceOffset(origin);
     const end = Object.hasOwn(state.eMarks, line - 1) ? state.eMarks[line - 1] : body.length;
     return end < body.length ? sourceOffset(end + 1) : undefined;
@@ -115,7 +121,7 @@ export function eachBlockWindow(source, bodyOffset, parser, env, visit, keepNul
   if (lines <= BLOCK_WINDOW) {
     state = new parser.block.State(body, parser, env, tokens);
     parser.block.tokenize(state, state.line, state.lineMax);
-    return report();
+    yield report(); return;
   }
   // The parser's own count of a last line that no newline ends: it does not count one of only spaces.
   state = new parser.block.State(body.slice(body.lastIndexOf('\n') + 1), parser, env, tokens);
@@ -180,14 +186,14 @@ export function eachBlockWindow(source, bodyOffset, parser, env, visit, keepNul
       else if (!parser.utils.isSpace(code)) break;
     }
     frontier = origin; ended = false; betweenBlocks = false;
-    state.line = 0; state.lineMax = lines - first;
+    state.line = 0; state.lineMax = lines - first; state.rapierFirstLine = first;
     const outer = unheldLine;
     unheldLine = answer;
     let finished = true;
     try { parser.block.tokenize(state, 0, state.lineMax); }
     catch (error) { if (error !== WINDOW_END) throw error; finished = false; }
     finally { unheldLine = outer; }
-    report();
+    yield report();
     if (finished) return;
     tokens.length = 0;
     origin = state.eMarks[state.line - 1] + 1; first += state.line;
@@ -209,6 +215,19 @@ export function dataImage(url) {
 
 // Markdown-it owns recognition, nesting, duplicate precedence and escapes; block parse only.
 export function parseAssets(source, factory = configured || globalThis.markdownit, bodyOffset = 0) {
+  const steps = assetSteps(source, factory, bodyOffset);
+  let next = steps.next();
+  while (!next.done) next = steps.next();
+  return next.value;
+}
+export async function parseAssetsWork(source, factory, bodyOffset, work) {
+  const steps = assetSteps(source, factory, bodyOffset);
+  work.signal?.throwIfAborted();
+  let next = steps.next();
+  while (!next.done) { await work.yield(); work.signal?.throwIfAborted(); next = steps.next(); }
+  return next.value;
+}
+function* assetSteps(source, factory = configured || globalThis.markdownit, bodyOffset = 0) {
   if (typeof source !== 'string') return fail('image_source_invalid');
   if (source.length > IMAGE_LIMITS.sourceChars) return fail('image_source_limit');
   if (!source.includes(']:')) return {assets: new Map(), blocks: [], duplicateLabels: new Set(), appendixStart: source.length, references: Object.create(null)};
@@ -218,7 +237,7 @@ export function parseAssets(source, factory = configured || globalThis.markdowni
   if (definition) return definition.index;
   const parser = parserFor(factory), env = {};
   const assets = new Map(), blocks = [], seen = new Set(), duplicateLabels = new Set();
-  eachBlockWindow(source, bodyOffset, parser, env, ({tokens, lineStart}) => {
+  for (const {tokens, lineStart} of blockWindows(source, bodyOffset, parser, env)) {
     for (const token of tokens) {
       if (token.type !== 'reference_definition' || !token.map) continue;
       const id = token.meta.label, definition = token.meta.mdImageDefinition, first = !seen.has(id);
@@ -241,7 +260,8 @@ export function parseAssets(source, factory = configured || globalThis.markdowni
       blocks.push(row);
       if (first) assets.set(id, row);
     }
-  });
+    yield;
+  }
   const references = env.references || Object.create(null);
   if (assets.size > IMAGE_LIMITS.assets) for (const asset of assets.values()) asset.status = 'asset_count_limit';
   let appendixStart = source.length;
@@ -562,6 +582,7 @@ export function assetOmissions(source) {
   return spans;
 }
 export function isAssetBlock(raw) {
+  if (isWordSidecarBlock(raw)) return true;
   if (typeof raw !== 'string' || !/data:image\//i.test(raw)) return false;
   const parsed = parseAssets(raw);
   if (!parsed.blocks.length) return false;

package/dist/spec/md-layout.mjs

@@ -169,9 +169,9 @@ export function wrapTextBlock(element) {
 
 // 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]) {
-    for (let sibling = step(node); sibling; sibling = step(sibling)) {
+export function wrapNeighbour(node, classify, step = (n, direction) => n && n[direction > 0 ? 'nextElementSibling' : 'previousElementSibling']) {
+  for (const direction of [1, -1]) {
+    for (let sibling = step(node, direction); sibling; sibling = step(sibling, direction)) {
       const kind = classify(sibling);
       if (kind && typeof kind === 'object') return kind.stop;
       if (kind === 'metadata') continue;

package/dist/spec/md-marks.mjs

@@ -10,10 +10,10 @@ const inkReader = () => {
 	const COLOR_NAME_ALT = Object.keys(TEXT_COLOR_NAMES).join('|');
 	const COLOR_VALUE = '(?:#[0-9a-f]{6}|' + COLOR_NAME_ALT + ')';
 
-	// Ink (docs/markdown-standard.md, "Ink"): a pen stroke that stays with the words it marks, a paired comment with the colour span's shape. The
+	// Ink (docs/markdown-standard.md, "Ink"): a pen stroke that stays with the words it marks, a paired comment with the color span's shape. The
 	// opener holds the stroke:
 	//   <!--ink KIND [NUMBER] [COLOUR] [w=N] [box=W,H] [at=X,Y] [PATH]-->words<!--/ink-->
-	// KIND is the stroke's kind, decided once when it was lifted; COLOUR is exactly the colour span's value, red when absent; box is the frame's
+	// KIND is the stroke's kind, decided once when it was lifted; COLOUR is exactly the color span's value, red when absent; box is the frame's
 	// 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,
@@ -338,7 +338,7 @@ export function formatInkOpen(mark) {
 	let colour = '';
 	if (mark.hex != null) {
 		const value = TEXT_COLOR_HEX_TO_NAME[mark.hex] || mark.hex;
-		if (!new RegExp('^' + COLOR_VALUE + '$').test(value)) throw new TypeError('ink: the colour is the colour span\'s value');
+		if (!new RegExp('^' + COLOR_VALUE + '$').test(value)) throw new TypeError('ink: the color is the color span\'s value');
 		colour = ' ' + value;
 	}
 	if (mark.width != null && (!Number.isInteger(mark.width) || mark.width < 2 || mark.width > 24)) throw new TypeError('ink: the width is an integer from 2 to 24, and 9 is spelled by leaving it out');
@@ -442,7 +442,7 @@ export function pairInkSpans(source, markers = null) {
 	return pairSpanMarkers(source, 'ink', markers);
 }
 
-// Colour keeps its first opener; ink pairs each closer with the innermost opener. The shared range
+// Color 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);

package/dist/spec/md-source.mjs

@@ -115,9 +115,13 @@ export function markdownSourcePositions(source, parser) {
 
 // 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) {
+export function markdownTableSources(source, parser, environment, lineStarts = null, parse = null) {
   const cells = new WeakMap();
-  if (!source.includes('|')) return {tokens: parser.parse(source, environment), cells};
+  const read = owner => {
+    if (parse) return parse(owner, source, environment).then(tokens => ({tokens, cells}));
+    return {tokens: owner.parse(source, environment), cells};
+  };
+  if (!source.includes('|')) return read(parser);
   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);
@@ -131,14 +135,14 @@ export function markdownTableSources(source, parser, environment, lineStarts = n
         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);
+          cell = tableSource(state.src.slice(from, state.eMarks[row]), lines[row + (state.rapierFirstLine || 0)] + 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};
+  return read(owner);
 }
 
 function tableSource(row, base) {

package/dist/spec/word-sidecar.mjs

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+// An inert document asset, kept in Source and excluded from the reading surface.
+// This is recognition only: interchange/docx.mjs admits the bounded JSON and native XML.
+export const WORD_SIDECAR_OPEN = '<!-- rapier-word:v1\n';
+export function isWordSidecarBlock(raw) {
+  return typeof raw === 'string' && /^<!-- rapier-word:v1\r?\n[^\r\n]*\r?\n-->[ \t\r\n]*$/.test(raw);
+}

package/package.json

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

@@ -267,9 +267,9 @@
 .md-render h2{font-size:calc(var(--md-text-body) * 1.9);line-height:calc(var(--md-line) * 1.5);font-weight:var(--md-fw-semibold)}
 .md-render h3{font-size:calc(var(--md-text-body) * 1.5);line-height:calc(var(--md-line) * 1.5);font-weight:var(--md-fw-semibold)}
 .md-render h4{font-size:calc(var(--md-text-body) * 1.25);font-weight:var(--md-fw-semibold)}
-/* h5/h6 complete the six-level hierarchy: modest but owned (explicit size/weight/colour), never
+/* h5/h6 complete the six-level hierarchy: modest but owned (explicit size/weight/color), never
    the browser default. Size stays strictly monotonic below h4; h6 sits at the body's own size and
-   firms up weight and dims colour, since its size alone would read as body text. */
+   firms up weight and dims color, since its size alone would read as body text. */
 .md-render h5{font-size:calc(var(--md-text-body) * 1.1);font-weight:var(--md-fw-semibold)}
 .md-render h6{font-size:var(--md-text-body);font-weight:var(--md-fw-semibold);color:var(--md-heading-muted-color)}
 .md-render p{margin:0 0 var(--md-gap-paragraph)}
@@ -300,9 +300,9 @@
 
 .md-render .task-list-item input[type="checkbox"] {
 	--md-task-box: clamp(14px, .92em, 24px);
-	/* A form control does not inherit colour on its own; the shell's own app sheet gives it one
+	/* A form control does not inherit color on its own; the shell's own app sheet gives it one
 	   (`input,textarea,select{...color:inherit}`) and an exported page does not carry that sheet, so
-	   it says so here. The drawn box names its own colours, so this changes no pixel today -- it
+	   it says so here. The drawn box names its own colors, so this changes no pixel today -- it
 	   stops the two surfaces disagreeing about a property, which is how the next rule that does
 	   depend on it would go wrong quietly. */
 	color: inherit;
@@ -321,10 +321,10 @@
 	touch-action: manipulation;
 }
 /* The box and its tick are Feather's square and check-square, with squared corners: drawn on Feather's
-   24-unit grid with its 2-unit stroke, the box's corners mitred square, and a ticked box opens at its
+   24-unit grid with its 2-unit stroke, the box's corners mitered square, and a ticked box opens at its
    top right where the tick breaks out through it. The grid is a third wider than the box itself (the
    box is units 3 to 21), so the painted square keeps exactly the place and size --rapier-task-box gave
-   it; the ink is --color-line through a mask, so the theme recolours it and an export needs nothing
+   it; the ink is --color-line through a mask, so the theme recolors it and an export needs nothing
    more than the data: images its policy already admits. The three glyphs are written here once, and a
    Notes card's check rows read these same three (rapier-notes.css: one SVG per icon across Rapier). */
 :root,.md-render {
@@ -361,15 +361,15 @@
 	position:relative;
 	--md-marker:0px;
 	counter-increment:rapier-ol;
-	min-height:calc(2 * var(--md-unit));
-	padding-top:calc(0.15 * var(--md-unit));
+	min-height:0;
+	padding-top:0;
 }
 .md-render ol>li::before{
 	content:counter(rapier-ol);
 	position:absolute;
-	/* The circle is centred on the item's first line: the li's own padding, plus half of what the 2rem circle is taller than one line. */
-	inset-inline-start:calc(-2.75 * var(--md-unit) + var(--md-marker, 0px)); top:calc(calc(0.15 * var(--md-unit)) + (var(--md-line) - calc(2 * var(--md-unit))) / 2);
-	width:calc(2 * var(--md-unit)); height:calc(2 * var(--md-unit));
+	/* The circle is centered on the item's first line: the li's own padding, plus half of what the 2rem circle is taller than one line. */
+	inset-inline-start:calc(-2.75 * var(--md-unit) + var(--md-marker, 0px)); top:0;
+	width:min(2 * var(--md-unit), 1lh); height:min(2 * var(--md-unit), 1lh);
 	display:flex; align-items:center; justify-content:center;
 	border:2px solid var(--md-color-line);
 	border-radius:999px;
@@ -581,7 +581,7 @@
 }
 
 /* Page break: unobtrusive by design, the same weight as .section-fold-btn (rapier-editor.css) --
-	 muted colour and .37 opacity, never the stronger --color-line the horizontal-rule variants use.
+	 muted color and .37 opacity, never the stronger --color-line the horizontal-rule variants use.
 	 Invisible on paper: this sheet's print rule zeros this out and applies the actual break instead. */
 .md-render [data-md-break]{
 	position:relative;
@@ -642,7 +642,7 @@
 	font-size: var(--md-text-sm);
 	color: var(--md-color-text-secondary);
 }
-/* A view preference can keep embedded SVGs on their original light-paper colours. */
+/* A view preference can keep embedded SVGs on their original light-paper colors. */
 html[data-invert-image-alpha="off"] :is(img,.md-render svg.rapier-native-flowchart){color-scheme:light}
 .md-render img{
 	max-width:100%;height:auto;
@@ -650,9 +650,6 @@ 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)}
@@ -675,9 +672,9 @@ html:not([data-layout="plain"]) .md-render img[data-rapier-image-geometry="auto"
 .md-render mark[data-rapier-highlight="blue"]{--md-highlight-color:#4f91f7}
 .md-render mark[data-rapier-highlight="yellow"]{--md-highlight-color:#e6b91e}
 .md-render mark[data-rapier-highlight="purple"]{--md-highlight-color:#9b6dea}
-/* Text colour: the canonical (light) hex and its OKLCH-derived dark pair both ship as inline
+/* Text color: the canonical (light) hex and its OKLCH-derived dark pair both ship as inline
 	 custom properties on the run itself (editor/engine.js, §b) — this just picks between them the
-	 same way as the document palette: the document colour scheme chooses the matching value. The five named swatches also carry a literal,
+	 same way as the document palette: the document color scheme chooses the matching value. The five named swatches also carry a literal,
 	 pre-computed --md-color-dark here, so the common case survives even a round-trip that kept
 	 data-md-color but dropped style, exactly like highlight's own swatch constants. */
 .md-render [data-md-color]{--md-color-dark:var(--md-color);color:light-dark(var(--md-color),var(--md-color-dark))}