@openpresentation/opf-render 0.13.0 → 0.14.0

package/dist/symbol-fonts.js

@@ -4,12 +4,14 @@
 // Microsoft Symbol cmap (U+F020..U+F0FF), not at Unicode code points. Office stores such text as private-use
 // characters (U+F0xx, what Insert > Symbol and `a:sym` runs write) or as the Windows-1252 character of each
 // code (the letter "l" typed in a Wingdings run, a `buChar` of "§" with `buFont` Wingdings). None of the five
-// fonts may be bundled (proprietary), so a preview maps each code to its Unicode equivalent (core
-// spec/reference/symbol-font-encodings.json, snapshot in symbol-encodings.js) and draws that character with the
-// first loaded open face that has it; the PPTX keeps the family name and the original characters. Browser-safe
-// and deterministic: no DOM, network or locale data.
-import { SYMBOL_ENCODINGS } from "./symbol-encodings.js";
-export { SYMBOL_ENCODINGS, SYMBOL_ENCODINGS_SOURCE } from "./symbol-encodings.js";
+// fonts may be bundled (proprietary), so a preview maps each code to its Unicode equivalent with core's table
+// (`@openpresentation/opf/symbol-font-encodings`, which also holds the verified font's advance for every code)
+// and draws that character with the first loaded open face that has it; the PPTX keeps the family name and the
+// original characters. Core owns the table and the code rules (`isSymbolEncodedFamily`, `symbolCodeOf`,
+// `mapSymbolText`); this module adds the preview faces and the advance of each code. Browser-safe and
+// deterministic: no DOM, network or locale data.
+import { isSymbolEncodedFamily, mapSymbolText, symbolCodeOf, symbolFontEncodingFor } from "@openpresentation/opf/symbol-font-encodings";
+export { isSymbolEncodedFamily, mapSymbolText, symbolCodeOf };
 
 const freeze = value => { if (value && typeof value === "object") { for (const child of Object.values(value)) freeze(child); Object.freeze(value); } return value; };
 
@@ -36,61 +38,26 @@ export const SYMBOL_PREVIEW_FACES = freeze({
 /** Every open face a symbol preview may draw with. */
 export const SYMBOL_FACE_FAMILIES = freeze([...new Set(Object.values(SYMBOL_PREVIEW_FACES).flat())]);
 
-const byFamily = new Map(SYMBOL_ENCODINGS.map(entry => [entry.family.toLowerCase(), entry]));
-
-/** The encoding snapshot of a symbol-encoded family (case-insensitive), or undefined for any other family. */
-export function symbolEncodingFor(family) {
-  return typeof family === "string" ? byFamily.get(family.trim().toLowerCase()) : undefined;
-}
-
-/** True for Symbol, Wingdings, Wingdings 2, Wingdings 3 and Webdings (case-insensitive). */
-export function isSymbolEncodedFamily(family) {
-  return symbolEncodingFor(family) !== undefined;
+/** The canonical family name of a symbol-encoded family (case-insensitive), or undefined for any other family. */
+export function symbolEncodingFamily(family) {
+  return symbolFontEncodingFor(family)?.family;
 }
 
 /** The faces a symbol-encoded family previews with, in order. */
 export function symbolPreviewFaces(family) {
-  const entry = symbolEncodingFor(family);
-  return entry ? SYMBOL_PREVIEW_FACES[entry.family] : [];
-}
-
-// Windows-1252 characters at 0x80..0x9F (the five unassigned bytes 0x81, 0x8D, 0x8F, 0x90 and 0x9D have no character).
-const CP1252_HIGH = freeze({
-  0x20ac: 0x80, 0x201a: 0x82, 0x0192: 0x83, 0x201e: 0x84, 0x2026: 0x85, 0x2020: 0x86, 0x2021: 0x87, 0x02c6: 0x88, 0x2030: 0x89,
-  0x0160: 0x8a, 0x2039: 0x8b, 0x0152: 0x8c, 0x017d: 0x8e, 0x2018: 0x91, 0x2019: 0x92, 0x201c: 0x93, 0x201d: 0x94, 0x2022: 0x95,
-  0x2013: 0x96, 0x2014: 0x97, 0x02dc: 0x98, 0x2122: 0x99, 0x0161: 0x9a, 0x203a: 0x9b, 0x0153: 0x9c, 0x017e: 0x9e, 0x0178: 0x9f,
-});
-
-/**
- * The symbol code of one character, or null when it is not a code (the same rule as core `symbolCodeOf`): a
- * private-use character U+F020..U+F0FF gives its low byte; U+0020..U+007E and U+00A0..U+00FF are their own
- * byte; the Windows-1252 characters at 0x80..0x9F give that byte. Any other character is not symbol-encoded
- * text and draws as itself.
- */
-export function symbolCodeOf(character) {
-  if (typeof character !== "string" || !character) return null;
-  const point = character.codePointAt(0);
-  if (point >= 0xf020 && point <= 0xf0ff) return point - 0xf000;
-  if ((point >= 0x20 && point <= 0x7e) || (point >= 0xa0 && point <= 0xff)) return point;
-  return CP1252_HIGH[point] ?? null;
+  const name = symbolEncodingFamily(family);
+  return name ? SYMBOL_PREVIEW_FACES[name] : [];
 }
 
-const unicodeString = value => String.fromCodePoint(...value.split("+").map(hex => parseInt(hex, 16)));
-
 /**
- * Normalise text in a symbol-encoded family character by character: `{source, code, unicode, advance, reason?}`.
- * `code` is null for a character that is not symbol-encoded text (it draws as itself); `unicode` is the
- * equivalent to draw or null with the table's `reason`; `advance` is the verified font's advance for the code
- * in em (null when that font has no glyph there). An unknown family maps every character to `{code: null}`.
+ * Core `mapSymbolText` with the advance of each code added: `{source, code, unicode, advance, reason?}`. `advance` is the
+ * verified font's advance for the code in em (null when that font has no glyph there, or the character is not a code); the
+ * preview places each drawn character at it. An unknown family maps every character to `{code: null}`.
  */
-export function mapSymbolText(family, text) {
-  const entry = symbolEncodingFor(family);
-  const out = [];
-  for (const source of String(text ?? "")) {
-    const code = entry ? symbolCodeOf(source) : null;
-    if (code === null) { out.push({source, code: null, unicode: null, advance: null}); continue; }
-    const [unicode, advance, reason] = entry.codes[code - 0x20];
-    out.push({source, code, unicode: unicode === null ? null : unicodeString(unicode), advance: advance === null ? null : advance / entry.unitsPerEm, ...(unicode === null ? {reason} : {})});
-  }
-  return out;
+export function mapSymbolAdvances(family, text) {
+  const encoding = symbolFontEncodingFor(family);
+  return mapSymbolText(family, text).map(item => ({
+    ...item,
+    advance: encoding && item.code !== null && encoding.codes[item.code - 0x20]?.installed ? encoding.codes[item.code - 0x20].installed.advance / encoding.verifiedAgainst.unitsPerEm : null,
+  }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-render",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Deterministic local OPF renderer for SVG, PNG, and PDF output.",
   "license": "MIT",
   "type": "module",
@@ -138,13 +138,13 @@
     "@expo-google-fonts/roboto": "0.4.3",
     "@expo-google-fonts/roboto-mono": "0.4.2",
     "@expo-google-fonts/tinos": "0.4.2",
-    "@openpresentation/opf": "^0.13.0",
+    "@openpresentation/opf": "^0.14.0",
     "@resvg/resvg-js": "^2.6.2",
     "bidi-js": "1.1.0",
     "fontkit": "^2.0.4",
     "pako": "1.0.11",
     "pdf-lib": "^1.17.1",
-    "sharp": "0.35.4"
+    "sharp": "0.35.5"
   },
   "peerDependencies": {
     "@expo-google-fonts/noto-color-emoji": "0.4.6",