@ot-builder/io-bin-layout 1.6.2 → 1.6.3

package/CHANGELOG.json

@@ -2,7 +2,142 @@
   "name": "@ot-builder/io-bin-layout",
   "entries": [
     {
-      "date": "Sat, 15 Apr 2023 01:05:12 GMT",
+      "date": "Sat, 22 Apr 2023 00:59:44 GMT",
+      "tag": "@ot-builder/io-bin-layout_v1.6.3",
+      "version": "1.6.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/io-bin-layout",
+            "commit": "dc2c43855a1556176041326c5aac1cb4c8868b9e",
+            "comment": "Bugfix for a mark class that has no bases"
+          },
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/io-bin-layout",
+            "commit": "df27eccdd84a210e939708f225c465911a0882cd",
+            "comment": "Fix handling of mark attachment flags in lookups"
+          },
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/io-bin-layout",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2",
+            "comment": "Fix handling of ignore glyph set when merging fonts"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/bin-composite-types to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/bin-util to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/errors to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/ot-glyphs to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/ot-layout to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/ot-metadata to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/prelude to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/primitive to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/var-store to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/variance to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/common-impl to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/ot-sfnt to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/io-bin-sfnt to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/io-bin-glyph-store to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/io-bin-metadata to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/ot-encoding to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/io-bin-encoding to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-layout",
+            "comment": "Bump @ot-builder/test-util to v1.6.3",
+            "commit": "b19d6f897aa2a52a78cc95ca4832baeda71446a2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 15 Apr 2023 01:06:43 GMT",
       "tag": "@ot-builder/io-bin-layout_v1.6.2",
       "version": "1.6.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,40 @@
 # Change Log - @ot-builder/io-bin-layout
 
-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
+
+- Bugfix for a mark class that has no bases (otbbuilder-dev@users.noreply.github.com)
+- Fix handling of mark attachment flags in lookups (otbbuilder-dev@users.noreply.github.com)
+- Fix handling of ignore glyph set when merging fonts (otbbuilder-dev@users.noreply.github.com)
+- Bump @ot-builder/bin-composite-types to v1.6.3
+- Bump @ot-builder/bin-util to v1.6.3
+- Bump @ot-builder/errors to v1.6.3
+- Bump @ot-builder/ot-glyphs to v1.6.3
+- Bump @ot-builder/ot-layout to v1.6.3
+- Bump @ot-builder/ot-metadata to v1.6.3
+- Bump @ot-builder/prelude to v1.6.3
+- Bump @ot-builder/primitive to v1.6.3
+- Bump @ot-builder/var-store to v1.6.3
+- Bump @ot-builder/variance to v1.6.3
+- Bump @ot-builder/common-impl to v1.6.3
+- Bump @ot-builder/ot-sfnt to v1.6.3
+- Bump @ot-builder/io-bin-sfnt to v1.6.3
+- Bump @ot-builder/io-bin-glyph-store to v1.6.3
+- Bump @ot-builder/io-bin-metadata to v1.6.3
+- Bump @ot-builder/ot-encoding to v1.6.3
+- Bump @ot-builder/io-bin-encoding to v1.6.3
+- Bump @ot-builder/test-util 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/gsub-gpos-shared/decide-ignore-flags.d.ts

@@ -1,11 +1,11 @@
 import { Gdef } from "@ot-builder/ot-layout";
 import { Data } from "@ot-builder/prelude";
 export interface IgnoreFlagOptions {
-    ignoreBaseGlyphs: boolean;
-    ignoreLigatures: boolean;
-    ignoreMarks: boolean;
+    ignoreBaseGlyphs?: boolean;
+    ignoreLigatures?: boolean;
+    ignoreMarks?: boolean;
     markAttachmentType?: number;
     markFilteringSet?: number;
 }
-export declare function decideIgnoreFlags<G, X>(gs: Data.Maybe<ReadonlySet<G>>, fn: Data.Maybe<Gdef.General.TableT<G, X>>): null | IgnoreFlagOptions;
+export declare function decideIgnoreFlags<G, X>(gs: Data.Maybe<ReadonlySet<G>>, gdef: Data.Maybe<Gdef.General.TableT<G, X>>): null | IgnoreFlagOptions;
 //# sourceMappingURL=decide-ignore-flags.d.ts.map

package/lib/gsub-gpos-shared/decide-ignore-flags.js

@@ -2,121 +2,100 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decideIgnoreFlags = void 0;
 const ot_layout_1 = require("@ot-builder/ot-layout");
-function decideIgnoreFlags(gs, fn) {
-    if (!fn)
+function decideIgnoreFlags(gs, gdef) {
+    if (!gdef || !gs || !gs.size)
         return null;
-    return (igfEmpty(gs) ||
-        igfGlyphClass(gs, fn.glyphClassDef) ||
-        igcMarkAttachmentClass(gs, fn.markAttachClassDef) ||
-        igfMarkGlyphSet(gs, fn.markGlyphSets));
+    const [nonMarks, marks] = gsSplitMarks(gs, gdef.glyphClassDef);
+    const igfBase = igfGlyphClass(nonMarks, gdef.glyphClassDef, ot_layout_1.Gdef.GlyphClass.Base, { ignoreBaseGlyphs: true }, { ignoreBaseGlyphs: false });
+    const igfLigature = igfGlyphClass(nonMarks, gdef.glyphClassDef, ot_layout_1.Gdef.GlyphClass.Ligature, { ignoreLigatures: true }, { ignoreLigatures: false });
+    const igfMark = igfGlyphClass(marks, gdef.glyphClassDef, ot_layout_1.Gdef.GlyphClass.Mark, { ignoreMarks: true }, { ignoreMarks: false }) ||
+        igfMarkAttachmentClass(marks, gdef.glyphClassDef, gdef.markAttachClassDef) ||
+        igfMarkFilterSet(marks, gdef.glyphClassDef, gdef.markGlyphSets);
+    return {
+        ...igfBase,
+        ...igfLigature,
+        ...igfMark
+    };
 }
 exports.decideIgnoreFlags = decideIgnoreFlags;
-function igfEmpty(gs) {
-    if (!gs || !gs.size) {
-        return {
-            ignoreBaseGlyphs: false,
-            ignoreLigatures: false,
-            ignoreMarks: false
-        };
+/// Split non-mark and mark glyphs
+function gsSplitMarks(ignoredGlyphs, glyphClassDef) {
+    if (!glyphClassDef)
+        return [new Set(ignoredGlyphs), new Set()];
+    const marks = new Set(), nonMarks = new Set();
+    for (const g of ignoredGlyphs) {
+        if (ot_layout_1.Gdef.GlyphClass.Mark === glyphClassDef.get(g)) {
+            marks.add(g);
+        }
+        else {
+            nonMarks.add(g);
+        }
     }
-    return null;
+    return [nonMarks, marks];
 }
-class HasAllState {
-    constructor() {
-        this.has = false;
-        this.all = true;
+function igfGlyphClass(ignoredGlyphs, glyphClassDef, glyphClass, positive, negative) {
+    if (!glyphClassDef)
+        return null;
+    let has = false, all = true;
+    for (const [g, cl] of glyphClassDef) {
+        if (cl !== glyphClass)
+            continue;
+        if (ignoredGlyphs.has(g)) {
+            has = true;
+        }
+        else {
+            all = false;
+        }
     }
-    update(x) {
-        if (x)
-            this.has = true;
-        else
-            this.all = false;
+    if (!has) {
+        return negative;
     }
-    get mix() {
-        return this.has && !this.all;
+    else if (all) {
+        return positive;
     }
-}
-function igfGlyphClass(gs, cd) {
-    if (!gs || !gs.size || !cd)
+    else {
         return null;
-    const base = new HasAllState(), ligature = new HasAllState(), mark = new HasAllState();
-    const cov = new Set();
-    for (const [g, cl] of cd) {
-        const inSet = gs.has(g);
-        switch (cl) {
-            case ot_layout_1.Gdef.GlyphClass.Base:
-                base.update(inSet);
-                cov.add(g);
-                break;
-            case ot_layout_1.Gdef.GlyphClass.Ligature:
-                ligature.update(inSet);
-                cov.add(g);
-                break;
-            case ot_layout_1.Gdef.GlyphClass.Mark:
-                mark.update(inSet);
-                cov.add(g);
-        }
     }
-    if (base.mix || ligature.mix || mark.mix)
-        return null;
-    for (const g of gs)
-        if (!cov.has(g))
-            return null;
-    return {
-        ignoreBaseGlyphs: base.has,
-        ignoreLigatures: ligature.has,
-        ignoreMarks: mark.has
-    };
 }
-function igcMarkAttachmentClass(gs, maCd) {
-    if (!gs || !gs.size || !maCd)
+function igfMarkAttachmentClass(ignoredMarks, glyphClassDef, markAttachmentClassDef) {
+    if (!glyphClassDef || !markAttachmentClassDef)
         return null;
-    // Get an matching mark class
-    let kMark = undefined;
-    for (const g of gs) {
-        const kg = maCd.get(g);
-        if (kg === undefined)
+    // We need to iterate through all the marks, since in some cases we are ignoring mark class "0"
+    const keptMarkClasses = new Set();
+    const ignoredMarkClasses = new Set();
+    for (const [g, gc] of glyphClassDef) {
+        if (gc !== ot_layout_1.Gdef.GlyphClass.Mark)
+            continue;
+        const k = markAttachmentClassDef.get(g) || 0;
+        (ignoredMarks.has(g) ? ignoredMarkClasses : keptMarkClasses).add(k);
+    }
+    let finalMarkClass = undefined;
+    for (const k of keptMarkClasses) {
+        // Hybrid class, fail
+        if (ignoredMarkClasses.has(k))
             return null;
-        if (kMark === undefined)
-            kMark = kg;
-        else if (kg !== kMark)
+        // Multiple mark classes to keep, fail
+        if (finalMarkClass != undefined)
             return null;
+        finalMarkClass = k;
     }
-    // ensure the glyph set satisfying this mark class equal to GS
-    if (kMark === undefined)
+    // Nothing to keep, fail
+    if (!finalMarkClass || finalMarkClass <= 0 || finalMarkClass > 0xff)
         return null;
-    for (const [g, cl] of maCd) {
-        if (cl === kMark && !gs.has(g))
-            return null;
-    }
-    return {
-        ignoreBaseGlyphs: false,
-        ignoreLigatures: false,
-        ignoreMarks: false,
-        markAttachmentType: kMark
-    };
-}
-function setEqual(a, b) {
-    for (const g of a)
-        if (!b.has(g))
-            return false;
-    for (const g of b)
-        if (!a.has(g))
-            return false;
-    return true;
+    return { markAttachmentType: finalMarkClass };
 }
-function igfMarkGlyphSet(gs, mgs) {
-    if (!mgs || !gs || !gs.size)
+function igfMarkFilterSet(ignoredMarks, glyphClassDef, markGlyphSets) {
+    if (!glyphClassDef || !markGlyphSets)
         return null;
-    for (let mgsIndex = 0; mgsIndex < mgs.length; mgsIndex++) {
-        if (setEqual(gs, mgs[mgsIndex])) {
-            return {
-                ignoreBaseGlyphs: false,
-                ignoreLigatures: false,
-                ignoreMarks: false,
-                markFilteringSet: mgsIndex
-            };
+    out: for (let mgsIndex = 0; mgsIndex < markGlyphSets.length; mgsIndex++) {
+        const mgs = markGlyphSets[mgsIndex];
+        for (const [g, gc] of glyphClassDef) {
+            if (gc !== ot_layout_1.Gdef.GlyphClass.Mark)
+                continue;
+            if (ignoredMarks.has(g) !== !mgs.has(g))
+                continue out;
         }
+        return { markFilteringSet: mgsIndex };
     }
     return null;
 }

package/lib/gsub-gpos-shared/read-lookup-list.js

@@ -39,23 +39,32 @@ class CReadLookupList {
         }
     }
     applyGdefMarkAttachDefIgnores(ignores, flags, gdef) {
-        if (gdef.markAttachClassDef && flags & general_1.LookupFlag.MarkAttachmentType) {
+        if (gdef.glyphClassDef &&
+            gdef.markAttachClassDef &&
+            flags & general_1.LookupFlag.MarkAttachmentType) {
             const maCls = (flags & general_1.LookupFlag.MarkAttachmentType) >>> 8;
-            for (const [g, cls] of gdef.markAttachClassDef) {
-                if (cls === maCls)
+            for (const [g, cls] of gdef.glyphClassDef) {
+                if (cls !== ot_layout_1.Gdef.GlyphClass.Mark)
+                    continue;
+                const k = gdef.markAttachClassDef.get(g) || 0;
+                if (k !== maCls)
                     ignores.add(g);
             }
         }
     }
     applyGdefMarkGlyphSetIgnores(ignores, flags, markFilteringSet, gdef) {
-        if (gdef.markGlyphSets &&
+        if (gdef.glyphClassDef &&
+            gdef.markGlyphSets &&
             flags & general_1.LookupFlag.UseMarkFilteringSet &&
             markFilteringSet != null) {
             const mgs = gdef.markGlyphSets[markFilteringSet];
-            if (mgs) {
-                for (const g of mgs) {
+            if (!mgs)
+                return;
+            for (const [g, cls] of gdef.glyphClassDef) {
+                if (cls !== ot_layout_1.Gdef.GlyphClass.Mark)
+                    continue;
+                if (!mgs.has(g))
                     ignores.add(g);
-                }
             }
         }
     }

package/lib/gsub-gpos-shared/write-lookup-list.js

@@ -95,10 +95,10 @@ class LookupListWriter {
         if (ignore) {
             if (ignore.ignoreBaseGlyphs)
                 flags |= general_1.LookupFlag.IgnoreBaseGlyphs;
-            if (ignore.ignoreMarks)
-                flags |= general_1.LookupFlag.IgnoreMarks;
             if (ignore.ignoreLigatures)
                 flags |= general_1.LookupFlag.IgnoreLigatures;
+            if (ignore.ignoreMarks)
+                flags |= general_1.LookupFlag.IgnoreMarks;
             if (ignore.markAttachmentType != null) {
                 flags |= ignore.markAttachmentType << 8;
             }

package/lib/lookups/gpos-mark-write.d.ts

@@ -40,6 +40,7 @@ declare abstract class GposMarkWriterBase<G, B> {
     private getInitialPlans;
     private getMaxAnchorClass;
     private fetchValidPlan;
+    private basesHasAtLeastOneBaseInThisClass;
 }
 export declare class GposMarkToBaseWriter extends GposMarkWriterBase<OtGlyph, Gpos.BaseRecord> implements LookupWriter<Gpos.Lookup, Gpos.MarkToBase> {
     canBeUsed(l: Gpos.Lookup): l is Gpos.MarkToBase;

package/lib/lookups/gpos-mark-write.js

@@ -274,7 +274,13 @@ class GposMarkWriterBase {
         loopCls: for (let c = 0; c < maxCls; c++) {
             if (clsSetAdded.has(c))
                 continue;
-            let conflict = false;
+            // Detect that we have at least one base that contains this class
+            // If not, just treat this class processed and move on
+            if (!this.basesHasAtLeastOneBaseInThisClass(cls, c, bases)) {
+                clsSetAdded.add(c);
+                continue;
+            }
+            let fConflict = false;
             const currentClassMarks = new Map();
             // Process mark list: ensure this class doesn't conflict with existing marks
             for (const [g, ma] of marks) {
@@ -283,9 +289,9 @@ class GposMarkWriterBase {
                     continue;
                 currentClassMarks.set(g, { glyph: g, class: c, anchor });
                 if (planMarks.has(g))
-                    conflict = true;
+                    fConflict = true;
             }
-            if (conflict)
+            if (fConflict)
                 break loopCls;
             // Ensure the base array is a rectangular matrix
             if (firstClass) {
@@ -313,6 +319,14 @@ class GposMarkWriterBase {
             return null;
         }
     }
+    basesHasAtLeastOneBaseInThisClass(cls, c, bases) {
+        for (const [g, br] of bases) {
+            if (cls.baseCoversMarkClass(c, br)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
 class GposMarkToBaseWriter extends GposMarkWriterBase {
     canBeUsed(l) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ot-builder/io-bin-layout",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,27 +23,27 @@
     "access": "public"
   },
   "dependencies": {
-    "@ot-builder/bin-composite-types": "1.6.2",
-    "@ot-builder/bin-util": "1.6.2",
-    "@ot-builder/errors": "1.6.2",
-    "@ot-builder/ot-glyphs": "1.6.2",
-    "@ot-builder/ot-layout": "1.6.2",
-    "@ot-builder/ot-metadata": "1.6.2",
-    "@ot-builder/prelude": "1.6.2",
-    "@ot-builder/primitive": "1.6.2",
-    "@ot-builder/var-store": "1.6.2",
-    "@ot-builder/variance": "1.6.2",
-    "@ot-builder/common-impl": "1.6.2",
-    "@ot-builder/ot-sfnt": "1.6.2",
-    "@ot-builder/io-bin-sfnt": "1.6.2",
+    "@ot-builder/bin-composite-types": "1.6.3",
+    "@ot-builder/bin-util": "1.6.3",
+    "@ot-builder/errors": "1.6.3",
+    "@ot-builder/ot-glyphs": "1.6.3",
+    "@ot-builder/ot-layout": "1.6.3",
+    "@ot-builder/ot-metadata": "1.6.3",
+    "@ot-builder/prelude": "1.6.3",
+    "@ot-builder/primitive": "1.6.3",
+    "@ot-builder/var-store": "1.6.3",
+    "@ot-builder/variance": "1.6.3",
+    "@ot-builder/common-impl": "1.6.3",
+    "@ot-builder/ot-sfnt": "1.6.3",
+    "@ot-builder/io-bin-sfnt": "1.6.3",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@ot-builder/io-bin-glyph-store": "1.6.2",
-    "@ot-builder/io-bin-metadata": "1.6.2",
-    "@ot-builder/ot-encoding": "1.6.2",
-    "@ot-builder/io-bin-encoding": "1.6.2",
-    "@ot-builder/test-util": "1.6.2",
+    "@ot-builder/io-bin-glyph-store": "1.6.3",
+    "@ot-builder/io-bin-metadata": "1.6.3",
+    "@ot-builder/ot-encoding": "1.6.3",
+    "@ot-builder/io-bin-encoding": "1.6.3",
+    "@ot-builder/test-util": "1.6.3",
     "@types/jest": "^26.0.23",
     "jest": "^29.3.1"
   }