@stll/folio-core 0.33.2 → 0.35.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -689,9 +689,9 @@ function createTrackedRunWrapper(type, info, child) {
 		content
 	};
 }
-function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false) {
+function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
 	const content = [];
-	const inheritedFormatting = paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0;
+	const inheritedFormatting = inheritedFormattingOverride ?? (paragraph.type.name === "paragraph" ? expectParagraphAttrs(paragraph).defaultTextFormatting ?? void 0 : void 0);
 	const sortedEmptyHyperlinks = (emptyHyperlinks ?? []).map((attrs, order) => ({
 		attrs,
 		order
@@ -966,7 +966,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			}));
 		} else if (node.type.name === "sdt") {
 			flushCurrentInline();
-			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers));
+			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers, inheritedFormatting));
 		} else if (node.type.name === "math") {
 			flushCurrentInline();
 			content.push(createMathFromNode(node));
@@ -1369,11 +1369,11 @@ function createMathFromNode(node) {
 /**
 * Create an InlineSdt from a PM sdt node
 */
-function createInlineSdtFromNode(node, textBoxAnchorMarkers) {
+function createInlineSdtFromNode(node, textBoxAnchorMarkers, inheritedFormatting) {
 	return {
 		type: "inlineSdt",
 		properties: sdtPropertiesFromAttrs(expectSdtAttrs(node)),
-		content: extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "moveFrom" || c.type === "moveTo" || c.type === "mathEquation")
+		content: extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers, false, inheritedFormatting).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "moveFrom" || c.type === "moveTo" || c.type === "mathEquation")
 	};
 }
 /**
@@ -1524,6 +1524,7 @@ function createShapeRun(node) {
 function marksToTextFormatting(marks, options) {
 	const formatting = {};
 	let directOverrideFormatting;
+	let directFontProperties;
 	let characterStyleRPr;
 	let runFormattingOverrideMark;
 	for (const mark of marks) switch (mark.type.name) {
@@ -1651,9 +1652,14 @@ function marksToTextFormatting(marks, options) {
 	}
 	if (runFormattingOverrideMark) {
 		const overrideAttrs = expectRunFormattingOverrideMarkAttrs(runFormattingOverrideMark);
+		directFontProperties = overrideAttrs.directFontProperties;
 		applyRunFormattingOverrideAttrs(formatting, overrideAttrs);
 		directOverrideFormatting = {};
 		applyRunFormattingOverrideAttrs(directOverrideFormatting, overrideAttrs);
+		for (const property of directFontProperties ?? []) {
+			const value = formatting[property];
+			if (value !== void 0) Reflect.set(directOverrideFormatting, property, value);
+		}
 	}
 	if (characterStyleRPr) return subtractCharacterStyleFormatting({
 		directOverrideFormatting,
@@ -1661,8 +1667,29 @@ function marksToTextFormatting(marks, options) {
 		inheritedFormatting: options?.inheritedFormatting,
 		styleRPr: characterStyleRPr
 	});
+	for (const property of [
+		"fontFamily",
+		"fontSize",
+		"color"
+	]) {
+		if (directFontProperties?.includes(property)) continue;
+		const value = formatting[property];
+		const inheritedValue = options?.inheritedFormatting?.[property];
+		const matchesInherited = property === "fontFamily" ? sameFontFamily(formatting.fontFamily, options?.inheritedFormatting?.fontFamily) : JSON.stringify(value) === JSON.stringify(inheritedValue);
+		if (inheritedValue !== void 0 && matchesInherited) Reflect.deleteProperty(formatting, property);
+	}
 	return formatting;
 }
+const sameFontFamily = (left, right) => [
+	"ascii",
+	"hAnsi",
+	"eastAsia",
+	"hint",
+	"asciiTheme",
+	"hAnsiTheme",
+	"eastAsiaTheme",
+	"csTheme"
+].every((property) => left?.[property] === right?.[property]) && (left?.cs ?? left?.ascii) === (right?.cs ?? right?.ascii);
 /**
 * Negatable boolean run-property keys whose serializer emits an explicit
 * `w:val="0"` override when the value is `false` (see `serializeTextFormatting`

package/dist/prosemirror/conversion/toProseDoc.js

@@ -18,6 +18,7 @@ import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
 //#region src/prosemirror/conversion/toProseDoc.ts
+const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 /**
 * Build a `nextTextBoxGroupId()` generator salted with a random per-load
 * nonce, so minted text-box anchor ids (`<salt>:<group>:<index>`) are unique
@@ -139,7 +140,12 @@ function toProseDoc(document, options) {
 	};
 	nodes.push(...convertBodyBlocks(paragraphs));
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
-	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, nodes));
+	const finalSectionStart = document.package.document.sections?.at(-1)?.properties.sectionStart ?? null;
+	const adjustLineHeightInTable = document.package.settings?.adjustLineHeightInTable === true;
+	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", {
+		_finalSectionStart: finalSectionStart,
+		_adjustLineHeightInTable: adjustLineHeightInTable
+	}, nodes));
 	assertValidProseMirrorDocument(pmDoc, "Document conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }
@@ -210,6 +216,7 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
+	const ordinaryStyleFormatting = paragraph.formatting?.styleId === void 0 ? mergeTextFormatting(styleRunFormatting, extraRunFormatting) : mergeTextFormatting(extraRunFormatting, styleRunFormatting);
 	const orderedToggleFormatting = cascadeStyleTextFormatting([
 		{
 			formatting: styleResolver?.getDocDefaults()?.rPr,
@@ -223,7 +230,7 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 			formatting: paragraphStyleRunFormatting,
 			type: "style"
 		}
-	], { ordinaryFormatting: mergeTextFormatting(styleRunFormatting, extraRunFormatting) });
+	], { ordinaryFormatting: ordinaryStyleFormatting });
 	let baseRunFormatting = orderedToggleFormatting.formatting;
 	if (paragraphStyleFontFamily) baseRunFormatting = mergeTextFormatting(baseRunFormatting, { fontFamily: paragraphStyleFontFamily });
 	const paragraphMarkPrecedesStyle = paragraph.formatting?.styleId !== void 0;
@@ -1000,10 +1007,10 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		let cellConditionalStyle = conditionalStyles?.wholeTable;
 		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, effectiveRowBandStyle);
 		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, vertBandStyle);
-		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
-		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
 		if (cellIsFirstCol && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstCol);
 		if (cellIsLastCol && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastCol);
+		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
+		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
 		if (cellIsFirstRow && cellIsFirstCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.nwCell);
 		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
 		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
@@ -1265,6 +1272,7 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		hasCharacterStyle: styleId !== void 0,
 		paragraphMarkOverrides: inherited.paragraphMarkOverrides
 	}) });
+	addDirectFontProvenance(marks, runFormatting);
 	if (styleId) {
 		const styleRPr = characterStyleFormatting ? marksToTextFormatting(textFormattingToMarks(characterStyleFormatting)) : void 0;
 		marks.push(schema.mark("characterStyle", {
@@ -1277,6 +1285,24 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		mergedFormatting
 	};
 }
+const addDirectFontProvenance = (marks, directFormatting) => {
+	const directFontProperties = [];
+	if (directFormatting?.fontFamily !== void 0) directFontProperties.push("fontFamily");
+	if (directFormatting?.fontSize !== void 0) directFontProperties.push("fontSize");
+	if (directFormatting?.color !== void 0) directFontProperties.push("color");
+	if (!directFormatting || !Object.keys(directFormatting).some((property) => property !== "styleId")) return;
+	const index = marks.findIndex(({ type }) => type.name === "runFormattingOverride");
+	const existing = index >= 0 ? marks.at(index) : void 0;
+	const override = schema.mark("runFormattingOverride", {
+		...existing?.attrs,
+		...directFontProperties.length > 0 && { directFontProperties }
+	});
+	if (index >= 0) {
+		marks[index] = override;
+		return;
+	}
+	marks.push(override);
+};
 const ORDINARY_STYLE_TOGGLE_KEYS = [
 	"bold",
 	"italic",
@@ -1658,12 +1684,12 @@ function convertShape(shape) {
 		position
 	});
 }
-function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, tableParagraphOverlay }) {
+function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, preserveEmptyWrapper, tableParagraphOverlay }) {
 	const { textBoxes, textBoxAnchors } = extractTextBoxesFromParagraph(block, textBoxGroupId);
 	const pmParagraph = convertParagraph(block, styleResolver, context.nextHyperlinkInstanceIndex, context.pairedBookmarkIds, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && !hasContentBesidesTextBoxAnchors(pmParagraph);
-	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
+	const keepWrapperParagraph = isEmptyAfterExtraction && (preserveEmptyWrapper === true || hasParagraphBoundaryPayload(block, pmParagraph));
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
 	for (const { textBox, anchorId, trackedChange, inlineSdts } of textBoxes) nodes.push(convertTextBox(textBox, styleResolver, {
 		placement: isEmptyAfterExtraction && !keepWrapperParagraph ? "standalone" : "inlineWithPrevious",
@@ -1929,11 +1955,23 @@ function headerFooterToProseDoc(content, options) {
 	};
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
-			textBoxGroupId: nextTextBoxGroupId(),
-			context: conversionContext
-		}));
-		else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
+		for (const block of blocks) if (block.type === "paragraph") {
+			const isDetachedWatermarkHost = Reflect.get(block, DETACHED_WATERMARK_HOST) === true;
+			const paragraphNodes = convertParagraphWithTextBoxes(block, styleResolver, {
+				textBoxGroupId: nextTextBoxGroupId(),
+				context: conversionContext,
+				preserveEmptyWrapper: isDetachedWatermarkHost
+			});
+			if (isDetachedWatermarkHost) {
+				const paragraphNodeIndex = paragraphNodes.findIndex(({ type }) => type.name === "paragraph");
+				const paragraphNode = paragraphNodes[paragraphNodeIndex];
+				if (paragraphNode) paragraphNodes[paragraphNodeIndex] = paragraphNode.type.create({
+					...paragraphNode.attrs,
+					_detachedWatermarkHost: true
+				}, paragraphNode.content, paragraphNode.marks);
+			}
+			out.push(...paragraphNodes);
+		} else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
 		else out.push(convertBlockSdt(block, convertBlocks));
 		return out;
 	};

package/dist/prosemirror/extensions/core/DocExtension.js

@@ -6,7 +6,13 @@ import { createNodeExtension } from "../create.js";
 const DocExtension = createNodeExtension({
 	name: "doc",
 	schemaNodeName: "doc",
-	nodeSpec: { content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt)+" }
+	nodeSpec: {
+		attrs: {
+			_finalSectionStart: { default: null },
+			_adjustLineHeightInTable: { default: false }
+		},
+		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt)+"
+	}
 });
 //#endregion
 export { DocExtension };

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -223,6 +223,7 @@ const paragraphNodeSpec = {
 		pageBreakBefore: { default: null },
 		renderedPageBreakBefore: { default: null },
 		_pageBreakCarrier: { default: null },
+		_detachedWatermarkHost: { default: null },
 		_trailingPageBreak: { default: null },
 		keepNext: { default: null },
 		keepLines: { default: null },

package/dist/prosemirror/extensions/marks/RunFormattingOverrideExtension.js

@@ -50,6 +50,7 @@ const RunFormattingOverrideExtension = createMarkExtension({
 	schemaMarkName: "runFormattingOverride",
 	markSpec: {
 		attrs: {
+			directFontProperties: { default: null },
 			bold: { default: null },
 			italic: { default: null },
 			underline: { default: null },

package/dist/prosemirror/plugins/templateDirectives.d.ts

@@ -9,10 +9,16 @@ type DirectiveRange = {
   /** Exclusive PM doc position of the marker end. */
   to: number;
   kind: DirectiveKind;
-  /** Field path, clause name, or condition/loop expression. */
+  /**
+   * Field path, clause name, key, condition, or — for a `for` marker — the
+   * array path the loop iterates (`{% for row in items %}` ⇒ `items`).
+   */
   expr: string;
   /** Clause-slot version selector, e.g. "v3" or "latest". */
   clauseVersion?: string;
+  /** Loop alias of a `for` marker (`{% for row in items %}` ⇒ `row`); unset
+   *  for every other kind. */
+  alias?: string;
   /** True for block directives that occupy their own paragraph. */
   block: boolean;
 };
@@ -20,15 +26,16 @@ type DirectiveRange = {
  * Nesting depth (0-based) of every block-directive opener, derived purely from
  * the scanned ranges by containment: walk the block openers/closers in document
  * order with a kind-aware stack, and record each opener's depth as the stack size
- * before it is pushed. Only `block:true` if/each pairs participate (inline markers
+ * before it is pushed. Only `block:true` if/for pairs participate (inline markers
  * resolve within a paragraph and get no rail).
  *
  * Matching is kind-aware so a mid-edit / unbalanced template stays sane: a closer
- * pops the nearest opener of the *same family* ({{/if}} ⇒ {{#if}}, {{/each}} ⇒
- * {{#each}}), dropping any still-open openers nested above it; a closer with no
- * matching opener is ignored (never decrements a foreign block's depth). A blind
- * open/close counter would mis-count here: e.g. a stray {{/each}} between {{#if}}
- * and a nested {{#each}} would wrongly pull the inner {{#each}} back to depth 0.
+ * pops the nearest opener of the *same family* (`{% endif %}` ⇒ `{% if %}`,
+ * `{% endfor %}` ⇒ `{% for %}`), dropping any still-open openers nested above it;
+ * a closer with no matching opener is ignored (never decrements a foreign block's
+ * depth). A blind open/close counter would mis-count here: e.g. a stray
+ * `{% endfor %}` between `{% if %}` and a nested `{% for %}` would wrongly pull
+ * the inner `{% for %}` back to depth 0.
  *
  * Keyed by the opener's `from` PM position, which is unique per marker, so the
  * overlay can look a band's depth up from its opener range. This is a pure

package/dist/prosemirror/plugins/templateDirectives.js

@@ -3,41 +3,42 @@ import { collectBlockChunks, joinChunks, offsetToDocPos } from "./pmTextScan.js"
 import { PluginKey } from "prosemirror-state";
 import { assertNever, isBlockDirectiveKind, scanMarkers } from "@stll/template-conditions";
 //#region src/prosemirror/plugins/templateDirectives.ts
-/** The display expression for a marker (field path, clause name, key, condition). */
+/** The display expression for a marker (field path, clause name, key,
+*  condition, loop array path, loop property). */
 const directiveExpr = (meta) => {
 	switch (meta.kind) {
 		case "placeholder": return meta.expr;
 		case "clause": return meta.name;
 		case "num":
 		case "ref": return meta.key;
+		case "loop": return meta.property;
 		case "if":
-		case "elseif":
-		case "each": return meta.expr;
-		case "index":
-		case "count":
+		case "elif": return meta.expr;
+		case "for": return meta.path;
 		case "else":
 		case "endif":
-		case "endeach": return "";
+		case "endfor": return "";
 		default: return assertNever(meta);
 	}
 };
-/** Block-directive openers ({{#if}}, {{#each}}) that start a gutter-rail band. */
-const BLOCK_OPENER_KINDS = /* @__PURE__ */ new Set(["if", "each"]);
-/** Block-directive closers ({{/if}}, {{/each}}) that end a gutter-rail band. */
-const BLOCK_CLOSER_KINDS = /* @__PURE__ */ new Set(["endif", "endeach"]);
+/** Block-directive openers (`{% if %}`, `{% for %}`) that start a gutter-rail band. */
+const BLOCK_OPENER_KINDS = /* @__PURE__ */ new Set(["if", "for"]);
+/** Block-directive closers (`{% endif %}`, `{% endfor %}`) that end a gutter-rail band. */
+const BLOCK_CLOSER_KINDS = /* @__PURE__ */ new Set(["endif", "endfor"]);
 /**
 * Nesting depth (0-based) of every block-directive opener, derived purely from
 * the scanned ranges by containment: walk the block openers/closers in document
 * order with a kind-aware stack, and record each opener's depth as the stack size
-* before it is pushed. Only `block:true` if/each pairs participate (inline markers
+* before it is pushed. Only `block:true` if/for pairs participate (inline markers
 * resolve within a paragraph and get no rail).
 *
 * Matching is kind-aware so a mid-edit / unbalanced template stays sane: a closer
-* pops the nearest opener of the *same family* ({{/if}} ⇒ {{#if}}, {{/each}} ⇒
-* {{#each}}), dropping any still-open openers nested above it; a closer with no
-* matching opener is ignored (never decrements a foreign block's depth). A blind
-* open/close counter would mis-count here: e.g. a stray {{/each}} between {{#if}}
-* and a nested {{#each}} would wrongly pull the inner {{#each}} back to depth 0.
+* pops the nearest opener of the *same family* (`{% endif %}` ⇒ `{% if %}`,
+* `{% endfor %}` ⇒ `{% for %}`), dropping any still-open openers nested above it;
+* a closer with no matching opener is ignored (never decrements a foreign block's
+* depth). A blind open/close counter would mis-count here: e.g. a stray
+* `{% endfor %}` between `{% if %}` and a nested `{% for %}` would wrongly pull
+* the inner `{% for %}` back to depth 0.
 *
 * Keyed by the opener's `from` PM position, which is unique per marker, so the
 * overlay can look a band's depth up from its opener range. This is a pure
@@ -54,12 +55,14 @@ const computeBlockDepths = (ranges) => {
 			stack.push(range.kind);
 			continue;
 		}
-		const wantOpener = range.kind === "endif" ? "if" : "each";
+		const wantOpener = range.kind === "endif" ? "if" : "for";
 		const matchIdx = stack.lastIndexOf(wantOpener);
 		if (matchIdx !== -1) stack.length = matchIdx;
 	}
 	return depths;
 };
+/** The loop alias a `for` marker binds, or undefined for every other kind. */
+const directiveAlias = (meta) => meta.kind === "for" ? meta.alias : void 0;
 const scanDirectives = (doc) => {
 	const ranges = [];
 	for (const chunks of collectBlockChunks(doc)) {
@@ -69,24 +72,28 @@ const scanDirectives = (doc) => {
 		const sole = lineMarkers.length === 1 ? lineMarkers[0] : void 0;
 		if (sole && sole.raw === trimmed && isBlockDirectiveKind(sole.meta.kind)) {
 			const last = chunks.at(-1);
+			const alias = directiveAlias(sole.meta);
 			ranges.push({
 				from: chunks[0]?.start ?? 0,
 				to: last ? last.end ?? last.start + last.text.length : 0,
 				kind: sole.meta.kind,
 				expr: directiveExpr(sole.meta),
-				block: true
+				block: true,
+				...alias !== void 0 ? { alias } : {}
 			});
 			continue;
 		}
 		for (const marker of scanMarkers(joined)) {
 			const clauseVersion = marker.meta.kind === "clause" ? marker.meta.version : void 0;
+			const alias = directiveAlias(marker.meta);
 			ranges.push({
 				from: offsetToDocPos(chunks, marker.start),
 				to: offsetToDocPos(chunks, marker.end, "end"),
 				kind: marker.meta.kind,
 				expr: directiveExpr(marker.meta),
 				block: false,
-				...clauseVersion !== void 0 ? { clauseVersion } : {}
+				...clauseVersion !== void 0 ? { clauseVersion } : {},
+				...alias !== void 0 ? { alias } : {}
 			});
 		}
 	}

package/dist/prosemirror/plugins/templateSlashMenu.js

@@ -24,8 +24,8 @@ const atTriggerBoundary = (state, pos) => {
 /** Whether `pos` falls strictly inside an existing template directive. The
 *  slash activations insert markers as raw text rather than going through
 *  `insertInline`'s overlap guard, so opening here would nest markers — e.g. a
-*  `/` typed after `#if ` inside `{{#if condition}}` could produce
-*  `{{#if {{field}}}}`, which the scanner/fill grammar cannot interpret.
+*  `/` typed after `if ` inside `{% if condition %}` could produce
+*  `{% if {{ field }} %}`, which the scanner/fill grammar cannot interpret.
 *  Boundaries are exclusive: a caret right before `{{` or after `}}` is fine. */
 const insideDirective = (state, pos) => getTemplateDirectives(state).some((range) => pos > range.from && pos < range.to);
 /** Whether the `/` that opened the trigger is still present at `from`. */

package/dist/prosemirror/schema/marks.d.ts

@@ -121,17 +121,11 @@ type RunPropertyChangeMarkAttrs = {
   provenance: TrackedChangeProvenance;
   suggestionId?: string;
 };
-type RunFormattingOverrideAttrs = { [K in keyof Pick<document_d_exports.TextFormatting, "bold" | "italic" | "strike" | "allCaps" | "smallCaps" | "hidden" | "emboss" | "imprint" | "shadow" | "outline">]?: boolean; } & {
+type RunFormattingOverrideAttrs = Partial<Record<"bold" | "boldCs" | "cs" | "italic" | "italicCs" | "strike" | "allCaps" | "smallCaps" | "hidden" | "emboss" | "imprint" | "shadow" | "outline", boolean>> & {
+  directFontProperties?: readonly ("fontFamily" | "fontSize" | "color")[];
   doubleStrike?: false;
   rtl?: false;
-  /** Independent complex-script weight (`w:bCs`). */
-  boldCs?: boolean;
-  /** Force complex-script formatting for the full run (`w:cs`). */
-  cs?: boolean;
-  /** Independent complex-script size in half-points (`w:szCs`). */
   fontSizeCs?: number;
-  /** Independent complex-script slant (`w:iCs`). */
-  italicCs?: boolean;
   underline?: "none";
 };
 /**

package/dist/utils/fontResolver.js

@@ -191,6 +191,23 @@ const FONT_MAPPINGS = {
 			unitsPerEm: 2048
 		})
 	},
+	david: {
+		googleFont: "Noto Serif Hebrew",
+		category: "serif",
+		fallbackStack: [
+			"David",
+			"Noto Serif Hebrew",
+			"Times New Roman",
+			"serif"
+		],
+		singleLineRatio: singleLineRatioOf({
+			source: "hhea",
+			hheaAscent: 1505,
+			hheaDescent: -510,
+			hheaLineGap: 0,
+			unitsPerEm: 2048
+		})
+	},
 	georgia: {
 		googleFont: "Tinos",
 		category: "serif",
@@ -628,6 +645,40 @@ const FONT_MAPPINGS = {
 			note: "Measured at 11pt against a 15.36pt reference-layout line pitch; the face ships with the office suite, not as a readable font file."
 		})
 	},
+	frankruehl: {
+		googleFont: "Frank Ruhl Libre",
+		category: "serif",
+		fallbackStack: [
+			"FrankRuehl",
+			"Frank Ruhl Libre",
+			"Times New Roman",
+			"serif"
+		],
+		singleLineRatio: singleLineRatioOf({
+			source: "hhea",
+			hheaAscent: 1462,
+			hheaDescent: -442,
+			hheaLineGap: 0,
+			unitsPerEm: 2048
+		})
+	},
+	miriam: {
+		googleFont: "Miriam Libre",
+		category: "sans-serif",
+		fallbackStack: [
+			"Miriam",
+			"Miriam Libre",
+			"Arial",
+			"sans-serif"
+		],
+		singleLineRatio: singleLineRatioOf({
+			source: "hhea",
+			hheaAscent: 1546,
+			hheaDescent: -512,
+			hheaLineGap: 0,
+			unitsPerEm: 2048
+		})
+	},
 	"ms mincho": {
 		googleFont: "Noto Serif JP",
 		category: "serif",

package/dist/utils/formatToStyle.js

@@ -151,6 +151,33 @@ function borderToStyle(border, side = "", theme) {
 	});
 	return style;
 }
+const HALF_STEP_SHADING_PATTERNS = /* @__PURE__ */ new Set([
+	"pct12",
+	"pct37",
+	"pct62",
+	"pct87"
+]);
+const AUTO_PATTERN_COLOR = "000000";
+const AUTO_PATTERN_BACKGROUND = "FFFFFF";
+function percentageShadingRatio(pattern) {
+	if (!pattern?.startsWith("pct")) return;
+	const percentage = Number.parseInt(pattern.slice(3), 10);
+	if (!Number.isFinite(percentage)) return;
+	return (percentage + (HALF_STEP_SHADING_PATTERNS.has(pattern) ? .5 : 0)) / 100;
+}
+function resolvePatternHex({ color, fallback, theme }) {
+	const resolved = resolveShadingColor(color, theme);
+	return /^#(?<hex>[0-9A-F]{6})$/iu.exec(resolved)?.groups?.["hex"]?.toUpperCase() ?? fallback;
+}
+function blendShadingColors({ foreground, background, ratio }) {
+	const channels = [];
+	for (let offset = 0; offset < 6; offset += 2) {
+		const foregroundChannel = Number.parseInt(foreground.slice(offset, offset + 2), 16);
+		const backgroundChannel = Number.parseInt(background.slice(offset, offset + 2), 16);
+		channels.push(Math.round(foregroundChannel * ratio + backgroundChannel * (1 - ratio)).toString(16).padStart(2, "0"));
+	}
+	return `#${channels.join("").toUpperCase()}`;
+}
 /**
 * Convert ShadingProperties to background color
 *
@@ -161,13 +188,26 @@ function borderToStyle(border, side = "", theme) {
 function resolveShadingFill(shading, theme) {
 	if (!shading) return "";
 	if (shading.pattern === "nil") return "";
+	const percentageRatio = percentageShadingRatio(shading.pattern);
+	if (percentageRatio !== void 0) return blendShadingColors({
+		foreground: resolvePatternHex({
+			color: shading.color,
+			fallback: AUTO_PATTERN_COLOR,
+			theme
+		}),
+		background: resolvePatternHex({
+			color: shading.fill,
+			fallback: AUTO_PATTERN_BACKGROUND,
+			theme
+		}),
+		ratio: percentageRatio
+	});
 	if (shading.fill) {
 		if (shading.fill.auto) return "";
 		if (shading.fill.rgb === "auto" || shading.fill.rgb === "FFFFFF") return "";
 		return resolveShadingColor(shading.fill, theme);
 	}
 	if (shading.pattern === "solid" && shading.color) return resolveShadingColor(shading.color, theme);
-	if (shading.pattern && shading.pattern.startsWith("pct") && shading.color) return resolveShadingColor(shading.color, theme);
 	return "";
 }
 /**

package/dist/watermark/index.js

@@ -1,3 +1,4 @@
+import { isEmptyParagraph } from "../docx/paragraphParser.js";
 //#region src/watermark/index.ts
 /**
 * Schemes allowed for a picture watermark's external image target
@@ -42,6 +43,12 @@ function setDocumentWatermark(doc, watermark) {
 	const nextHeaders = /* @__PURE__ */ new Map();
 	if (headers) for (const [rId, header] of headers) {
 		const next = { ...header };
+		const retainedHostIndex = next.watermarkBlockIndex;
+		const retainedHost = next.rawWatermarkXml !== void 0 && retainedHostIndex !== void 0 ? next.content.at(retainedHostIndex) : void 0;
+		if (retainedHostIndex !== void 0 && retainedHost?.type === "paragraph" && isEmptyParagraph(retainedHost)) {
+			next.content = [...next.content];
+			next.content.splice(retainedHostIndex, 1);
+		}
 		if (watermark === void 0) {
 			delete next.watermark;
 			delete next.watermarkBlockIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.33.2",
+  "version": "0.35.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -115,9 +115,9 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.19.1",
+    "@stll/docx-core": "^0.19.2",
     "@stll/docx-utils": "^0.1.0",
-    "@stll/template-conditions": "^0.1.0",
+    "@stll/template-conditions": "^0.4.0",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.13",