ntk 8.17.5 → 8.17.6

package/lib/fontconfig.js

@@ -479,15 +479,18 @@ function slantRank(italic, [lo, hi]) {
 // Weight, for `weight` asked: between 400 and 500, up to 500 ascending, then
 // lighter descending, then past 500 ascending; below 400 lighter first, above
 // 500 heavier first. A variable face's range holds every weight in it.
-function weightRank(weight, [lo, hi]) {
+// `regular` and `medium` are 400 and 500 on the scale the weights are on —
+// fontconfig's here, CSS's in StaticFontSource, where an OS/2 weight class can
+// be anything up to 65535 and so each direction is a million past the last.
+export function weightRank(weight, [lo, hi], regular = REGULAR, medium = MEDIUM) {
   if (lo <= weight && hi >= weight) return 0;
   const x = hi < weight ? hi : lo;
-  if (weight >= REGULAR && weight <= MEDIUM) {
-    if (x > weight && x <= MEDIUM) return x - weight;
-    return x < weight ? 1000 + weight - x : 2000 + x - weight;
+  if (weight >= regular && weight <= medium) {
+    if (x > weight && x <= medium) return x - weight;
+    return x < weight ? 1e6 + weight - x : 2e6 + x - weight;
   }
-  if (weight < REGULAR) return x < weight ? weight - x : 1000 + x - weight;
-  return x > weight ? x - weight : 1000 + weight - x;
+  if (weight < regular) return x < weight ? weight - x : 1e6 + x - weight;
+  return x > weight ? x - weight : 1e6 + weight - x;
 }
 
 /**

package/lib/text/fontsource.js

@@ -54,7 +54,8 @@ import {
   noFontsError,
   prewarmFaces,
   prewarmPatterns,
-  supported
+  supported,
+  weightRank
 } from '../fontconfig.js';
 import Font from './font.js';
 
@@ -178,14 +179,16 @@ export class FontconfigFontSource {
  *   source.alias('sans-serif', 'DejaVu Sans');
  *   const app = await createClient({ fontSource: source });
  *
- * Matching mirrors fontconfig semantics: every added face is a fallback
+ * Matching mirrors the system path: every added face is a fallback
  * candidate; faces matching a requested family (in list order) rank first,
- * then closest weight, then style. Coverage checks use the real font
- * tables, so per-codepoint fallback works exactly like the system path.
+ * then within a family the style, then the weight CSS's font matching picks
+ * (CSS Fonts 4 §5.2) — as the fontconfig source does, so a family answers
+ * alike from either. Coverage checks use the real font tables, so
+ * per-codepoint fallback works exactly like the system path.
  */
 export class StaticFontSource {
   constructor() {
-    this._faces = []; // { font, family, weight, italic, candidate }
+    this._faces = []; // { font, family, weight: [lo, hi], italic, candidate }
     this._aliases = new Map(); // 'sans-serif' -> 'dejavu sans'
     this._n = 0;
     /** files a font spec could not parse: [{ file, error }] */
@@ -196,7 +199,9 @@ export class StaticFontSource {
    * Register a font.
    * @param {Uint8Array|Buffer|Font} data font file bytes (or an open Font)
    * @param {object} [opts] { family (alias for matching; defaults to the
-   *   font's family name), weight, style, postscriptName (face of a .ttc) }
+   *   font's family name), weight, style, postscriptName (face of a .ttc) }.
+   *   A `weight` is the face's, as @font-face's descriptor is; without one a
+   *   variable face holds every weight on its `wght` axis.
    * @returns {Font}
    */
   add(data, opts = {}) {
@@ -208,10 +213,12 @@ export class StaticFontSource {
             postscriptName: opts.postscriptName
           });
     const detected = detectStyle(font);
+    const axis = font.variationAxes.wght;
+    const weight = opts.weight !== undefined ? numericWeight(opts.weight) : detected.weight;
     this._faces.push({
       font,
       family: (opts.family || font.familyName || '').toLowerCase(),
-      weight: opts.weight !== undefined ? numericWeight(opts.weight) : detected.weight,
+      weight: axis && opts.weight === undefined ? [axis.min, axis.max] : [weight, weight],
       italic:
         opts.style !== undefined ? String(opts.style).includes('italic') : detected.italic,
       candidate: null
@@ -234,8 +241,8 @@ export class StaticFontSource {
    *
    * This is not cosmetic. Every widget default in the toolkit is
    * `sans-serif`, and `code`/`pre` ask for `monospace`; with no alias for
-   * them `matchSorted` ranks every face equally and breaks the tie on weight
-   * distance and then insertion order, so `monospace` silently renders in a
+   * them `matchSorted` ranks every face equally and breaks the tie on style
+   * and weight and then insertion order, so `monospace` silently renders in a
    * proportional face. Inference happens automatically for a source built
    * from a font spec; a hand-built source calls this when it wants it.
    *
@@ -278,16 +285,19 @@ export class StaticFontSource {
     const weight = numericWeight(pattern.weight);
     const italic = !!(pattern.style && String(pattern.style).includes('italic'));
 
+    // family, then style, then weight in CSS's order; the sort is stable, so
+    // faces alike in all three stay in the order they were added
     const scored = this._faces.map((face) => {
       let rank = families.indexOf(face.family);
       if (rank === -1) rank = families.length; // non-matching faces trail
       return {
         face,
-        score:
-          rank * 1e6 + (face.italic !== italic ? 1e4 : 0) + Math.abs(face.weight - weight)
+        ranks: [rank, face.italic !== italic ? 1 : 0, weightRank(weight, face.weight, 400, 500)]
       };
     });
-    scored.sort((a, b) => a.score - b.score);
+    scored.sort(
+      (a, b) => a.ranks[0] - b.ranks[0] || a.ranks[1] - b.ranks[1] || a.ranks[2] - b.ranks[2]
+    );
     return scored.map(({ face }) => {
       if (!face.candidate) {
         // the font's own family name, not the (lowercased, possibly aliased)

package/package.json

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