Merge pull request #819 from googlefonts/interpol-error-detect

Improve which sources are marked as "incompatible"
googlefonts · Sep 18, 2023 · ed429c7 · ed429c7
2 parents 3237167 + b3a96d9
commit ed429c7
Showing 1 changed file with 57 additions and 12 deletions.
diff --git a/src/fontra/client/core/glyph-controller.js b/src/fontra/client/core/glyph-controller.js
@@ -218,19 +218,37 @@ export class VariableGlyphController {
         );
       }
       const defaultSourceIndex = this.model?.reverseMapping[0] || 0;
-      const defaultSourceGlyph =
-        layerGlyphs[this.sources[defaultSourceIndex].layerName];
-      this._sourceInterpolationStatus = this.sources.map((source) => {
-        const sourceGlyph = layerGlyphs[source.layerName];
-        if (sourceGlyph !== defaultSourceGlyph) {
-          try {
-            const _ = addItemwise(defaultSourceGlyph, sourceGlyph);
-          } catch (error) {
-            return { error: error.message };
-          }
+      const defaultSourceLayerName = this.sources[defaultSourceIndex].layerName;
+
+      let layerNames = Object.keys(layerGlyphs);
+      layerNames = [
+        defaultSourceLayerName,
+        ...layerNames.filter((name) => name !== defaultSourceLayerName),
+      ].slice(0, Math.ceil(layerNames.length / 2));
+
+      const errors = {};
+      let referenceLayerName;
+      for (referenceLayerName of layerNames) {
+        errors[referenceLayerName] = checkInterpolationCompatibility(
+          referenceLayerName,
+          layerGlyphs,
+          errors
+        );
+        if (Object.keys(errors[referenceLayerName]).length <= this.sources.length / 2) {
+          // good enough
+          break;
         }
-        return {};
-      });
+      }
+      if (referenceLayerName) {
+        this._sourceInterpolationStatus = this.sources.map((source) => {
+          const error = errors[referenceLayerName][source.layerName];
+          return error ? { error } : {};
+        });
+      } else {
+        this._sourceInterpolationStatus = this.sources.map((source) => {
+          return {};
+        });
+      }
     }
     return this._sourceInterpolationStatus;
   }
@@ -965,3 +983,30 @@ function stripComponentLocations(glyph) {
     true // noCopy
   );
 }
+
+function checkInterpolationCompatibility(
+  referenceLayerName,
+  layerGlyphs,
+  previousErrors
+) {
+  const referenceGlyph = layerGlyphs[referenceLayerName];
+  const errors = {};
+  for (const [layerName, glyph] of Object.entries(layerGlyphs)) {
+    if (layerName === referenceLayerName) {
+      continue;
+    }
+    if (layerName in previousErrors) {
+      const error = previousErrors[layerName][referenceLayerName];
+      if (error) {
+        errors[layerName] = error;
+      }
+    } else {
+      try {
+        const _ = addItemwise(referenceGlyph, glyph);
+      } catch (error) {
+        errors[layerName] = error.message;
+      }
+    }
+  }
+  return errors;
+}