ntk 8.12.2 → 8.12.3

package/lib/text/font.js

@@ -75,6 +75,12 @@ export default class Font {
     this.path = path;
     /** stable cache key for glyph pages and font caches */
     this.key = `${path}#${postscriptName || fkFont.postscriptName || ''}`;
+    // What the face's tables say, read once. fontkit's getters walk to the
+    // table on every read, and a text layout asks per run and per word: in
+    // a long document they were most of a relayout (see `metrics`).
+    this._upem = 0;
+    this._vertical = null;
+    this._space = -1;
   }
 
   static loadSync(path, postscriptName) {
@@ -214,28 +220,48 @@ export default class Font {
   }
 
   scale(size) {
-    return size / this.fk.unitsPerEm;
+    return size / (this._upem ||= this.fk.unitsPerEm);
   }
 
   /**
    * Pixel-space metrics for a font size. `ascent`/`capHeight`/`xHeight` are
    * positive (above baseline), `descent` is positive (below baseline).
+   *
+   * A new object every call, which a caller may keep or change; the numbers
+   * behind it are the face's, read from its tables once.
    */
   metrics(size) {
+    const v = (this._vertical ??= {
+      ascent: this.fk.ascent,
+      descent: -this.fk.descent,
+      lineGap: this.fk.lineGap,
+      capHeight: this.fk.capHeight,
+      xHeight: this.fk.xHeight
+    });
     const s = this.scale(size);
-    const ascent = this.fk.ascent * s;
-    const descent = -this.fk.descent * s;
-    const lineGap = this.fk.lineGap * s;
+    const ascent = v.ascent * s;
+    const descent = v.descent * s;
+    const lineGap = v.lineGap * s;
     return {
       ascent,
       descent,
       lineGap,
       lineHeight: ascent + descent + lineGap,
-      capHeight: this.fk.capHeight * s,
-      xHeight: this.fk.xHeight * s
+      capHeight: v.capHeight * s,
+      xHeight: v.xHeight * s
     };
   }
 
+  /**
+   * The advance of U+0020 at `size` — what a run of trailing spaces is
+   * worth to a line. Looked up once: it was a cmap lookup for every word a
+   * layout ended with a space, which in a paragraph is every word.
+   */
+  spaceAdvance(size) {
+    if (this._space < 0) this._space = this.fk.glyphForCodePoint(0x20).advanceWidth;
+    return this._space * this.scale(size);
+  }
+
   hasGlyph(codepoint) {
     return this.fk.hasGlyphForCodePoint(codepoint);
   }

package/lib/text/layout.js

@@ -324,10 +324,8 @@ export class TextLayout {
     if (last) {
       const m = TRAILING_WS.exec(last.text);
       if (m) {
-        const spaceGlyph = last.span.font.fk.glyphForCodePoint(0x20);
         const spacing = Number.isFinite(last.span.letterSpacing) ? last.span.letterSpacing : 0;
-        wsWidth =
-          m[0].length * (spaceGlyph.advanceWidth * last.span.font.scale(last.span.size) + spacing);
+        wsWidth = m[0].length * (last.span.font.spaceAdvance(last.span.size) + spacing);
       }
     }
     return { fragments, width, wsWidth, required, start, end };

package/lib/text/shape.js

@@ -25,9 +25,29 @@ function neverSwitches(cp) {
  */
 export function embeddingLevels(text, direction = 'auto') {
   const explicit = direction === 'ltr' || direction === 'rtl' ? direction : null;
+  // Text that nothing can make right-to-left is level 0 throughout, which
+  // is what the algorithm would work out a character at a time: every
+  // layout asks, and most text is Latin, CJK or digits with no bidi at all.
+  if (explicit !== 'rtl' && !MAY_REVERSE.test(text)) {
+    return {
+      levels: new Uint8Array(text.length),
+      paragraphs: text.length ? [{ start: 0, end: text.length - 1, level: 0 }] : []
+    };
+  }
   return bidi.getEmbeddingLevels(text, explicit);
 }
 
+/**
+ * What can raise a level in a left-to-right paragraph: a strong
+ * right-to-left character (Hebrew, Arabic, Syriac, Thaana, N'Ko and their
+ * neighbours, their presentation forms, and the right-to-left blocks of the
+ * supplementary planes, found by their high surrogates), an Arabic number,
+ * RLM and ALM, and every explicit embedding, override and isolate. Anything
+ * else resolves to 0.
+ */
+const MAY_REVERSE =
+  /[\u0590-\u08FF\u200F\u202A-\u202E\u2066-\u2069\uFB1D-\uFDFF\uFE70-\uFEFF]|[\uD802\uD803\uD83A\uD83B]/;
+
 /**
  * Compact embedding-levels encoding for the shaping memo key: a single
  * number when uniform over [start, end) — the common case — else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "8.12.2",
+  "version": "8.12.3",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",