rapier-markdown-kit 1.2.33 → 1.2.40

package/dist/spec/md-assets.mjs

@@ -17,9 +17,9 @@ export function installMarkdownImages(md) {
   if (md.__rapierImagesInstalled) return md;
   md.__rapierImagesInstalled = true;
   const validate = md.validateLink;
-  md.validateLink = url => /^data:image\/(?:jxl|svg\+xml);base64,[A-Za-z0-9+/]+={0,2}$/i.test(url) || validate(url);
+  md.validateLink = url => !!dataImage(url) || validate(url);
   const normalize = md.normalizeLink;
-  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);
+  md.normalizeLink = url => dataImage(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);
@@ -179,10 +179,35 @@ export function* blockWindows(source, bodyOffset, parser, env, keepNul = false)
   }
 }
 
+const PERCENT_PAYLOAD = Array.from({length: 128}, (_, code) => code >= 48 && code <= 57 || code >= 65 && code <= 90 ||
+  code >= 97 && code <= 122 || '-._~:/?@+$,;='.includes(String.fromCharCode(code)));
+const isHexUnit = code => code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102;
+let lastScan = null;
 export function dataImage(url) {
   if (typeof url !== 'string' || url.length > IMAGE_LIMITS.sourceChars) return null;
+  if (url.length > 4096) {
+    if (lastScan?.url !== url) lastScan = {url, image: scanDataImage(url)};
+    return lastScan.image && {...lastScan.image};
+  }
+  return scanDataImage(url);
+}
+function scanDataImage(url) {
   const prepared = preparedDefinitions.find(row => row.image.url === url)?.image;
-  if (prepared) return {codec: prepared.codec, byteLength: prepared.byteLength, payloadStart: url.indexOf(',') + 1};
+  if (prepared) return {codec: prepared.codec, byteLength: prepared.byteLength, payloadStart: url.indexOf(',') + 1,
+    ...(prepared.encoding ? {encoding: prepared.encoding} : {})};
+  if (/^data:image\/svg\+xml,/i.test(url)) {
+    const payloadStart = 19;
+    let byteLength = 0;
+    for (let at = payloadStart; at < url.length; at++, byteLength++) {
+      const code = url.charCodeAt(at);
+      if (code === 37) {
+        if (!isHexUnit(url.charCodeAt(at + 1)) || !isHexUnit(url.charCodeAt(at + 2))) return null;
+        at += 2;
+      } else if (!(code < 128 && PERCENT_PAYLOAD[code])) return null;
+    }
+    return byteLength && byteLength <= IMAGE_LIMITS.bytes
+      ? {codec: 'image/svg+xml', byteLength, payloadStart, encoding: 'percent'} : null;
+  }
   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;
@@ -291,7 +316,8 @@ export function restoreAssetIndex(source, packet, {offset = 0, bodyOffset = 0, f
   preparedDefinitions = blocks.filter(row => row.topLevel).map(row => {
     const local = {...row, start: 0, end: row.source.length, active: true, status: 'unverified'};
     for (const key of positions.slice(2)) if (Number.isSafeInteger(local[key])) local[key] -= row.start;
-    const image = Object.freeze({url: row.url, codec: row.codec, byteLength: row.byteLength});
+    const image = Object.freeze({url: row.url, codec: row.codec, byteLength: row.byteLength,
+      ...(row.encoding ? {encoding: row.encoding} : {})});
     return {source: row.source, factory, image, index: {assets: new Map([[row.id, local]]), blocks: [local],
       references: Object.assign(Object.create(null), {[row.id]: {href: row.url, title: row.title}}),
       duplicateLabels: new Set(), appendixStart: 0}};
@@ -314,7 +340,7 @@ export function projectImageDefinitions(source, index) {
   const references = Object.create(null);
   for (const [label, definition] of Object.entries(index.references)) {
     const image = index.assets.get(label);
-    references[label] = {href: image?.url === definition.href ? 'data:' + image.codec + ';base64,AA==' : definition.href,
+    references[label] = {href: image?.url === definition.href ? image.url.slice(0, image.url.indexOf(',') + 1) + 'AA==' : definition.href,
       title: definition.title};
   }
   return {source: records.length ? parts.join('') : source, records, references};
@@ -513,12 +539,17 @@ export function retireDeletedImageDefinitions(before, after, splices, factory) {
         !remaining.includes('[' + row.id) && !now.html.includes(row.id) && !now.html.includes(row.url.toUpperCase());
     });
     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));
+      const gap = /(?:\r\n|\r(?!\n)|(?<!\r)\n){2}$/.exec(after.slice(Math.max(0, row.start - 5), 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 + (last ? after.slice(row.end) : ''), inserted: ''} : {pos: row.start, removed: row.source, inserted: ''};
+      if (whole) {
+        const [first, second] = gap[0].match(/\r\n|\r|\n/g), padding = first === second ? gap[0] : second;
+        return {pos: row.start - padding.length, removed: padding + row.source + (last ? after.slice(row.end) : ''), inserted: ''};
+      }
+      const between = gap && /^(?:\r\n|\r(?!\n)|(?<!\r)\n){2}/.test(tail) && row.start - gap[0].length >= markdownBodyOffset(after);
+      return between ? {pos: row.start - gap[0].length, removed: gap[0] + row.source, inserted: ''} : {pos: row.start, removed: row.source, inserted: ''};
     });
   } catch (_) { return []; }
 }
@@ -551,7 +582,7 @@ function previousOmissions(view, kind) {
     rows = rows.flatMap(row => {
       const permitted = kind === 'asset' ? /^[A-Za-z0-9+/=\\;&%#._~-]*$/
         : row.profile === 'base64' ? /^[A-Za-z0-9+/=\s]*$/ : /^[A-Za-z0-9\-._~!$&*+;=:@/?%]*$/;
-      if (change.pos >= row.payloadStart && end <= row.end && permitted.test(change.text)) {
+      if (!row.percent && change.pos >= row.payloadStart && end <= row.end && permitted.test(change.text)) {
         const next = {...row, end: row.end + delta, chars: row.chars + delta};
         if (kind === 'asset') {
           const was = payloadFacts(change.before.deref().slice(change.pos, end)), now = payloadFacts(change.text);
@@ -575,6 +606,7 @@ function dataMatches(source, kind, envelopes = []) {
   const prior = previousOmissions(view, kind), rows = new Map();
   const pattern = kind === 'asset' ? /data:(image\/[a-z0-9.+-]+);base64,[A-Za-z0-9+/=\\;&%#._~-]*/iy
     : /data:([a-z0-9!#$&^_.+-]+\/[a-z0-9!#$&^_.+-]+)(?:;[^,\s"'<>)]*)?,/iy;
+  const svgPattern = /data:(image\/svg\+xml),[A-Za-z0-9%\-._~:/?@+$,;=]*/iy;
   let end = 0, envelopeIndex = 0;
   for (const at of measured.markers) {
     if (kind === 'asset' && at < end) continue;
@@ -583,15 +615,21 @@ function dataMatches(source, kind, envelopes = []) {
     let row = prior.get(at);
     if (!row) {
       pattern.lastIndex = at;
-      const match = pattern.exec(source);
+      let match = pattern.exec(source), percent = false;
+      if (!match && kind === 'asset') {
+        svgPattern.lastIndex = at; match = svgPattern.exec(source);
+        if (match && !dataImage(match[0])) match = null;
+        percent = !!match;
+        if (percent) pattern.lastIndex = svgPattern.lastIndex;
+      }
       if (!match) continue;
       if (kind === 'asset') {
         const value = match[0], payload = value.slice(value.indexOf(',') + 1);
         const {bad, equals} = payloadFacts(payload);
-        const bytes = payloadBytes(payload.length, bad, equals, equals <= 2 ? payload.slice(payload.length - equals) : '');
+        const bytes = percent ? dataImage(value)?.byteLength ?? null : payloadBytes(payload.length, bad, equals, equals <= 2 ? payload.slice(payload.length - equals) : '');
         row = {start: at, end: pattern.lastIndex, chars: value.length,
           domain: 'image_bytes', reason: 'embedded_asset', profile: 'embedded', type: match[1].toLowerCase(), bytes,
-          payloadStart: pattern.lastIndex - payload.length, bad, equals};
+          payloadStart: pattern.lastIndex - payload.length, bad, equals, ...(percent ? {percent} : {})};
       } else {
         const payloadStart = pattern.lastIndex, base64 = /;base64,/i.test(match[0]);
         let to = payloadStart;
@@ -608,7 +646,7 @@ function dataMatches(source, kind, envelopes = []) {
 }
 export function assetOmissions(source) {
   if (typeof source !== 'string') return [];
-  return [...dataMatches(source, 'asset').values()].map(({payloadStart, bad, equals, ...row}) => row);
+  return [...dataMatches(source, 'asset').values()].map(({payloadStart, bad, equals, percent, ...row}) => row);
 }
 
 export function dataOmissions(source) {
@@ -667,3 +705,5 @@ export function appendAssetText(source, asset, lineEnding, {preserveLabel = fals
   return {source: nextSource, id: asset.id, reference: asset.label, added: true, suffix};
 }
 export async function appendAsset(source, asset) { return appendAssetText(source, asset); }
+
+export const imageOnlySourceBlock = source => /^(?:!\[[^\]\n]*\]\(data:image\/(?:(?:png|jpeg|webp|gif|jxl|svg\+xml);base64,[A-Za-z0-9+\/=]+|svg\+xml,[A-Za-z0-9%\-._~:/?@+$,;=]+)(?: "[^"\n]*")?\)(?:[ \t]*<!--md-layout:v1 [^>\r\n]{1,180}-->)?\s*)+$/.test(source);

package/package.json

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

@@ -142,7 +142,7 @@
 .md-render p[data-rapier-typography-fit]{text-align:justify!important;text-align-last:start;text-wrap:nowrap;hyphens:none;hanging-punctuation:none}
 .md-render p[data-rapier-typography-fit] :is(a,span,em,i,strong,b,del,s,mark,code,kbd,samp,u,ins,abbr){text-wrap:nowrap;hyphens:none;hanging-punctuation:none}
 .md-render [data-rapier-typography-separator]{font-size:0;line-height:0;word-spacing:0!important;letter-spacing:0!important}
-.md-render [data-rapier-typography-break="hyphen"]::before{content:var(--md-fit-hyphen,'-')}
+.md-render [data-rapier-typography-break="hyphen"]::before{content:var(--md-fit-hyphen,'-');margin-inline-end:var(--md-fit-protrude,0px)}
 .md-render p[data-rapier-typography-ragged]{text-align:start!important}
 .md-render p[data-md-lines]:not([data-rapier-typography-protected-initial])::first-letter{
 	initial-letter:var(--md-drop-lines,normal);
@@ -219,29 +219,31 @@
    at admission; only renderer paint omissions are corrected here. */
 :where(.md-render) svg.rapier-native-flowchart{display:block;margin-inline:auto;height:auto}
 :where(.md-render) svg.rapier-diagram{display:block;margin-inline:auto;height:auto;text-rendering:optimizeLegibility}
-/* The same token bridge serves the document, live preview and portable page. */
+/* The same token bridge serves the document, live preview and portable page. Pele reads --pele-* names; the
+   adapter (_presentPele in shell/plugin-loader.js) points them at these --md-pele-* names, and the app's own sheet
+   lets its theme (--color-*, --font-*) lead them in the editor. */
 :where(.md-render) :is(.diagram-block,.diagram-live-preview){
- --pele-bg:transparent;
- --pele-fg:var(--color-text,var(--md-color-text));
- --pele-line:var(--color-text,var(--md-color-text));
- --pele-muted:var(--color-text-secondary,var(--md-color-text-secondary));
- --pele-surface:var(--color-surface-2,var(--md-color-surface-2));
- --pele-surface-alt:var(--color-surface-hover,var(--md-color-border-focus));
- --pele-border:var(--color-border,var(--color-surface-hover,var(--md-color-border)));
- --pele-accent:var(--color-accent,var(--md-color-accent));
- --pele-font:var(--font-sans,var(--md-font-sans));
- --pele-font-mono:var(--font-mono,var(--md-font-mono));
- --pele-radius:0;
- --pele-heading-weight:var(--md-fw-semibold);
- --pele-title-weight:var(--md-fw-semibold);
- --pele-series-1:var(--pele-accent);
- --pele-series-2:#4f91f7;
- --pele-series-3:#35c57a;
- --pele-series-4:#e6b91e;
- --pele-series-5:#9b6dea;
- --pele-series-6:#f05a62;
- --pele-series-7:color-mix(in srgb,var(--pele-accent) 50%,#4f91f7);
- --pele-series-8:color-mix(in srgb,#9b6dea 50%,#f05a62);
+ --md-pele-bg:transparent;
+ --md-pele-fg:var(--md-color-text);
+ --md-pele-line:var(--md-color-text);
+ --md-pele-muted:var(--md-color-text-secondary);
+ --md-pele-surface:var(--md-color-surface-2);
+ --md-pele-surface-alt:var(--md-color-border-focus);
+ --md-pele-border:var(--md-color-border);
+ --md-pele-accent:var(--md-color-accent);
+ --md-pele-font:var(--md-font-sans);
+ --md-pele-font-mono:var(--md-font-mono);
+ --md-pele-radius:0;
+ --md-pele-heading-weight:var(--md-fw-semibold);
+ --md-pele-title-weight:var(--md-fw-semibold);
+ --md-pele-series-1:var(--md-pele-accent);
+ --md-pele-series-2:#4f91f7;
+ --md-pele-series-3:#35c57a;
+ --md-pele-series-4:#e6b91e;
+ --md-pele-series-5:#9b6dea;
+ --md-pele-series-6:#f05a62;
+ --md-pele-series-7:color-mix(in srgb,var(--md-pele-accent) 50%,#4f91f7);
+ --md-pele-series-8:color-mix(in srgb,#9b6dea 50%,#f05a62);
 }
 
 /* Radar gives these SVG labels a color declaration; SVG text needs a fill. */

package/dist/agent/vendor/pretext/entry-geometry.js

@@ -1,183 +0,0 @@
-/*! Pretext Unreleased (bac1774c0) | MIT; BSD/Unicode/ICU notices in LICENSE | Copyright (c) 2026 Pretext contributors */
-// Fresh-line geometry, or entry geometry: the widths a line takes where it starts inside a
-// segment cut between graphemes, at or inside a stretch of it that holds a default-ignorable code
-// point (a ZWNJ, a word joiner, a bidi mark). Shaping looks past such a character, so the text
-// after the cut, shaped afresh at the line's start, can measure otherwise than the segment's own
-// advances give (RESEARCH.md, Widths After A Line Break). For each such start, preparation
-// measures the text from the start through the first whole grapheme past that stretch, the
-// anchor, in at most three prefixes (the entry's head); past the anchor the widths go on by the
-// segment's advances. The walkers (src/line-break.ts) ask an entry whether the segment's whole
-// tail fits the line (admissionFit), which Blink reads from the tail as measured afresh and Gecko
-// from the whole segment's width less the prefixes already placed (the profile's entryFitBasis),
-// and, where it doesn't fit, how many graphemes do by the fresh prefixes. Only the desktop Blink
-// and Gecko profiles observe entries, the browsers they were checked in, and a segment of more
-// than 96 graphemes takes none (RESEARCH.md, Keeping Work Bounded).
-import { findGraphemeEnds } from './graphemes.js'
-import { getEngineProfile } from './measurement.js'
-
-const defaultIgnorable = /\p{Default_Ignorable_Code_Point}/u
-const MAX_GRAPHEMES = 96
-const MAX_HEAD_ENDPOINTS = 3
-
-// Whether a text holds a default-ignorable code point, without which no segment of it has entry
-// geometry (observeSegmentEntries).
-export function textMayHaveEntryGeometry(text        )          {
-  return defaultIgnorable.test(text)
-}
-
-                                                          
-                                    
-                            
-                                
- 
-
-                                                            
-
-// The stretches of a segment that a default-ignorable affects, as intervals of the source text.
-// The text without its default-ignorables (the projection) is cut into grapheme clusters, and the
-// segment's own graphemes that one such cluster spans are joined into one interval. An interval
-// is observed where it holds a default-ignorable, and leading default-ignorables join the first
-// visible interval. The projection only picks the intervals: what is measured is the source text,
-// and the segment's grapheme boundaries and breaks stay its own.
-function affectedIntervals(text        , endpoints                   )         {
-  const spans                                   = []
-  const projected           = []
-  const visibleRuns = /[^\p{Default_Ignorable_Code_Point}]+/gu
-  for (let match; (match = visibleRuns.exec(text)) !== null;) {
-    spans.push({ start: match.index, end: match.index + match[0].length })
-    projected.push(match[0])
-  }
-  // Map only the projected grapheme endpoints through retained source views.
-  // The last code unit maps before an ignored gap; the next start maps after it.
-  let spanIndex = 0
-  let projectedStart = 0
-  function sourceOffset(offset        )         {
-    let span = spans[spanIndex] 
-    while (offset >= projectedStart + span.end - span.start) {
-      projectedStart += span.end - span.start
-      span = spans[++spanIndex] 
-    }
-    return span.start + offset - projectedStart
-  }
-  const joined = new Uint8Array(endpoints.length)
-  const visible = projected.join('')
-  const ends = new Int32Array(visible.length)
-  const count = findGraphemeEnds(getEngineProfile().graphemeTable, visible, 0, visible.length, ends)
-  let boundaryIndex = 1
-  for (let i = 0, projectedEnd = 0; i < count; i++) {
-    const start = sourceOffset(projectedEnd)
-    projectedEnd = ends[i] 
-    const end = sourceOffset(projectedEnd - 1) + 1
-    while (boundaryIndex < endpoints.length && endpoints[boundaryIndex]  <= start) boundaryIndex++
-    while (boundaryIndex < endpoints.length && endpoints[boundaryIndex]  < end) joined[boundaryIndex++] = 1
-  }
-  const parts         = []
-  let start = 0
-  for (let index = 1; index < endpoints.length; index++) {
-    if (joined[index] === 1) continue
-    const end = endpoints[index] 
-    parts.push({ start, end, observe: defaultIgnorable.test(text.slice(start, end)) })
-    start = end
-  }
-  const leadingEnd = spans.length === 0 ? text.length : spans[0] .start
-  if (leadingEnd > 0 && leadingEnd < text.length) {
-    let firstVisiblePart = 0
-    while (parts[firstVisiblePart] .end <= leadingEnd) firstVisiblePart++
-    parts.splice(0, firstVisiblePart + 1, { start: 0, end: parts[firstVisiblePart] .end, observe: true })
-  }
-  return parts
-}
-
-// At most 96 original graphemes and three exact head queries per covered entry.
-// Each source grapheme enters at most 3 + 2 + 1 measured prefixes across all
-// starts, so submitted UTF-16 stays at most six times the source length.
-// Preparation retains only numeric geometry for subsequent line walking.
-export function observeSegmentEntries(
-  text        ,
-  advances                   ,
-  letterSpacing        ,
-  wholeWidth        ,
-  fitBasis                      ,
-  measure                                 ,
-)                              {
-  if (!defaultIgnorable.test(text) || advances.length > MAX_GRAPHEMES) return null
-  const ends = new Int32Array(text.length)
-  const count = findGraphemeEnds(getEngineProfile().graphemeTable, text, 0, text.length, ends)
-  if (count > MAX_GRAPHEMES) return null
-  const endpoints = [0]
-  for (let i = 0; i < count; i++) endpoints.push(ends[i] )
-  if (endpoints.length !== advances.length + 1) throw new Error('Entry and release grapheme cursors differ')
-  const parts = affectedIntervals(text, endpoints)
-  const terminalPrefixes = [0]
-  for (const advance of advances) terminalPrefixes.push(terminalPrefixes[terminalPrefixes.length - 1]  + advance + letterSpacing)
-  const entries                        = Array.from({ length: advances.length }, () => null)
-  let partIndex = 0
-  let hasEntries = false
-  for (let start = 1; start < advances.length; start++) {
-    const sourceStart = endpoints[start] 
-    while (partIndex < parts.length && parts[partIndex] .end <= sourceStart) partIndex++
-    const part = parts[partIndex]
-    // A start is observed inside an affected interval. The anchor, the first whole grapheme
-    // past that interval, is measured after it as its right context, and a line that starts
-    // at the anchor takes an entry only where the anchor's own interval is affected.
-    if (part === undefined || !part.observe || sourceStart < part.start) continue
-    let anchor = start + 1
-    while (anchor < advances.length && endpoints[anchor]  <= part.end) anchor++
-    // An entry needs that whole grapheme. An interval that ends the segment has none, so
-    // its starts take no entry: what a line start measures with nothing after it hasn't
-    // been checked against a browser. Nor does a start whose head would take more than
-    // three prefixes.
-    if (endpoints[anchor]  <= part.end || anchor - start > MAX_HEAD_ENDPOINTS) continue
-    const head           = []
-    let complete = true
-    for (let end = start + 1; end <= anchor; end++) {
-      const query = text.slice(sourceStart, endpoints[end])
-      const width = measure(query)
-      if (width === null || !Number.isFinite(width)) { complete = false; break }
-      head.push(width)
-    }
-    if (!complete) continue
-    let admissionFit        
-    switch (fitBasis) {
-      case 'fresh':
-        admissionFit = head[head.length - 1]  +
-          (terminalPrefixes[advances.length]  - terminalPrefixes[anchor] )
-        break
-      case 'original':
-        admissionFit = wholeWidth + letterSpacing - terminalPrefixes[start] 
-        break
-    }
-    entries[start] = { head, admissionFit }
-    hasEntries = true
-  }
-  return hasEntries ? { terminalPrefixes, entries } : null
-}
-
-// Where a fresh line that starts at grapheme `start` of a segment ends, by the entry observed
-// there: past the segment's end (end + 1) where the whole tail is admitted and the line goes on
-// with the text after it, else after the last fresh prefix that fits, keeping the first grapheme.
-// `end` then means the prefixes ran out, and the line ends with the segment.
-export function getFreshLineEnd(geometry                      , start        , end        , fitLimit        )         {
-  if (geometry.entries[start] .admissionFit <= fitLimit) return end + 1
-  let g = start + 1
-  while (g < end && getSegmentEntryWidth(geometry, start, g + 1)  <= fitLimit) g++
-  return g
-}
-
-// The width of a segment's graphemes from `start` to `end` on a fresh line that starts at
-// `start`, with the letter spacing after the last of them. Null where no entry was observed,
-// as at the segment's own start; an observed 0 is a width, and the prefixes needn't grow.
-export function getSegmentEntryWidth(
-  geometry                             ,
-  start        ,
-  end        ,
-)                {
-  if (geometry === null) return null
-  const entry = geometry.entries[start]                     
-  if (entry === null) return null
-  if (end === start) return 0
-  const anchor = start + entry.head.length
-  if (end <= anchor) return entry.head[end - start - 1] 
-  return entry.head[entry.head.length - 1]  +
-    (geometry.terminalPrefixes[end]  - geometry.terminalPrefixes[anchor] )
-}