@stll/folio-core 0.28.1 → 0.30.0

package/dist/utils/fontResolver.js

@@ -813,7 +813,7 @@ let embeddedFontFamilyMap = null;
 const setEmbeddedFontFamilyMap = (map) => {
 	embeddedFontFamilyMap = map;
 };
-function resolveFontFamily(docxFontName) {
+function resolveFontFamily(docxFontName, alternateFontName) {
 	const normalizedName = docxFontName.trim().toLowerCase();
 	const scopedFamily = embeddedFontFamilyMap?.get(docxFontName) ?? null;
 	const aliasTarget = CJK_FONT_ALIASES[normalizedName];
@@ -821,13 +821,41 @@ function resolveFontFamily(docxFontName) {
 	if (mapping) {
 		const fallbackStack = aliasTarget && !mapping.fallbackStack.some((f) => f.toLowerCase() === normalizedName) ? [docxFontName, ...mapping.fallbackStack] : mapping.fallbackStack;
 		const primaryStack = scopedFamily ? [scopedFamily, ...fallbackStack.filter((f) => f.toLowerCase() !== normalizedName)] : fallbackStack;
-		return {
+		if (alternateFontName === void 0 || alternateFontName.trim().length === 0 || alternateFontName.trim().toLowerCase() === normalizedName) return {
 			googleFont: googleFontsEnabled ? mapping.googleFont : null,
 			cssFallback: withArabicFallback(primaryStack.map(quoteFontName).join(", ")),
 			originalFont: docxFontName,
 			hasGoogleEquivalent: googleFontsEnabled,
 			singleLineRatio: mapping.singleLineRatio
 		};
+		const alternate = resolveFontFamily(alternateFontName);
+		const category = mapping.category;
+		const concreteStack = dedupeFontFamilies([
+			scopedFamily ?? docxFontName,
+			...parseFontFamilyList(alternate.cssFallback),
+			...primaryStack
+		]).filter((family) => !isCssGenericFontFamily(family));
+		const cssFallback = withArabicFallback([...concreteStack, category].map(quoteFontName).join(", "));
+		return {
+			googleFont: googleFontsEnabled ? mapping.googleFont : null,
+			cssFallback,
+			originalFont: docxFontName,
+			hasGoogleEquivalent: googleFontsEnabled,
+			singleLineRatio: mapping.singleLineRatio
+		};
+	}
+	const alternateName = alternateFontName?.trim();
+	if (alternateName && alternateName.toLowerCase() !== normalizedName) {
+		const alternate = resolveFontFamily(alternateName);
+		const category = detectFontCategory(docxFontName);
+		const concreteStack = dedupeFontFamilies([scopedFamily ?? docxFontName, ...parseFontFamilyList(alternate.cssFallback)]).filter((family) => !isCssGenericFontFamily(family));
+		return {
+			googleFont: googleFontsEnabled ? alternate.googleFont : null,
+			cssFallback: withArabicFallback([...concreteStack, category].map(quoteFontName).join(", ")),
+			originalFont: docxFontName,
+			hasGoogleEquivalent: googleFontsEnabled && alternate.hasGoogleEquivalent,
+			singleLineRatio: alternate.singleLineRatio
+		};
 	}
 	const category = detectFontCategory(docxFontName);
 	const defaultFallback = DEFAULT_FALLBACKS[category];
@@ -839,6 +867,18 @@ function resolveFontFamily(docxFontName) {
 		singleLineRatio: DEFAULT_SINGLE_LINE_RATIO
 	};
 }
+const isCssGenericFontFamily = (family) => /^(?:sans-serif|serif|monospace|cursive|fantasy|system-ui)$/u.test(family.trim().toLowerCase());
+const dedupeFontFamilies = (families) => {
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const family of families) {
+		const normalized = family.trim().toLowerCase();
+		if (!normalized || seen.has(normalized)) continue;
+		seen.add(normalized);
+		result.push(family.trim());
+	}
+	return result;
+};
 const CSS_NEWLINE_ESCAPES = {
 	"\n": "\\a ",
 	"\r": "\\d ",

package/dist/utils/formatToStyle.js

@@ -1,5 +1,6 @@
 import { resolveColor, resolveHighlightToCss, resolveShadingColor } from "./colorResolver.js";
 import { resolveFontFamily, resolveThemeFont } from "./fontResolver.js";
+import { getHorizontalScaleFactor, normalizeHorizontalScalePercent } from "./horizontalScale.js";
 import { AUTO_PARAGRAPH_SPACING_PX, eighthsToPixels, formatPx, halfPointsToPixels, halfPointsToPoints, twipsToPixels } from "./units.js";
 //#region src/utils/formatToStyle.ts
 /**
@@ -63,8 +64,9 @@ function textToStyle(formatting, theme) {
 	if (formatting.allCaps) style.textTransform = "uppercase";
 	else if (formatting.smallCaps) style.fontVariant = "small-caps";
 	if (formatting.spacing !== void 0 && formatting.spacing !== 0) style.letterSpacing = formatPx(twipsToPixels(formatting.spacing));
-	if (formatting.scale !== void 0 && formatting.scale !== 100) {
-		style.transform = `scaleX(${formatting.scale / 100})`;
+	const horizontalScale = normalizeHorizontalScalePercent(formatting.scale);
+	if (horizontalScale !== void 0 && horizontalScale !== 100) {
+		style.transform = `scaleX(${getHorizontalScaleFactor(horizontalScale)})`;
 		style.display = "inline-block";
 	}
 	if (formatting.hidden) style.display = "none";

package/dist/utils/horizontalScale.d.ts

@@ -0,0 +1,28 @@
+//#region src/utils/horizontalScale.d.ts
+/**
+ * Normalize OOXML `w:w` horizontal text scale percentages.
+ *
+ * The OOXML value is bounded from 0% through 600%. Missing or malformed
+ * values use the document default (100%) and stay absent in the model.
+ */
+declare function normalizeHorizontalScalePercent(horizontalScale: number | null | undefined): number | undefined;
+/**
+ * Parse the lexical forms accepted by OOXML `ST_TextScale`.
+ *
+ * Decimal values use the XML Schema integer grammar; percent values use the
+ * unsigned decimal grammar defined by `ST_TextScalePercent`. Surrounding
+ * whitespace is ignored, but an empty value or partial numeric prefix is not.
+ */
+declare function parseHorizontalScalePercent(horizontalScale: string | null | undefined): number | undefined;
+declare function getHorizontalScaleFactor(horizontalScale: number | null | undefined): number;
+/**
+ * Quantize an in-range model value for OOXML's integer-only representation.
+ *
+ * Imported documents use strict integer normalization. Serialization also
+ * tolerates finite floating-point residue produced by editing calculations,
+ * preserving the existing integer-attribute contract without emitting an
+ * invalid fractional value.
+ */
+declare function roundHorizontalScalePercentForSerialization(horizontalScale: number | null | undefined): number | undefined;
+//#endregion
+export { getHorizontalScaleFactor, normalizeHorizontalScalePercent, parseHorizontalScalePercent, roundHorizontalScalePercentForSerialization };

package/dist/utils/horizontalScale.js

@@ -0,0 +1,42 @@
+//#region src/utils/horizontalScale.ts
+/**
+* Normalize OOXML `w:w` horizontal text scale percentages.
+*
+* The OOXML value is bounded from 0% through 600%. Missing or malformed
+* values use the document default (100%) and stay absent in the model.
+*/
+function normalizeHorizontalScalePercent(horizontalScale) {
+	if (horizontalScale === null || horizontalScale === void 0 || !Number.isFinite(horizontalScale) || !Number.isInteger(horizontalScale) || horizontalScale < 0 || horizontalScale > 600) return;
+	return horizontalScale;
+}
+/**
+* Parse the lexical forms accepted by OOXML `ST_TextScale`.
+*
+* Decimal values use the XML Schema integer grammar; percent values use the
+* unsigned decimal grammar defined by `ST_TextScalePercent`. Surrounding
+* whitespace is ignored, but an empty value or partial numeric prefix is not.
+*/
+function parseHorizontalScalePercent(horizontalScale) {
+	if (horizontalScale === null || horizontalScale === void 0) return;
+	const lexicalValue = horizontalScale.trim();
+	if (!/^(?:[+-]?\d+|\d+%)$/u.test(lexicalValue)) return;
+	const numericValue = lexicalValue.endsWith("%") ? lexicalValue.slice(0, -1) : lexicalValue;
+	return normalizeHorizontalScalePercent(Number(numericValue));
+}
+function getHorizontalScaleFactor(horizontalScale) {
+	return (normalizeHorizontalScalePercent(horizontalScale) ?? 100) / 100;
+}
+/**
+* Quantize an in-range model value for OOXML's integer-only representation.
+*
+* Imported documents use strict integer normalization. Serialization also
+* tolerates finite floating-point residue produced by editing calculations,
+* preserving the existing integer-attribute contract without emitting an
+* invalid fractional value.
+*/
+function roundHorizontalScalePercentForSerialization(horizontalScale) {
+	if (horizontalScale === null || horizontalScale === void 0 || !Number.isFinite(horizontalScale) || horizontalScale < 0 || horizontalScale > 600) return;
+	return Math.round(horizontalScale);
+}
+//#endregion
+export { getHorizontalScaleFactor, normalizeHorizontalScalePercent, parseHorizontalScalePercent, roundHorizontalScalePercentForSerialization };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.28.1",
+  "version": "0.30.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",
@@ -113,7 +113,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.17.2",
+    "@stll/docx-core": "^0.17.3",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",