@stll/folio-core 0.33.2 → 0.34.0

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/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.34.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,7 +115,7 @@
     "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",
     "better-result": "3.0.1",