@stll/folio-core 0.66.0 → 0.66.2

package/dist/docx/serializer/paragraphSerializer.js

@@ -299,20 +299,20 @@ function hyperlinkAttributes(hyperlink) {
 	if (hyperlink.docLocation) attrs.push(`w:docLocation="${escapeXmlAttribute(hyperlink.docLocation)}"`);
 	return attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
 }
-/** One `w:hyperlink` child, written with the link's own disposition. */
-function serializeHyperlinkChild(child, disposition) {
+/** One `w:hyperlink` child, written with the link's own spelling. */
+function serializeHyperlinkChild(child, spelling) {
 	switch (child.type) {
-		case "run": return serializeInlineRun(child, disposition);
+		case "run": return serializeInlineRun(child, spelling);
 		case "bookmarkStart": return serializeBookmarkMarker(child);
 		case "bookmarkEnd": return serializeBookmarkMarker(child);
 		case "commentRangeStart":
-		case "commentRangeEnd": return serializeParagraphContent(child, disposition);
+		case "commentRangeEnd": return serializeParagraphContent(child, spelling);
 		case "commentReference": return serializeCommentReferenceRun(child.id);
 		case "moveFromRangeStart":
 		case "moveFromRangeEnd":
 		case "moveToRangeStart":
 		case "moveToRangeEnd": return serializeMoveRangeMarker(child);
-		case "inlineWrapper": return serializeParagraphContent(child, disposition);
+		case "inlineWrapper": return serializeParagraphContent(child, spelling);
 		case "preservedInline": return child.xml;
 		default: return child;
 	}
@@ -320,8 +320,8 @@ function serializeHyperlinkChild(child, disposition) {
 /**
 * Serialize a hyperlink (w:hyperlink)
 */
-function serializeHyperlink(hyperlink, disposition = "kept") {
-	const childrenXml = hyperlink.children.map((child) => serializeHyperlinkChild(child, disposition)).join("");
+function serializeHyperlink(hyperlink, spelling = "text") {
+	const childrenXml = hyperlink.children.map((child) => serializeHyperlinkChild(child, spelling)).join("");
 	return `<w:hyperlink${hyperlinkAttributes(hyperlink)}>${childrenXml}</w:hyperlink>`;
 }
 /** Serialize a simple field without changing its authored OOXML field form. */
@@ -356,16 +356,25 @@ function serializeComplexField(field) {
 }
 const UnrepresentableTrackedCaptureErrorBase = TaggedError("UnrepresentableTrackedCaptureError");
 var UnrepresentableTrackedCaptureError = class extends UnrepresentableTrackedCaptureErrorBase {};
+/** Whether a capture is plain runs whose text a respelling can reach. */
+const isPlainRunCapture = (xml) => /^<w:r[\s>]/u.test(xml) && !/<w:(?:drawing|pict|object)\b|<mc:AlternateContent\b/u.test(xml);
 /**
-* Preserved markup inside a removal. Markup captured from a removal already
-* spells its text as deleted text. Markup captured outside one and put under
-* a removal afterwards does not: plain runs are respelled here, as a deleted
-* run is. A folded list-number capture that cannot be respelled is refused,
-* rather than written as live text inside the removal.
+* Preserved markup inside a revision, spelled the way the revision spells its
+* typed runs. Markup captured inside a `w:del` already spells its text as
+* deleted text; markup captured elsewhere and put under one afterwards does
+* not, and markup captured from a move source that spelled its text as
+* deleted text holds the reverse. Plain runs are respelled here, as a typed
+* run is. A folded list-number capture that cannot be respelled into a
+* deletion is refused, rather than written as live text inside it.
 */
-function serializeRemovedPreservedInline(item) {
+function serializeTrackedPreservedInline(item, spelling) {
+	switch (spelling) {
+		case "text": return isPlainRunCapture(item.xml) ? rewriteRunTextAsText(item.xml) : item.xml;
+		case "deletedText": break;
+		default: return spelling;
+	}
 	if (!/<w:(?:t|instrText)[\s>]/u.test(item.xml)) return item.xml;
-	if (/^<w:r[\s>]/u.test(item.xml) && !/<w:(?:drawing|pict|object)\b|<mc:AlternateContent\b/u.test(item.xml)) return rewriteRunTextAsDeleted(item.xml);
+	if (isPlainRunCapture(item.xml)) return rewriteRunTextAsDeleted(item.xml);
 	if (item.foldedListNumber) throw new UnrepresentableTrackedCaptureError({ message: "A folded list-number field holds markup that cannot be written as deleted content." });
 	return item.xml;
 }
@@ -440,29 +449,29 @@ const trackedSimpleFieldContent = (field) => {
 * the properties block was re-synthesized from the modeled projection alone,
 * silently dropping every unmodeled feature (and `w:sdtEndPr`) on save.
 */
-function serializeInlineSdt(sdt, disposition = "kept") {
+function serializeInlineSdt(sdt, spelling = "text") {
 	const props = sdt.properties;
 	const contentXml = sdt.content.map((item) => {
 		switch (item.type) {
-			case "run": return serializeInlineRun(item, disposition);
-			case "hyperlink": return serializeHyperlink(item, disposition);
+			case "run": return serializeInlineRun(item, spelling);
+			case "hyperlink": return serializeHyperlink(item, spelling);
 			case "simpleField": return serializeSimpleField(item);
 			case "complexField": return serializeComplexField(item);
-			case "inlineSdt": return serializeInlineSdt(item, disposition);
-			case "inlineWrapper": return serializeParagraphContent(item, disposition);
+			case "inlineSdt": return serializeInlineSdt(item, spelling);
+			case "inlineWrapper": return serializeParagraphContent(item, spelling);
 			case "bookmarkStart": return serializeBookmarkMarker(item);
 			case "bookmarkEnd": return serializeBookmarkMarker(item);
 			case "commentRangeStart":
-			case "commentRangeEnd": return serializeParagraphContent(item, disposition);
+			case "commentRangeEnd": return serializeParagraphContent(item, spelling);
 			case "commentReference": return serializeCommentReferenceRun(item.id);
 			case "moveFromRangeStart":
 			case "moveFromRangeEnd":
 			case "moveToRangeStart":
 			case "moveToRangeEnd": return serializeMoveRangeMarker(item);
-			case "insertion": return serializeTrackedChange("ins", item);
-			case "deletion": return serializeTrackedChange("del", item);
-			case "moveFrom": return serializeTrackedChange("moveFrom", item);
-			case "moveTo": return serializeTrackedChange("moveTo", item);
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return serializeTrackedChange(item);
 			case "mathEquation": return item.ommlXml || "";
 			case "preservedInline": return item.xml;
 			default: return item;
@@ -470,12 +479,35 @@ function serializeInlineSdt(sdt, disposition = "kept") {
 	}).join("");
 	return serializeSdtWrapper(props, contentXml);
 }
-/**
-* Serialize a tracked change wrapper (ins/del/moveFrom/moveTo)
-*/
+/** Respell a run's text and field code as deleted text and field code. */
 function rewriteRunTextAsDeleted(xml) {
 	return xml.replace(/<w:t\b/gu, "<w:delText").replace(/<\/w:t>/gu, "</w:delText>").replace(/<w:instrText\b/gu, "<w:delInstrText").replace(/<\/w:instrText>/gu, "</w:delInstrText>");
 }
+/** Respell a run's deleted text and field code as plain text and field code. */
+function rewriteRunTextAsText(xml) {
+	return xml.replace(/<w:delText\b/gu, "<w:t").replace(/<\/w:delText>/gu, "</w:t>").replace(/<w:delInstrText\b/gu, "<w:instrText").replace(/<\/w:delInstrText>/gu, "</w:instrText>");
+}
+/** The element each tracked run change is written as. */
+const TRACKED_CHANGE_ELEMENT = {
+	insertion: "ins",
+	deletion: "del",
+	moveFrom: "moveFrom",
+	moveTo: "moveTo"
+};
+/**
+* The text spelling of the runs each revision holds.
+*
+* ISO/IEC 29500-1 §17.3.3.7 reserves `w:delText` for runs in a deleted region
+* (`w:del`, §17.13.5.14), and `w:delInstrText` likewise. A move source
+* (`w:moveFrom`, §17.13.5.22) is not a deletion: its content moved elsewhere,
+* and the spec's own example spells its run text `w:t`.
+*/
+const TRACKED_CHANGE_TEXT_SPELLING = {
+	ins: "text",
+	del: "deletedText",
+	moveFrom: "text",
+	moveTo: "text"
+};
 function serializeDeletedRun(run) {
 	const xml = serializeRun(run);
 	if (!run.content.some((c) => c.type === "drawing" || c.type === "shape")) return rewriteRunTextAsDeleted(xml);
@@ -489,22 +521,12 @@ function serializeDeletedRun(run) {
 		return rewriteRunTextAsDeleted(contentXml);
 	}).join("");
 }
-function serializeInlineRun(run, disposition) {
-	return disposition === "removed" ? serializeDeletedRun(run) : serializeRun(run);
-}
-function trackedChangeTag(change) {
-	switch (change.type) {
-		case "insertion": return "ins";
-		case "deletion": return "del";
-		case "moveFrom": return "moveFrom";
-		case "moveTo": return "moveTo";
-	}
+function serializeInlineRun(run, spelling) {
+	return spelling === "deletedText" ? serializeDeletedRun(run) : serializeRun(run);
 }
-function serializeTrackedChange(tag, change) {
-	return emitTrackedInlineSegments(trackedChangeSegments({
-		tag,
-		change
-	}));
+/** Serialize a tracked change wrapper (ins/del/moveFrom/moveTo). */
+function serializeTrackedChange(change) {
+	return emitTrackedInlineSegments(trackedChangeSegments(change));
 }
 const emitTrackedInlineSegments = (segments) => segments.map((segment) => {
 	switch (segment.type) {
@@ -546,9 +568,10 @@ const wrapTrackedInlineSegments = (segments, wrap) => {
 	flush();
 	return result;
 };
-const trackedChangeSegments = ({ tag, change }) => {
-	const disposition = tag === "del" || tag === "moveFrom" ? "removed" : "kept";
-	const segments = walkTrackedInlineContent(change.content, disposition);
+const trackedChangeSegments = (change) => {
+	const tag = TRACKED_CHANGE_ELEMENT[change.type];
+	const spelling = TRACKED_CHANGE_TEXT_SPELLING[tag];
+	const segments = walkTrackedInlineContent(change.content, spelling);
 	if (change.resolutionJoins !== void 0 && segments.some((segment) => segment.type === "hyperlink")) throw new ReviewResolutionProvenanceError({
 		attribute: "resolutionJoins",
 		reason: "unrepresentable",
@@ -560,11 +583,11 @@ const trackedChangeSegments = ({ tag, change }) => {
 const UnrepresentableNestedHyperlinkErrorBase = TaggedError("UnrepresentableNestedHyperlinkError");
 var UnrepresentableNestedHyperlinkError = class extends UnrepresentableNestedHyperlinkErrorBase {};
 /** One exhaustive recursive owner for all containers inside a tracked revision. */
-const walkTrackedInlineContent = (content, disposition) => {
+const walkTrackedInlineContent = (content, spelling) => {
 	const segments = [];
 	for (const item of content) switch (item.type) {
 		case "hyperlink": {
-			const children = walkTrackedInlineContent(item.children, disposition);
+			const children = walkTrackedInlineContent(item.children, spelling);
 			if (children.some((child) => child.type === "hyperlink")) throw new UnrepresentableNestedHyperlinkError({ message: "A tracked hyperlink cannot contain another hyperlink." });
 			segments.push({
 				type: "hyperlink",
@@ -574,31 +597,28 @@ const walkTrackedInlineContent = (content, disposition) => {
 			break;
 		}
 		case "simpleField":
-			segments.push(...walkTrackedInlineContent(trackedSimpleFieldContent(item), disposition));
+			segments.push(...walkTrackedInlineContent(trackedSimpleFieldContent(item), spelling));
 			break;
 		case "insertion":
 		case "deletion":
 		case "moveFrom":
 		case "moveTo":
-			segments.push(...trackedChangeSegments({
-				tag: trackedChangeTag(item),
-				change: item
-			}));
+			segments.push(...trackedChangeSegments(item));
 			break;
 		case "inlineWrapper":
-			segments.push(...wrapTrackedInlineSegments(walkTrackedInlineContent(item.content, disposition), (xml) => serializeInlineWrapperMarkup(item, xml)));
+			segments.push(...wrapTrackedInlineSegments(walkTrackedInlineContent(item.content, spelling), (xml) => serializeInlineWrapperMarkup(item, xml)));
 			break;
 		case "inlineSdt":
 			segments.push({
 				type: "plain",
-				xml: serializeSdtWrapper(item.properties, emitTrackedInlineSegments(walkTrackedInlineContent(item.content, disposition)))
+				xml: serializeSdtWrapper(item.properties, emitTrackedInlineSegments(walkTrackedInlineContent(item.content, spelling)))
 			});
 			break;
 		case "complexField": {
 			const xml = serializeComplexField(item);
 			segments.push({
 				type: "plain",
-				xml: disposition === "removed" ? rewriteRunTextAsDeleted(xml) : xml
+				xml: spelling === "deletedText" ? rewriteRunTextAsDeleted(xml) : xml
 			});
 			break;
 		}
@@ -615,7 +635,7 @@ const walkTrackedInlineContent = (content, disposition) => {
 			}
 			segments.push({
 				type: "plain",
-				xml: disposition === "removed" ? serializeRemovedPreservedInline(item) : item.xml
+				xml: serializeTrackedPreservedInline(item, spelling)
 			});
 			break;
 		}
@@ -632,7 +652,7 @@ const walkTrackedInlineContent = (content, disposition) => {
 		case "commentReference":
 			segments.push({
 				type: "plain",
-				xml: serializeParagraphContent(item, disposition)
+				xml: serializeParagraphContent(item, spelling)
 			});
 			break;
 		default: return item;
@@ -694,27 +714,27 @@ function serializeInlineWrapperMarkup(content, inner) {
 * `completeCommentReferences` fills it in for a model that arrived without
 * one; a guess made here from one paragraph cannot see the rest of the story.
 */
-function serializeParagraphContent(content, disposition = "kept") {
+function serializeParagraphContent(content, spelling = "text") {
 	switch (content.type) {
-		case "run": return serializeInlineRun(content, disposition);
-		case "hyperlink": return serializeHyperlink(content, disposition);
+		case "run": return serializeInlineRun(content, spelling);
+		case "hyperlink": return serializeHyperlink(content, spelling);
 		case "bookmarkStart":
 		case "bookmarkEnd": return serializeBookmarkMarker(content);
 		case "simpleField": return serializeSimpleField(content);
 		case "complexField": return serializeComplexField(content);
-		case "inlineSdt": return serializeInlineSdt(content, disposition);
+		case "inlineSdt": return serializeInlineSdt(content, spelling);
 		case "commentRangeStart": return `<w:commentRangeStart ${markupRangeAttributes(content).join(" ")}/>`;
 		case "commentRangeEnd": return `<w:commentRangeEnd ${markupRangeAttributes(content).join(" ")}/>`;
 		case "commentReference": return serializeCommentReferenceRun(content.id);
-		case "insertion": return serializeTrackedChange("ins", content);
-		case "deletion": return serializeTrackedChange("del", content);
-		case "moveFrom": return serializeTrackedChange("moveFrom", content);
-		case "moveTo": return serializeTrackedChange("moveTo", content);
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo": return serializeTrackedChange(content);
 		case "moveFromRangeStart":
 		case "moveFromRangeEnd":
 		case "moveToRangeStart":
 		case "moveToRangeEnd": return serializeMoveRangeMarker(content);
-		case "inlineWrapper": return serializeInlineWrapperMarkup(content, content.content.map((child) => serializeParagraphContent(child, disposition)).join(""));
+		case "inlineWrapper": return serializeInlineWrapperMarkup(content, content.content.map((child) => serializeParagraphContent(child, spelling)).join(""));
 		case "mathEquation": return content.ommlXml || "";
 		case "preservedInline": return content.xml;
 		default: return "";

package/dist/fonts/bundledFonts.d.ts

@@ -0,0 +1,54 @@
+/**
+ * The document fonts folio bundles: one table for every place that names them.
+ *
+ * `@stll/folio-fonts` ships the files, and its generator
+ * (`scripts/generate-folio-fonts.ts`) reads this table to decide which files
+ * to copy and which `@font-face` rules to write, so the published package and
+ * the resolver here cannot disagree about a family. The module imports nothing:
+ * the generator, the resolver and the editor's availability check all read it
+ * without pulling in the rest of the engine.
+ */
+declare const PACKAGE_TABLE: {
+  readonly Arimo: "arimo";
+  readonly Caladea: "caladea";
+  readonly Carlito: "carlito";
+  readonly Cousine: "cousine";
+  readonly Lato: "lato";
+  readonly "Noto Sans Arabic": "noto-sans-arabic";
+  readonly "Source Sans 3": "source-sans-3";
+  readonly Tinos: "tinos";
+};
+export type FontsourcePackageTable = typeof PACKAGE_TABLE;
+/** Each bundled family and the directory (an `@fontsource` package name) that ships it. */
+export declare const FONTSOURCE_PACKAGES: FontsourcePackageTable;
+export type BundledFamily = keyof FontsourcePackageTable;
+/**
+ * What each bundled family stands in for, as prose for the package's notices.
+ * The resolver's own mapping lives in `utils/fontLoader.ts` and
+ * `utils/fontResolver.ts`.
+ */
+export declare const BUNDLED_FAMILY_SUBSTITUTES: Readonly<Record<BundledFamily, string>>;
+/**
+ * The subsets a headless measurer or the PDF writer reads, in resolution
+ * priority: a code point two subsets cover resolves to the earlier one.
+ * A browser is served every subset the family is cut into.
+ */
+export declare const MEASURED_SUBSETS: readonly ["latin", "latin-ext", "arabic"];
+export type MeasuredSubset = (typeof MEASURED_SUBSETS)[number];
+/** Folio paints 400 and 700 only, as `DisplayFontFace` states. */
+export declare const BUNDLED_WEIGHTS: readonly [400, 700];
+export type BundledWeight = (typeof BUNDLED_WEIGHTS)[number];
+/** The styles a family may be cut in; a family without italics ships `normal` only. */
+export declare const BUNDLED_STYLES: readonly ["normal", "italic"];
+export type BundledStyle = (typeof BUNDLED_STYLES)[number];
+/** `files/<package>-<subset>-<weight>-<style>.<format>`: the path of one served binary. */
+export declare const bundledFontFilePath: ({ packageName, subset, weight, style, format }: {
+  readonly packageName: string;
+  readonly subset: string;
+  readonly weight: number;
+  readonly style: BundledStyle;
+  readonly format: "woff" | "woff2";
+}) => string;
+/** Each family's directory carries the ranges its subsets were cut with. */
+export declare const UNICODE_RANGE_FILE = "unicode.json";
+export {};

package/dist/fonts/bundledFonts.js

@@ -0,0 +1,45 @@
+/** Each bundled family and the directory (an `@fontsource` package name) that ships it. */
+const FONTSOURCE_PACKAGES = {
+	Arimo: "arimo",
+	Caladea: "caladea",
+	Carlito: "carlito",
+	Cousine: "cousine",
+	Lato: "lato",
+	"Noto Sans Arabic": "noto-sans-arabic",
+	"Source Sans 3": "source-sans-3",
+	Tinos: "tinos"
+};
+/**
+* What each bundled family stands in for, as prose for the package's notices.
+* The resolver's own mapping lives in `utils/fontLoader.ts` and
+* `utils/fontResolver.ts`.
+*/
+const BUNDLED_FAMILY_SUBSTITUTES = {
+	Arimo: "Arial, and the generic sans-serif",
+	Caladea: "Cambria",
+	Carlito: "Calibri",
+	Cousine: "Courier New, and the generic monospace",
+	Lato: "Aptos and Aptos Display",
+	"Noto Sans Arabic": "Dubai, and Arabic script in every other family",
+	"Source Sans 3": "Segoe UI",
+	Tinos: "Times New Roman, and the generic serif"
+};
+/**
+* The subsets a headless measurer or the PDF writer reads, in resolution
+* priority: a code point two subsets cover resolves to the earlier one.
+* A browser is served every subset the family is cut into.
+*/
+const MEASURED_SUBSETS = [
+	"latin",
+	"latin-ext",
+	"arabic"
+];
+/** Folio paints 400 and 700 only, as `DisplayFontFace` states. */
+const BUNDLED_WEIGHTS = [400, 700];
+/** The styles a family may be cut in; a family without italics ships `normal` only. */
+const BUNDLED_STYLES = ["normal", "italic"];
+/** `files/<package>-<subset>-<weight>-<style>.<format>`: the path of one served binary. */
+const bundledFontFilePath = ({ packageName, subset, weight, style, format }) => `files/${packageName}-${subset}-${String(weight)}-${style}.${format}`;
+/** Each family's directory carries the ranges its subsets were cut with. */
+const UNICODE_RANGE_FILE = "unicode.json";
+export { BUNDLED_FAMILY_SUBSTITUTES, BUNDLED_STYLES, BUNDLED_WEIGHTS, FONTSOURCE_PACKAGES, MEASURED_SUBSETS, UNICODE_RANGE_FILE, bundledFontFilePath };

package/dist/fonts/fontsourceFaces.d.ts

@@ -1,20 +1,14 @@
 import { HeadlessFontSource } from "./headlessMeasure.js";
-/** Where `@fontsource` files come from: `null` when the package or file is absent. */
+import { FONTSOURCE_PACKAGES } from "./bundledFonts.js";
+/**
+ * Where the face files come from: `null` when the family or file is absent.
+ * Each family is a directory laid out like its `@fontsource` package;
+ * `@stll/folio-fonts/node` reads the copies that package ships.
+ */
 export type FontsourceFiles = {
-  /** Bytes of `@fontsource/<packageName>/<relativePath>`. */
+  /** Bytes of `<relativePath>` in the family directory `<packageName>`. */
   readonly read: (packageName: string, relativePath: string) => Uint8Array | null;
 };
-/** Each bundled family and the `@fontsource` package that ships it. */
-export declare const FONTSOURCE_PACKAGES: {
-  readonly Arimo: "arimo";
-  readonly Caladea: "caladea";
-  readonly Carlito: "carlito";
-  readonly Cousine: "cousine";
-  readonly Lato: "lato";
-  readonly "Noto Sans Arabic": "noto-sans-arabic";
-  readonly "Source Sans 3": "source-sans-3";
-  readonly Tinos: "tinos";
-};
 /**
  * A CSS `<string>` token, quoted and escaped. A family name comes from an
  * authored document and is emitted into a `<style>` element, so the
@@ -41,4 +35,5 @@ export type FontsourceFaces = {
   readonly fontFaceCss: (options?: FontsourceFontFaceCssOptions) => string;
 };
 /** The `@fontsource` faces, read through `files` and cached per face. */
-export declare const createFontsourceFaces: (files: FontsourceFiles) => FontsourceFaces;
+export declare const createFontsourceFaces: (files: FontsourceFiles) => FontsourceFaces;
+export { FONTSOURCE_PACKAGES };

package/dist/fonts/fontsourceFaces.js

@@ -2,6 +2,7 @@ import { bytesToDataUrl } from "../utils/base64.js";
 import { FONT_MAPPING } from "../utils/fontLoader.js";
 import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
 import { decodeText } from "../utils/textEncoding.js";
+import { BUNDLED_WEIGHTS, FONTSOURCE_PACKAGES, MEASURED_SUBSETS, UNICODE_RANGE_FILE, bundledFontFilePath } from "./bundledFonts.js";
 // src/fonts/fontsourceFaces.ts
 /**
 * Faces from the `@fontsource` packages, for a caller that measures and paints
@@ -23,25 +24,8 @@ import { decodeText } from "../utils/textEncoding.js";
 * The subsets served, in resolution priority: a code point two subsets cover
 * resolves to the earlier one on both sides.
 */
-const SUBSET_PRIORITY = [
-	"latin",
-	"latin-ext",
-	"arabic"
-];
-/** Folio paints 400 and 700 only, as `DisplayFontFace` states. */
-const REGULAR_WEIGHT = 400;
-const BOLD_WEIGHT = 700;
-/** Each bundled family and the `@fontsource` package that ships it. */
-const FONTSOURCE_PACKAGES = {
-	Arimo: "arimo",
-	Caladea: "caladea",
-	Carlito: "carlito",
-	Cousine: "cousine",
-	Lato: "lato",
-	"Noto Sans Arabic": "noto-sans-arabic",
-	"Source Sans 3": "source-sans-3",
-	Tinos: "tinos"
-};
+const SUBSET_PRIORITY = MEASURED_SUBSETS;
+const [REGULAR_WEIGHT, BOLD_WEIGHT] = BUNDLED_WEIGHTS;
 /** A CSS stack ends in a generic, so a generic must resolve to a bundled family too. */
 const GENERIC_FAMILIES = {
 	serif: "Tinos",
@@ -81,8 +65,6 @@ const resolveBundledFamily = (family) => {
 	return null;
 };
 const weightOf = (bold) => bold ? BOLD_WEIGHT : REGULAR_WEIGHT;
-/** `@fontsource` ships the ranges it cut each subset with, beside the files. */
-const UNICODE_RANGE_FILE = "unicode.json";
 const RANGE_TOKEN_RE = /^U\+([0-9A-Fa-f]+)(?:-([0-9A-Fa-f]+))?$/u;
 const parseRangeToken = (token) => {
 	const match = RANGE_TOKEN_RE.exec(token.trim());
@@ -172,7 +154,13 @@ const createFontsourceFaces = (files) => {
 		const cached = faceCache.get(key);
 		if (cached !== void 0) return cached;
 		const binaries = SUBSET_PRIORITY.flatMap((subset) => {
-			const bytes = files.read(packageName, `files/${packageName}-${subset}-${String(weight)}-${style}.woff`);
+			const bytes = files.read(packageName, bundledFontFilePath({
+				packageName,
+				subset,
+				weight,
+				style,
+				format: "woff"
+			}));
 			return bytes === null ? [] : [{
 				subset,
 				bytes

package/dist/i18n/messages/ar.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "تعذّر حفظ ملف DOCX",
 	"editSessionTakenOver": "فتح علامة تبويب أو نافذة أو جهاز آخر هذا المستند للتعديل، لذا تم تحرير هذه الجلسة. تم الحفاظ على التغييرات المحلية غير المحفوظة؛ أعد فتح المستند للمتابعة.",
 	"editor": {
+		"accessibleName": "محرر المستندات",
 		"editing": "تحرير",
 		"editingDescription": "تحرير المستند مباشرةً",
 		"outlineDepthAll": "كل المستويات",

package/dist/i18n/messages/catalogs.gen.d.ts

@@ -336,6 +336,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Could not save DOCX";
       readonly editSessionTakenOver: "Another tab, window, or device opened this document for editing, so this session was released. Unsaved local changes are preserved — reopen the doc to continue.";
       readonly editor: {
+        readonly accessibleName: "Document editor";
         readonly editing: "Editing";
         readonly editingDescription: "Edit the document directly";
         readonly outlineDepthAll: "All levels";
@@ -996,6 +997,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX-Datei konnte nicht gespeichert werden";
       readonly editSessionTakenOver: "Diese Bearbeitungssitzung wurde an anderer Stelle übernommen.";
       readonly editor: {
+        readonly accessibleName: "Dokumenteditor";
         readonly editing: "Bearbeiten";
         readonly editingDescription: "Dokument direkt bearbeiten";
         readonly outlineDepthAll: "Alle Ebenen";
@@ -1656,6 +1658,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Impossible d’enregistrer le DOCX";
       readonly editSessionTakenOver: "Cette session de modification a été reprise ailleurs.";
       readonly editor: {
+        readonly accessibleName: "Éditeur de documents";
         readonly editing: "Modification";
         readonly editingDescription: "Modifier directement le document";
         readonly outlineDepthAll: "Tous les niveaux";
@@ -2316,6 +2319,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "No se pudo guardar el DOCX";
       readonly editSessionTakenOver: "Esta sesión de edición se tomó en otro lugar.";
       readonly editor: {
+        readonly accessibleName: "Editor de documentos";
         readonly editing: "Edición";
         readonly editingDescription: "Editar el documento directamente";
         readonly outlineDepthAll: "Todos los niveles";
@@ -2976,6 +2980,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX se nepodařilo uložit";
       readonly editSessionTakenOver: "Tento dokument byl otevřen k úpravám v jiné kartě, okně nebo zařízení, takže byla tato relace ukončena. Neuložené místní změny zůstávají zachovány — otevřete dokument znovu a pokračujte.";
       readonly editor: {
+        readonly accessibleName: "Editor dokumentů";
         readonly editing: "Úpravy";
         readonly editingDescription: "Upravovat dokument přímo";
         readonly outlineDepthAll: "Vše";
@@ -3636,6 +3641,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "تعذّر حفظ ملف DOCX";
       readonly editSessionTakenOver: "فتح علامة تبويب أو نافذة أو جهاز آخر هذا المستند للتعديل، لذا تم تحرير هذه الجلسة. تم الحفاظ على التغييرات المحلية غير المحفوظة؛ أعد فتح المستند للمتابعة.";
       readonly editor: {
+        readonly accessibleName: "محرر المستندات";
         readonly editing: "تحرير";
         readonly editingDescription: "تحرير المستند مباشرةً";
         readonly outlineDepthAll: "كل المستويات";
@@ -4296,6 +4302,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX-i ei saanud salvestada";
       readonly editSessionTakenOver: "See muutmisseanss võeti mujal üle.";
       readonly editor: {
+        readonly accessibleName: "Dokumendiredaktor";
         readonly editing: "Redigeerimine";
         readonly editingDescription: "Redigeerige dokumenti otse";
         readonly outlineDepthAll: "Kõik tasemed";
@@ -4956,6 +4963,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "לא ניתן לשמור את ה-DOCX";
       readonly editSessionTakenOver: "כרטיסייה, חלון או מכשיר אחר פתחו מסמך זה לעריכה, ולכן הפעלה זו שוחררה. שינויים מקומיים שלא נשמרו נשמרו — פתח מחדש את המסמך כדי להמשיך.";
       readonly editor: {
+        readonly accessibleName: "עורך מסמכים";
         readonly editing: "עריכה";
         readonly editingDescription: "ערוך את המסמך ישירות";
         readonly outlineDepthAll: "כל הרמות";
@@ -5616,6 +5624,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX सहेजा नहीं जा सका";
       readonly editSessionTakenOver: "किसी अन्य टैब, विंडो या डिवाइस ने इस दस्तावेज़ को संपादन के लिए खोला, इसलिए यह सत्र बंद कर दिया गया। सहेजे नहीं गए स्थानीय परिवर्तन सुरक्षित हैं — जारी रखने के लिए दस्तावेज़ फिर से खोलें।";
       readonly editor: {
+        readonly accessibleName: "दस्तावेज़ संपादक";
         readonly editing: "संपादन";
         readonly editingDescription: "दस्तावेज़ को सीधे संपादित करें";
         readonly outlineDepthAll: "सभी स्तर";
@@ -6276,6 +6285,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "A DOCX nem menthető";
       readonly editSessionTakenOver: "Ezt a szerkesztési munkamenetet máshol vették át.";
       readonly editor: {
+        readonly accessibleName: "Dokumentumszerkesztő";
         readonly editing: "Szerkesztés";
         readonly editingDescription: "A dokumentum közvetlen szerkesztése";
         readonly outlineDepthAll: "Minden szint";
@@ -6936,6 +6946,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Nepavyko išsaugoti DOCX";
       readonly editSessionTakenOver: "Ši redagavimo sesija buvo perimta kitur.";
       readonly editor: {
+        readonly accessibleName: "Dokumentų redaktorius";
         readonly editing: "Redagavimas";
         readonly editingDescription: "Redaguokite dokumentą tiesiogiai";
         readonly outlineDepthAll: "Visi lygiai";
@@ -7596,6 +7607,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Neizdevās saglabāt DOCX";
       readonly editSessionTakenOver: "Šo rediģēšanas sesiju pārņēma citur.";
       readonly editor: {
+        readonly accessibleName: "Dokumentu redaktors";
         readonly editing: "Rediģēšana";
         readonly editingDescription: "Rediģējiet dokumentu tieši";
         readonly outlineDepthAll: "Visi līmeņi";
@@ -8256,6 +8268,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Nie udało się zapisać pliku DOCX";
       readonly editSessionTakenOver: "Ta sesja edycji została przejęta gdzie indziej.";
       readonly editor: {
+        readonly accessibleName: "Edytor dokumentów";
         readonly editing: "Edytowanie";
         readonly editingDescription: "Edytuj dokument bezpośrednio";
         readonly outlineDepthAll: "Wszystkie poziomy";
@@ -8916,6 +8929,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "Não foi possível salvar DOCX";
       readonly editSessionTakenOver: "Esta sessão de edição foi assumida em outro lugar.";
       readonly editor: {
+        readonly accessibleName: "Editor de documentos";
         readonly editing: "Editando";
         readonly editingDescription: "Edite o documento diretamente";
         readonly outlineDepthAll: "Todos os níveis";
@@ -9576,6 +9590,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX sa nepodarilo uložiť";
       readonly editSessionTakenOver: "Túto reláciu úprav prevzalo iné okno.";
       readonly editor: {
+        readonly accessibleName: "Editor dokumentov";
         readonly editing: "Úpravy";
         readonly editingDescription: "Upravujte dokument priamo";
         readonly outlineDepthAll: "Všetky úrovne";
@@ -10236,6 +10251,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "DOCX kaydedilemedi";
       readonly editSessionTakenOver: "Başka bir sekme, pencere veya cihaz bu belgeyi düzenlemek için açtığından bu oturum sonlandırıldı. Kaydedilmemiş yerel değişiklikler korunur; devam etmek için belgeyi yeniden açın.";
       readonly editor: {
+        readonly accessibleName: "Belge düzenleyici";
         readonly editing: "Düzenleme";
         readonly editingDescription: "Belgeyi doğrudan düzenleyin";
         readonly outlineDepthAll: "Tüm düzeyler";
@@ -10896,6 +10912,7 @@ export declare const CATALOGS: {
       readonly editSaveFailedTitle: "无法保存 DOCX";
       readonly editSessionTakenOver: "另一个标签页、窗口或设备已打开此文档进行编辑，因此本会话已释放。未保存的本地更改会保留，请重新打开文档以继续。";
       readonly editor: {
+        readonly accessibleName: "文档编辑器";
         readonly editing: "编辑";
         readonly editingDescription: "直接编辑文档";
         readonly outlineDepthAll: "所有级别";