rapier-markdown-kit 1.1.102 → 1.2.3

package/dist/spec/document-fonts.mjs

@@ -3,13 +3,13 @@
 import {markdownParser, installMarkdownImages, normalizeLabel} from './md-assets.mjs';
 import {splitOpeningFrontmatter} from './frontmatter.mjs';
 import {readDocumentSettings, documentFont} from './document-settings.mjs';
-import {normalizeFontFamily, fontFamilyCss, FONT_STACKS} from './md-marks.mjs';
+import {normalizeFontFamily, fontFamilyCss, FONT_STACKS, typography} from './md-marks.mjs';
 
 // Unquoted CSS generic families require no portable asset. Quoted names remain custom.
 export const CSS_GENERIC_FONT_FAMILIES = Object.freeze(['serif', 'sans-serif', 'monospace', 'cursive', 'fantasy', 'system-ui',
   'ui-serif', 'ui-sans-serif', 'ui-monospace', 'ui-rounded', 'emoji', 'math', 'fangsong', 'initial', 'revert', 'revert-layer']);
 
-// Also relocated into the parse worker. No decoding or external resource loading happens here.
+// No decoding or external resource loading happens here.
 export function fontDataUrl(url) {
 	if (typeof url !== 'string') return null;
 	const match = /^data:font\/(woff2|woff|ttf|otf);base64,([A-Za-z0-9+/]+={0,2})$/i.exec(url);
@@ -188,6 +188,13 @@ function htmlFontFamilies(html, md) {
 	for (const tag of html.matchAll(/<[A-Za-z][A-Za-z0-9:-]*(?:"[^"]*"|'[^']*'|[^'">])*>/g)) {
 		for (const attr of tag[0].matchAll(/\s(data-md-font|style)\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi)) {
 			const value = decode(attr[2] ?? attr[3] ?? attr[4]), names = [];
+			if (/^<span(?=[\s>])/i.test(tag[0])) {
+				// Raw or unpaired spans use the same admission as paired typography. A CSS
+				// resource expression or authored data-* hook cannot request a font asset.
+				const family = attr[1].toLowerCase() === 'style' ? typography.parseStyle(value).family : null;
+				if (family?.custom) families.add(family.name);
+				continue;
+			}
 			if (attr[1].toLowerCase() === 'data-md-font') names.push(value);
 			else for (const declared of value.matchAll(/(?:^|;)\s*font-family\s*:\s*((?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^;])*)/gi)) {
 				const match = /^\s*(?:"((?:\\.|[^"])*)"|'((?:\\.|[^'])*)'|([^,!]+))/.exec(declared[1]);
@@ -230,9 +237,11 @@ export function documentFontUsage(markdown, parser, defaultFont) {
 			for (const child of token.children || []) {
 				if (child.type === 'html_inline') html += child.content;
 				if (['text', 'text_special', 'emoji', 'image', 'code_inline'].includes(child.type)) text += child.content;
-				const marked = child.type === 'rapier_font_open' ? normalizeFontFamily(child.attrGet('data-md-font')) : null;
-				if (marked) { stack.push(marked); continue; }
-				if (child.type === 'rapier_font_close') { if (stack.length > 1) stack.pop(); continue; }
+				const typed = child.meta?.typography;
+				if (typed && child.nesting === 1) {
+					stack.push(typed.style.family ? typed.style.family.custom ? typed.style.family.name : null : stack.at(-1)); continue;
+				}
+				if (typed && child.nesting === -1) { if (stack.length > 1) stack.pop(); continue; }
 				if (child.type === 'code_inline') add(mono, child.content);
 				else if (['text', 'text_special', 'emoji', 'image'].includes(child.type)) add(stack.at(-1), child.content);
 			}

package/dist/spec/document-settings.mjs

@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: MIT
 // One reader of document-wide settings and the inherited font snapshot.
 // Framing stays in spec/frontmatter.mjs. Reading never rewrites source.
-// The live view reads fontsize, the three font scopes, linestretch and space. It ignores papersize,
+// The live view reads fontsize, the three font scopes and linestretch. It ignores papersize,
 // geometry and pagestyle: a scroll has no page. Word and the PDF read all of them.
 import {frontMatterFrame, frontMatterLine} from './frontmatter.mjs';
 import {normalizeFontFamily, fontFamilyCss, FONT_STACKS} from './md-marks.mjs';
 
 // Twelve points are one reference unit (16 px at the default reading scale).
 const NUMBER = /^(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
-const SPACE = Object.freeze({paragraph: .5, heading: Object.freeze([1.5, .5]), block: 1});
 export const DOCUMENT_LEADING = 1.75 / 1.1;
 
 function measure(value, positive = false) {
@@ -41,7 +40,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, space: null,
+	papersize: null, geometry: null, pagestyle: null,
 });
 
 function unquote(value) {
@@ -53,7 +52,7 @@ function marginOf(value) {
 	const match = /^margin\s*=\s*(\d+(?:\.\d+)?)(cm|mm|in|pt)$/i.exec(unquote(value));
 	if (!match) return null;
 	const number = Number(match[1]);
-	if (!Number.isFinite(number) || number < 0 || number > 6) return null;
+	if (!Number.isFinite(number) || number < 0) return null;
 	const unit = match[2].toLowerCase();
 	const twips = Math.round(unit === 'in' ? number * 1440 : unit === 'pt' ? number * 20 : unit === 'cm' ? number * 1440 / 2.54 : number * 1440 / 25.4);
 	if (!Number.isSafeInteger(twips) || twips < 0 || twips > 1440 * 6) return null;
@@ -214,97 +213,6 @@ function fieldsOf(source) {
 	return {frame, fields: parsed.fields, invalid: parsed.invalid || !structureIsClosed(source, lines)};
 }
 
-function flowItems(source, start, stop) {
-	const items = [];
-	for (let at = start; at < stop;) {
-		if (!source.slice(at, stop).trim()) break;
-		let end = at;
-		for (; end < stop; end++) {
-			const char = source[end];
-			if ((char === '"' || char === "'") && (end === at || /[\s:[{,]/.test(source[end - 1]))) {
-				const next = quotedEnd(source, end, stop);
-				if (next === null) return null;
-				end = next - 1;
-			} else if (char === '[' || char === '{') {
-				const next = flowEnd(source, end, stop);
-				if (next === null) return null;
-				end = next - 1;
-			} else if (char === ',') break;
-		}
-		if (!source.slice(at, end).trim()) return null;
-		items.push({start: at, end, comma: end < stop ? end : null});
-		at = end + 1;
-	}
-	return items;
-}
-
-function spaceFields(source, field) {
-	if (!field || field.opaque || field.invalid || field.multiline) return null;
-	const value = source.slice(field.start, field.end);
-	if (value.startsWith('{') && value.endsWith('}') && !field.children.length) {
-		const chunks = flowItems(source, field.start + 1, field.end - 1), fields = [];
-		if (!chunks) return null;
-		for (const chunk of chunks) {
-			const start = chunk.start + source.slice(chunk.start, chunk.end).match(/^\s*/)[0].length;
-			const line = {start, end: chunk.end, next: chunk.end, text: source.slice(start, chunk.end), eol: ''};
-			const item = fieldLine(line);
-			if (!item) return null;
-			valueSpan(source, item, chunk.end);
-			if (item.invalid || item.key === null) return null;
-			fields.push({...item, entryStart: chunk.start, entryEnd: chunk.end, comma: chunk.comma});
-		}
-		return {fields, flow: true};
-	}
-	if (value) return null;
-	if (!field.children.length) return {fields: [], flow: false};
-	const indent = /^ */.exec(field.children[0].text)[0].length;
-	const parsed = mapFields(source, field.children, indent);
-	return parsed.invalid ? null : {...parsed, flow: false, indent};
-}
-
-function headingParts(source, field) {
-	if (field.opaque || field.invalid || field.multiline) return null;
-	let spans;
-	if (field.children.length) {
-		if (field.start !== field.end) return null;
-		let indent = null;
-		spans = field.children.map(line => {
-			const match = /^( +)-[ \t]+/.exec(line.text);
-			if (!match || indent !== null && match[1].length !== indent) return null;
-			indent = match[1].length;
-			const span = valueSpan(source, {start: line.start + match[0].length, line, children: []}, line.end);
-			return span.invalid || span.opaque ? null : span;
-		});
-	} else {
-		if (source[field.start] !== '[' || source[field.end - 1] !== ']') return null;
-		spans = flowItems(source, field.start + 1, field.end - 1);
-	}
-	if (!spans || spans.length !== 2 || spans.some(span => !span)) return null;
-	const values = spans.map(span => measure(source.slice(span.start, span.end)));
-	return values.includes(null) ? null : {values, spans};
-}
-
-function spaceOf(source, field) {
-	const parsed = spaceFields(source, field);
-	if (!parsed) return null;
-	const value = {...SPACE}, seen = new Set();
-	for (const item of parsed.fields) {
-		if (seen.has(item.key)) return null;
-		seen.add(item.key);
-		if (!Object.hasOwn(SPACE, item.key)) continue;
-		if (item.key === 'heading') {
-			const pair = headingParts(source, item);
-			if (!pair) return null;
-			value.heading = Object.freeze(pair.values);
-		} else {
-			if (item.children.length || item.opaque || item.invalid || item.multiline) return null;
-			value[item.key] = measure(source.slice(item.start, item.end));
-			if (value[item.key] === null) return null;
-		}
-	}
-	return Object.keys(SPACE).some(key => seen.has(key)) ? Object.freeze(value) : null;
-}
-
 export function documentFont(value) {
 	const family = normalizeFontFamily(value);
 	if (!family) return null;
@@ -348,94 +256,37 @@ export function readDocumentSettings(markdown) {
 	const page = String(take('pagestyle') || '').toLowerCase();
 	return Object.freeze({
 		title: take('title') || null, subtitle: take('subtitle') || null, lang: languageTag(take('lang')),
-		fontsize, mainfont, sansfont, monofont, defaultfont, linestretch, space: spaceOf(source, field('space')), papersize, geometry,
+		fontsize, mainfont, sansfont, monofont, defaultfont, linestretch, papersize, geometry,
 		pagestyle: page === 'plain' || page === 'empty' ? page : null,
 	});
 }
 
-function spaceValue(value) {
-	if (!value || typeof value !== 'object' || Array.isArray(value) || Object.keys(value).some(key => !Object.hasOwn(SPACE, key))) return null;
-	const result = {...SPACE, ...value};
-	if (!Array.isArray(result.heading) || result.heading.length !== 2) return null;
-	return [result.paragraph, ...result.heading, result.block].every(number => typeof number === 'number' && Number.isFinite(number) && number >= 0) ? result : null;
-}
-
 // Change only supplied settings. Unrelated YAML, comments, line endings, BOM and body are never reprinted.
 export function updateDocumentSettings(markdown, patch) {
 	const source = String(markdown ?? ''), parsed = fieldsOf(source), {frame, fields} = parsed, before = readDocumentSettings(source);
 	const changes = [], append = [];
 	const eol = frame.closing ? frame.opening.eol : (source.match(/\r\n|\r|\n/) || ['\n'])[0];
-	const encodeSpace = value => '{ paragraph: ' + value.paragraph + ', heading: [' + value.heading.join(', ') + '], block: ' + value.block + ' }';
 	const same = (left, right) => Math.abs(left - right) <= Number.EPSILON * Math.max(Math.abs(left), Math.abs(right)) * 4;
 	const refuse = key => { throw new RangeError('Edit this setting in source: ' + key); };
-	const removeLine = (line, end, indent = 0) => {
+	const removeLine = (line, end) => {
 		const suffix = source.slice(end, line.end);
-		changes.push({start: line.start, end: line.next, text: suffix.trimStart().startsWith('#') ? ' '.repeat(indent) + suffix + line.eol : ''});
+		changes.push({start: line.start, end: line.next, text: suffix.trimStart().startsWith('#') ? suffix + line.eol : ''});
 	};
 	const replaceValue = (field, text) => changes.push({start: field.start, end: field.end,
 		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', 'space'].includes(key)) throw new TypeError('Unknown document setting: ' + key);
+		if (!font && !['fontsize', 'linestretch'].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) : key === 'linestretch' ? leading(supplied) : spaceValue(supplied);
+		const value = supplied === null ? null : font ? documentFont(supplied) : key === 'fontsize' ? fontSize(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 : key === 'linestretch' ? String(value.factor) : encodeSpace(value);
-		if (key !== 'space' && 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 : 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;
+		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);
-		if (key === 'space') {
-			const map = spaceFields(source, field);
-			if (!map) refuse(key);
-			const known = map.fields.filter(item => Object.hasOwn(SPACE, item.key));
-			if (new Set(map.fields.map(item => item.key)).size !== map.fields.length) throw new RangeError('Duplicate document setting: space');
-			if (known.length && !before.space) refuse(key);
-			if (value === null) {
-				const unknown = map.fields.length !== known.length;
-				for (const item of known) {
-					if (map.flow) {
-						if (unknown) changes.push({start: item.entryStart, end: item.comma === null ? item.entryEnd : item.comma + 1, text: ''});
-					} else {
-						for (const child of item.children) {
-							const own = headingParts(source, item)?.spans.find(span => span.line === child);
-							if (!own) refuse(key);
-							removeLine(child, own.end, /^ */.exec(child.text)[0].length);
-						}
-						removeLine(item.line, item.end, item.indent);
-					}
-				}
-				if (!unknown) removeLine(field.line, field.end);
-				continue;
-			}
-			if (before.space && encodeSpace(before.space) === encoded) continue;
-			if (!map.fields.length) { replaceValue(field, encoded); continue; }
-			const missing = [];
-			for (const name of Object.keys(SPACE)) {
-				if (before.space && JSON.stringify(before.space[name]) === JSON.stringify(value[name])) continue;
-				const item = map.fields.find(item => item.key === name);
-				const text = name === 'heading' ? '[' + value.heading.join(', ') + ']' : String(value[name]);
-				if (!item) { missing.push(name + ': ' + text); continue; }
-				if (name === 'heading') {
-					const pair = headingParts(source, item);
-					for (let i = 0; i < 2; i++) if (pair.values[i] !== value.heading[i]) {
-						const span = pair.spans[i], raw = source.slice(span.start, span.end);
-						changes.push({start: span.start + raw.length - raw.trimStart().length, end: span.end - raw.length + raw.trimEnd().length, text: String(value.heading[i])});
-					}
-				} else replaceValue(item, text);
-			}
-			if (missing.length) {
-				if (map.flow) {
-					const last = map.fields.at(-1);
-					changes.push({start: field.end - 1, end: field.end - 1, text: (last.comma === null ? ', ' : ' ') + missing.join(', ')});
-				} else {
-					const last = field.children.at(-1), indent = ' '.repeat(map.indent);
-					changes.push({start: last.next, end: last.next, text: missing.map(item => indent + item + eol).join('')});
-				}
-			}
-			continue;
-		}
 		if (field.children.length) refuse(key);
 		if (value === null) removeLine(field.line, field.end);
 		else replaceValue(field, encoded);
@@ -472,10 +323,6 @@ export function documentSettingsStyle(settings, defaultFont) {
 	const decls = [];
 	if (settings.fontsize) decls.push('--md-text-body:' + settings.fontsize.css);
 	if (settings.linestretch || settings.fontsize) decls.push('--md-line:calc(var(--md-text-body) * ' + (settings.linestretch?.factor ?? DOCUMENT_LEADING) + ')');
-	if (settings.space) {
-		decls.push('--md-space-paragraph:' + settings.space.paragraph, '--md-space-heading-before:' + settings.space.heading[0],
-			'--md-space-heading-after:' + settings.space.heading[1], '--md-space-block:' + settings.space.block);
-	}
 	const {main, sans, mono} = documentSettingsFonts(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)));