postext-pdf 1.27.1 → 1.28.0

package/dist/shapingLanguage.d.ts

@@ -10,9 +10,18 @@ export declare function shapingLanguage(): string | undefined;
  *  openTypeLanguageOf}), then put back the language in force before, also
  *  when `fn` throws. */
 export declare function withShapingLanguage<T>(language: string | undefined, fn: () => T): T;
+/** The script (ISO 15924) text is shaped in now; undefined: the one each
+ *  shaper reads from the text. */
+export declare function shapingScript(): string | undefined;
+/** A letter of the script in force (a code point), undefined with none. */
+export declare function shapingScriptLetter(): number | undefined;
+/** Run `fn` with text shaped in `script` (an ISO 15924 code the engine
+ *  acts on, else ignored), then put back the script in force before, also
+ *  when `fn` throws. */
+export declare function withShapingScript<T>(script: string | undefined, fn: () => T): T;
 /** The key a cache of shaped `text` holds it under: the text itself in
- *  the default language (as every cache did), else tagged with the
- *  language it was shaped in. */
+ *  the default language and script (as every cache did), else tagged with
+ *  the language and the script it was shaped in. */
 export declare function shapingKey(text: string): string;
 /**
  * Make the fontkit face of `font` shape in the language in force when a
@@ -21,7 +30,10 @@ export declare function shapingKey(text: string): string;
  * Text of punctuation alone is shaped as Han under a language (fontkit
  * would read no script from it, and take the default script, which has no
  * language systems), as a browser shapes it with the Japanese text around
- * it. With no language in force the call is the one it always was.
+ * it. With a script in force the text is shaped in it, left to right
+ * (fontkit would take the direction from the script and set `1367` in an
+ * Arabic sentence backwards; a right-to-left word is HarfBuzz's). With
+ * neither in force the call is the one it always was.
  */
 export declare function shapeInCurrentLanguage(font: PDFFont): void;
 //# sourceMappingURL=shapingLanguage.d.ts.map

package/dist/shapingLanguage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shapingLanguage.d.ts","sourceRoot":"","sources":["../src/shapingLanguage.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIvC;;yCAEyC;AACzC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9E;AAED;gBACgB;AAChB,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAEpD;AAED;;wBAEwB;AACxB,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CASnF;AAED;;iCAEiC;AACjC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAWD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAW1D"}
+{"version":3,"file":"shapingLanguage.d.ts","sourceRoot":"","sources":["../src/shapingLanguage.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIvC;;yCAEyC;AACzC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9E;AAED;gBACgB;AAChB,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAEpD;AAED;;wBAEwB;AACxB,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CASnF;AAWD;kCACkC;AAClC,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED,2EAA2E;AAC3E,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAExD;AAED;;wBAEwB;AACxB,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAU/E;AAED;;oDAEoD;AACpD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/C;AAWD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAY1D"}

package/dist/shapingLanguage.js

@@ -19,6 +19,14 @@
  * ({@link openTypeLanguageOf}), none for any other language, so Chinese,
  * Korean, Latin and Arabic text is shaped exactly as before. Pages are
  * painted synchronously, so the language in force is the page's.
+ *
+ * The script in force (#725) works the same way, for one word at a time:
+ * a word with no letter (`46.`, `1367)`) that the layout measured in the
+ * script of the text around it (`VDTLineSegment.scriptContext`) is shaped
+ * in that script ({@link withShapingScript}), where fontkit would read no
+ * script from its characters and take the font's default. Amiri sets the
+ * Latin full stop and brackets under `latn` only: without it the PDF
+ * printed Arabic ones in a Latin note, wider than the places measured.
  */
 import { isJapaneseLanguage } from 'postext';
 let current;
@@ -48,10 +56,44 @@ export function withShapingLanguage(language, fn) {
         current = previous;
     }
 }
+/** The scripts a word with no letter may be shaped in (ISO 15924, as
+ *  `VDTLineSegment.scriptContext` names them) and their OpenType tags. */
+const OPENTYPE_SCRIPT = { Latn: 'latn', Grek: 'grek', Cyrl: 'cyrl', Arab: 'arab', Hebr: 'hebr', Hani: 'hani' };
+/** A letter of each script: the file of a face cut into several that
+ *  holds it is the one the script's text is set in (`fileRuns`). */
+const SCRIPT_LETTER = { Latn: 0x6E, Grek: 0x3BD, Cyrl: 0x43D, Arab: 0x628, Hebr: 0x5D0, Hani: 0x4E00 };
+let currentScript;
+/** The script (ISO 15924) text is shaped in now; undefined: the one each
+ *  shaper reads from the text. */
+export function shapingScript() {
+    return currentScript;
+}
+/** A letter of the script in force (a code point), undefined with none. */
+export function shapingScriptLetter() {
+    return currentScript === undefined ? undefined : SCRIPT_LETTER[currentScript];
+}
+/** Run `fn` with text shaped in `script` (an ISO 15924 code the engine
+ *  acts on, else ignored), then put back the script in force before, also
+ *  when `fn` throws. */
+export function withShapingScript(script, fn) {
+    const next = script !== undefined && OPENTYPE_SCRIPT[script] !== undefined ? script : undefined;
+    if (next === currentScript)
+        return fn();
+    const previous = currentScript;
+    currentScript = next;
+    try {
+        return fn();
+    }
+    finally {
+        currentScript = previous;
+    }
+}
 /** The key a cache of shaped `text` holds it under: the text itself in
- *  the default language (as every cache did), else tagged with the
- *  language it was shaped in. */
+ *  the default language and script (as every cache did), else tagged with
+ *  the language and the script it was shaped in. */
 export function shapingKey(text) {
+    if (currentScript !== undefined)
+        return `${currentScript}\u0001${current ?? ''}\u0000${text}`;
     return current === undefined ? text : `${current}\u0000${text}`;
 }
 /** Text with a character of a script of its own (Han, kana, Latin…), from
@@ -66,7 +108,10 @@ const shaped = new WeakSet();
  * Text of punctuation alone is shaped as Han under a language (fontkit
  * would read no script from it, and take the default script, which has no
  * language systems), as a browser shapes it with the Japanese text around
- * it. With no language in force the call is the one it always was.
+ * it. With a script in force the text is shaped in it, left to right
+ * (fontkit would take the direction from the script and set `1367` in an
+ * Arabic sentence backwards; a right-to-left word is HarfBuzz's). With
+ * neither in force the call is the one it always was.
  */
 export function shapeInCurrentLanguage(font) {
     const face = font.embedder?.font;
@@ -75,6 +120,8 @@ export function shapeInCurrentLanguage(font) {
     const layout = face.layout.bind(face);
     face.layout = (text, features, script, language, direction) => {
         const lang = language ?? current;
+        if (script === undefined && currentScript !== undefined)
+            return layout(text, features, OPENTYPE_SCRIPT[currentScript], lang, direction ?? 'ltr');
         if (lang === undefined)
             return layout(text, features, script, language, direction);
         const scriptTag = script ?? (typeof text === 'string' && !STRONG_SCRIPT_RE.test(text) ? 'hani' : undefined);

package/dist/shapingLanguage.js.map

@@ -1 +1 @@
-{"version":3,"file":"shapingLanguage.js","sourceRoot":"","sources":["../src/shapingLanguage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAG7C,IAAI,OAA2B,CAAC;AAEhC;;yCAEyC;AACzC,MAAM,UAAU,kBAAkB,CAAC,GAAuB;IACxD,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC;AAED;gBACgB;AAChB,MAAM,UAAU,eAAe;IAC7B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;wBAEwB;AACxB,MAAM,UAAU,mBAAmB,CAAI,QAA4B,EAAE,EAAW;IAC9E,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,EAAE,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC;IACzB,OAAO,GAAG,QAAQ,CAAC;IACnB,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,OAAO,GAAG,QAAQ,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;iCAEiC;AACjC,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,SAAS,IAAI,EAAE,CAAC;AAClE,CAAC;AAED;;mCAEmC;AACnC,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAIrE,MAAM,MAAM,GAAG,IAAI,OAAO,EAAU,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAa;IAClD,MAAM,IAAI,GAAI,IAAiE,CAAC,QAAQ,EAAE,IAAI,CAAC;IAC/F,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO;IAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;QAC5D,MAAM,IAAI,GAAG,QAAQ,IAAI,OAAO,CAAC;QACjC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5G,OAAO,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC"}
+{"version":3,"file":"shapingLanguage.js","sourceRoot":"","sources":["../src/shapingLanguage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postext-pdf",
-  "version": "1.27.1",
+  "version": "1.28.0",
   "description": "Browser-native PDF renderer for Postext documents. Consumes the same VDT as the canvas/HTML backends and produces a physical PDF with faithful glyph positioning, justification, crop marks, and baseline grid.",
   "type": "module",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "postext": "^1.27.1"
+    "postext": "^1.28.0"
   },
   "dependencies": {
     "@pdf-lib/fontkit": "^1.1.1",
@@ -54,7 +54,7 @@
     "@types/node": "^26.5.0",
     "eslint": "^9.39.4",
     "harfbuzzjs": "1.6.2",
-    "postext": "1.27.1",
+    "postext": "1.28.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.70.0",
     "vitest": "^5.0.0"