@ot-builder/cli-proc 1.6.2 → 1.6.3

package/CHANGELOG.json

@@ -2,7 +2,64 @@
   "name": "@ot-builder/cli-proc",
   "entries": [
     {
-      "date": "Sat, 15 Apr 2023 01:05:12 GMT",
+      "date": "Sat, 22 Apr 2023 00:59:44 GMT",
+      "tag": "@ot-builder/cli-proc_v1.6.3",
+      "version": "1.6.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/cli-proc",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2",
+            "comment": "Fix handling of ignore glyph set when merging fonts"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/io-bin-font to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/primitive to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/common-impl to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/rectify to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/trace to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/prelude to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/ot to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 15 Apr 2023 01:06:43 GMT",
       "tag": "@ot-builder/cli-proc_v1.6.2",
       "version": "1.6.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,27 @@
 # Change Log - @ot-builder/cli-proc
 
-This log was last generated on Sat, 15 Apr 2023 01:05:12 GMT and should not be manually modified.
+This log was last generated on Sat, 22 Apr 2023 00:59:44 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.6.3
+
+Sat, 22 Apr 2023 00:59:44 GMT
+
+### Patches
+
+- Fix handling of ignore glyph set when merging fonts (otbbuilder-dev@users.noreply.github.com)
+- Bump @ot-builder/io-bin-font to v1.6.3
+- Bump @ot-builder/primitive to v1.6.3
+- Bump @ot-builder/common-impl to v1.6.3
+- Bump @ot-builder/rectify to v1.6.3
+- Bump @ot-builder/trace to v1.6.3
+- Bump @ot-builder/prelude to v1.6.3
+- Bump @ot-builder/ot to v1.6.3
+
 ## 1.6.2
 
-Sat, 15 Apr 2023 01:05:12 GMT
+Sat, 15 Apr 2023 01:06:43 GMT
 
 ### Patches
 

package/lib/procs/merge-consolidate/gsub-gpos-merger.d.ts

@@ -1,13 +1,16 @@
 import * as Ot from "@ot-builder/ot";
 import { Data } from "@ot-builder/prelude";
 import { FeatureConsolidationSource } from "./consolidate/feature";
-export declare class GsubGposMerger<L> implements FeatureConsolidationSource<L> {
+export declare class GsubGposMerger<L extends Ot.GsubGpos.LookupProp> implements FeatureConsolidationSource<L> {
     readonly variationDimensions: Data.Order<Ot.Var.Dim>;
     readonly preferred: Ot.GsubGpos.TableT<L>;
     readonly less: Ot.GsubGpos.TableT<L>;
-    constructor(variationDimensions: Data.Order<Ot.Var.Dim>, preferred: Ot.GsubGpos.TableT<L>, less: Ot.GsubGpos.TableT<L>);
+    private readonly preferredGdef;
+    private readonly lessGdef;
+    constructor(variationDimensions: Data.Order<Ot.Var.Dim>, preferred: Ot.GsubGpos.TableT<L>, less: Ot.GsubGpos.TableT<L>, preferredGdef: Data.Maybe<Ot.Gdef.Table>, lessGdef: Data.Maybe<Ot.Gdef.Table>);
     resolve(): Ot.GsubGpos.TableT<L>;
     private getLookups;
+    private amendIgnoreSet;
     private mergeScriptList;
     private mergeScript;
     private mergeLanguage;

package/lib/procs/merge-consolidate/gsub-gpos-merger.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GsubGposMerger = void 0;
 const ImpLib = require("@ot-builder/common-impl");
+const Ot = require("@ot-builder/ot");
 const feature_1 = require("./consolidate/feature");
 const utils_1 = require("./utils");
 class GsubGposMerger {
-    constructor(variationDimensions, preferred, less) {
+    constructor(variationDimensions, preferred, less, preferredGdef, lessGdef) {
         this.variationDimensions = variationDimensions;
         this.preferred = preferred;
         this.less = less;
+        this.preferredGdef = preferredGdef;
+        this.lessGdef = lessGdef;
         this.featureMergingPlans = new Map();
         this.featureVariationCollection = new Map();
         this.fordPreferred = ImpLib.Order.fromList("Features", preferred.features);
@@ -24,8 +27,59 @@ class GsubGposMerger {
         return { scripts, features, lookups, featureVariations };
     }
     getLookups() {
+        const result = [];
+        for (const lookup of this.preferred.lookups) {
+            result.push(lookup);
+            if (this.preferredGdef && this.lessGdef) {
+                this.amendIgnoreSet(lookup, this.preferredGdef, this.lessGdef);
+            }
+        }
+        for (const lookup of this.less.lookups) {
+            result.push(lookup);
+            if (this.preferredGdef && this.lessGdef) {
+                this.amendIgnoreSet(lookup, this.lessGdef, this.preferredGdef);
+            }
+        }
         return [...this.preferred.lookups, ...this.less.lookups];
     }
+    amendIgnoreSet(lookup, currentGdef, counterGdef) {
+        if (!lookup.ignoreGlyphs)
+            return;
+        if (!currentGdef.glyphClassDef || !counterGdef.glyphClassDef)
+            return;
+        let hasBase = false, hasLigature = false, hasMark = false;
+        for (const [g, c] of currentGdef.glyphClassDef) {
+            if (!lookup.ignoreGlyphs.has(g))
+                continue;
+            switch (c) {
+                case Ot.Gdef.GlyphClass.Base:
+                    hasBase = true;
+                    break;
+                case Ot.Gdef.GlyphClass.Ligature:
+                    hasLigature = true;
+                    break;
+                case Ot.Gdef.GlyphClass.Mark:
+                    hasMark = true;
+                    break;
+            }
+        }
+        for (const [g, c] of counterGdef.glyphClassDef) {
+            switch (c) {
+                case Ot.Gdef.GlyphClass.Base:
+                    if (hasBase)
+                        lookup.ignoreGlyphs.add(g);
+                    break;
+                case Ot.Gdef.GlyphClass.Ligature:
+                    if (hasLigature)
+                        lookup.ignoreGlyphs.add(g);
+                    break;
+                case Ot.Gdef.GlyphClass.Mark:
+                    if (hasMark)
+                        lookup.ignoreGlyphs.add(g);
+                    break;
+            }
+        }
+    }
     mergeScriptList() {
         return (0, utils_1.mergeMapAlt)(this.preferred.scripts, this.less.scripts, this.mergeScript.bind(this));
     }

package/lib/procs/merge-consolidate/index.d.ts

@@ -5,5 +5,5 @@ export type MergeOptions = {
 };
 export declare function mergeFonts<GS extends Ot.GlyphStore, GS2 extends Ot.GlyphStore>(basis: Ot.Font<GS>, override: Ot.Font<GS2>, gsf: Ot.GlyphStoreFactory<GS>, opt?: MergeOptions): void;
 export declare function consolidateFont<GS extends Ot.GlyphStore>(font: Ot.Font<GS>): void;
-export declare function consolidateGsubGpos<L>(fvar: Data.Maybe<Ot.Fvar.Table>, preferred: Ot.GsubGpos.TableT<L>): Ot.GsubGpos.TableT<L>;
+export declare function consolidateGsubGpos<L extends Ot.GsubGpos.LookupProp>(fvar: Data.Maybe<Ot.Fvar.Table>, preferred: Ot.GsubGpos.TableT<L>): Ot.GsubGpos.TableT<L>;
 //# sourceMappingURL=index.d.ts.map

package/lib/procs/merge-consolidate/index.js

@@ -32,14 +32,14 @@ exports.consolidateFont = consolidateFont;
 function mergeFontTables(basis, override, opt) {
     if (opt.preferOverride) {
         basis.cmap = mergeCmap(override.cmap, basis.cmap);
-        basis.gsub = mergeGsubGpos(override.fvar, override.gsub, basis.gsub);
-        basis.gpos = mergeGsubGpos(override.fvar, override.gpos, basis.gpos);
+        basis.gsub = mergeGsubGpos(override.fvar, override.gsub, basis.gsub, override.gdef, basis.gdef);
+        basis.gpos = mergeGsubGpos(override.fvar, override.gpos, basis.gpos, override.gdef, basis.gdef);
         basis.gdef = mergeGdef(override.gdef, basis.gdef);
     }
     else {
         basis.cmap = mergeCmap(basis.cmap, override.cmap);
-        basis.gsub = mergeGsubGpos(basis.fvar, basis.gsub, override.gsub);
-        basis.gpos = mergeGsubGpos(basis.fvar, basis.gpos, override.gpos);
+        basis.gsub = mergeGsubGpos(basis.fvar, basis.gsub, override.gsub, basis.gdef, override.gdef);
+        basis.gpos = mergeGsubGpos(basis.fvar, basis.gpos, override.gpos, basis.gdef, override.gdef);
         basis.gdef = mergeGdef(basis.gdef, override.gdef);
     }
 }
@@ -67,20 +67,20 @@ function mergeGdef(preferred, less) {
     result.glyphClassDef = (0, utils_1.mergeMapOpt)(preferred.glyphClassDef, less.glyphClassDef, utils_1.Prime);
     result.attachList = (0, utils_1.mergeMapOpt)(preferred.attachList, less.attachList, utils_1.Prime);
     result.ligCarets = (0, utils_1.mergeMapOpt)(preferred.ligCarets, less.ligCarets, utils_1.Prime);
-    result.markAttachClassDef = (0, utils_1.mergeMapOpt)(preferred.markAttachClassDef, less.markAttachClassDef, utils_1.Prime);
+    result.markAttachClassDef = (0, utils_1.mergeClassDefOpt)(preferred.markAttachClassDef, less.markAttachClassDef);
     result.markGlyphSets = (0, utils_1.combineList)(preferred.markGlyphSets, less.markGlyphSets);
     return result;
 }
-function mergeGsubGpos(fvar, preferred, less) {
+function mergeGsubGpos(fvar, preferred, less, preferredGdef, lessGdef) {
     if (!preferred)
         return less;
     if (!less)
         return preferred;
-    const merger = new gsub_gpos_merger_1.GsubGposMerger(ImpLib.Order.fromList("Dimensions", fvar ? fvar.axes.map(a => a.dim) : []), preferred, less);
+    const merger = new gsub_gpos_merger_1.GsubGposMerger(ImpLib.Order.fromList("Dimensions", fvar ? fvar.axes.map(a => a.dim) : []), preferred, less, preferredGdef, lessGdef);
     return merger.resolve();
 }
 function consolidateGsubGpos(fvar, preferred) {
-    const merger = new gsub_gpos_merger_1.GsubGposMerger(ImpLib.Order.fromList("Dimensions", fvar ? fvar.axes.map(a => a.dim) : []), preferred, { scripts: new Map(), features: [], lookups: [], featureVariations: [] });
+    const merger = new gsub_gpos_merger_1.GsubGposMerger(ImpLib.Order.fromList("Dimensions", fvar ? fvar.axes.map(a => a.dim) : []), preferred, { scripts: new Map(), features: [], lookups: [], featureVariations: [] }, null, null);
     return merger.resolve();
 }
 exports.consolidateGsubGpos = consolidateGsubGpos;

package/lib/procs/merge-consolidate/utils.d.ts

@@ -2,6 +2,8 @@ import { Data } from "@ot-builder/prelude";
 export declare function combineList<T>(a: Data.Maybe<ReadonlyArray<T>>, b: Data.Maybe<ReadonlyArray<T>>): T[];
 export declare function mergeMapOpt<K, V>(preferred: Data.Maybe<Map<K, V>>, less: Data.Maybe<Map<K, V>>, mergeValue: (a: V, b: V) => V): Data.Maybe<Map<K, V>>;
 export declare function mergeMap<K, V>(preferred: Map<K, V>, less: Map<K, V>, mergeValue: (a: V, b: V) => V): Map<K, V>;
+export declare function mergeClassDefOpt<K>(preferred: Data.Maybe<Map<K, number>>, less: Data.Maybe<Map<K, number>>): Data.Maybe<Map<K, number>>;
+export declare function mergeClassDef<K>(preferred: Map<K, number>, less: Map<K, number>): Map<K, number>;
 export declare function mergeMapAlt<K, V>(preferred: Map<K, V>, less: Map<K, V>, mergeValue: (a: undefined | V, b: undefined | V) => V): Map<K, V>;
 export declare function Prime<K>(a: K, b: K): K;
 //# sourceMappingURL=utils.d.ts.map

package/lib/procs/merge-consolidate/utils.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Prime = exports.mergeMapAlt = exports.mergeMap = exports.mergeMapOpt = exports.combineList = void 0;
+exports.Prime = exports.mergeMapAlt = exports.mergeClassDef = exports.mergeClassDefOpt = exports.mergeMap = exports.mergeMapOpt = exports.combineList = void 0;
 function combineList(a, b) {
-    return [...(a || []), ...(a || [])];
+    return [...(a || []), ...(b || [])];
 }
 exports.combineList = combineList;
 function mergeMapOpt(preferred, less, mergeValue) {
@@ -26,6 +26,26 @@ function mergeMap(preferred, less, mergeValue) {
     return m;
 }
 exports.mergeMap = mergeMap;
+function mergeClassDefOpt(preferred, less) {
+    if (!preferred)
+        return less;
+    if (!less)
+        return preferred;
+    return mergeClassDef(preferred, less);
+}
+exports.mergeClassDefOpt = mergeClassDefOpt;
+function mergeClassDef(preferred, less) {
+    const m = new Map(preferred);
+    let maxClass = 0;
+    for (const v of m.values())
+        if (v > maxClass)
+            maxClass = v;
+    for (const [k, v] of less)
+        if (!m.has(k))
+            m.set(k, v + maxClass);
+    return m;
+}
+exports.mergeClassDef = mergeClassDef;
 function mergeMapAlt(preferred, less, mergeValue) {
     const keySet = new Set([...preferred.keys(), ...less.keys()]);
     const m = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ot-builder/cli-proc",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
   },
   "dependencies": {
     "tslib": "^2.0.0",
-    "@ot-builder/io-bin-font": "1.6.2",
-    "@ot-builder/primitive": "1.6.2",
-    "@ot-builder/common-impl": "1.6.2",
-    "@ot-builder/rectify": "1.6.2",
-    "@ot-builder/trace": "1.6.2",
-    "@ot-builder/prelude": "1.6.2",
-    "@ot-builder/ot": "1.6.2"
+    "@ot-builder/io-bin-font": "1.6.3",
+    "@ot-builder/primitive": "1.6.3",
+    "@ot-builder/common-impl": "1.6.3",
+    "@ot-builder/rectify": "1.6.3",
+    "@ot-builder/trace": "1.6.3",
+    "@ot-builder/prelude": "1.6.3",
+    "@ot-builder/ot": "1.6.3"
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",