Steps towards background layers

scripts/rebuild_languages.py

@@ -61,11 +61,12 @@ def main():
     )
     parser.add_argument(
         "--include-wip",
-        action="store_true",
-        help="Include work-in-progress strings, as marked with 'WIP' in the the first column.",
+        help="Include work-in-progress strings that contain this argument "
+        "*and* the string 'WIP' in the the first column. The special string 'all' "
+        "matches all 'WIP' strings.",
     )
     args = parser.parse_args()
-    includeWorkInProgress = args.include_wip
+    includeWorkInProgressTag = args.include_wip
     languageSpreadsheetURL = (
         "https://docs.google.com/"
         "spreadsheets/d/1woTU8dZCHJh7yvdk-N1kgQBUj4Sn3SdRsbKgn6ltJQs/"
@@ -108,8 +109,14 @@ def main():
         languageStrings[languageCode] = strings = {}
 
         for row in rows:
-            if "WIP" in row[0] and not includeWorkInProgress:
-                # Skip rows marked as work in progress
+            includeRow = "WIP" not in row[0] or (
+                includeWorkInProgressTag
+                and (
+                    includeWorkInProgressTag == "all"
+                    or includeWorkInProgressTag in row[0]
+                )
+            )
+            if not includeRow:
                 continue
 
             key = row[1]

src/fontra/client/core/font-controller.js

@@ -500,7 +500,7 @@ export class FontController {
       return;
     }
     const getGlyphFunc = this.getGlyph.bind(this);
-    return varGlyph.getLayerGlyphController(layerName, sourceIndex, getGlyphFunc);
+    return await varGlyph.getLayerGlyphController(layerName, sourceIndex, getGlyphFunc);
   }
 
   requestGlyphInstance(glyphName, sourceLocation) {
@@ -562,11 +562,6 @@ export class FontController {
     return new StaticGlyphController(glyphName, dummyGlyph, undefined);
   }
 
-  async getSourceIndex(glyphName, sourceLocation) {
-    const glyph = await this.getGlyph(glyphName);
-    return glyph?.getSourceIndex(sourceLocation);
-  }
-
   addGlyphChangeListener(glyphName, listener) {
     if (!this._glyphChangeListeners[glyphName]) {
       this._glyphChangeListeners[glyphName] = [];

src/fontra/client/core/glyph-controller.js

@@ -39,6 +39,7 @@ import { addItemwise } from "./var-funcs.js";
 import { StaticGlyph } from "./var-glyph.js";
 import {
   locationToString,
+  makeSparseLocation,
   makeSparseNormalizedLocation,
   mapAxesFromUserSpaceToSourceSpace,
   normalizeLocation,
@@ -52,6 +53,9 @@ export class VariableGlyphController {
     this._fontSources = fontSources;
     this._locationToSourceIndex = {};
     this._layerGlyphControllers = {};
+    this._layerNameToSourceIndex = {};
+    this._sourceIndexToSourceLayerNames = new Map();
+    this._locationStringToSourceIndex = null;
   }
 
   get name() {
@@ -157,14 +161,6 @@ export class VariableGlyphController {
     return undefined;
   }
 
-  getSourceIndexFromName(sourceName) {
-    for (const [sourceIndex, source] of enumerate(this.sources)) {
-      if (source.name === sourceName) {
-        return sourceIndex;
-      }
-    }
-  }
-
   getAllComponentNames() {
     // Return a set of all component names used by all layers of all sources
     const componentNames = new Set();
@@ -196,6 +192,9 @@ export class VariableGlyphController {
     delete this._fontAxesSourceSpace;
     this._locationToSourceIndex = {};
     this._layerGlyphControllers = {};
+    this._layerNameToSourceIndex = {};
+    this._sourceIndexToSourceLayerNames = new Map();
+    this._locationStringToSourceIndex = null;
   }
 
   get model() {
@@ -451,15 +450,18 @@ export class VariableGlyphController {
     return instanceController;
   }
 
-  getSourceLocationFromSourceIndex(sourceIndex) {
+  getDenseSourceLocationForSourceIndex(sourceIndex) {
+    return this.getDenseSourceLocationForSource(this.sources[sourceIndex]);
+  }
+
+  getDenseSourceLocationForSource(source) {
     const fontDefaultLocation = makeDefaultLocation(this.fontAxesSourceSpace);
     const glyphDefaultLocation = makeDefaultLocation(this.axes);
-    const defaultLocation = { ...fontDefaultLocation, ...glyphDefaultLocation };
-    const sourceLocation = this.getSourceLocation(this.sources[sourceIndex]);
-    return { ...defaultLocation, ...sourceLocation };
+    const sourceLocation = this.getSourceLocation(source);
+    return { ...fontDefaultLocation, ...glyphDefaultLocation, ...sourceLocation };
   }
 
-  findNearestSourceFromSourceLocation(sourceLocation, skipInactive = false) {
+  findNearestSourceForSourceLocation(sourceLocation, skipInactive = false) {
     sourceLocation = this.expandNLIAxes(sourceLocation);
 
     // Ensure locations are *not* sparse
@@ -483,6 +485,75 @@ export class VariableGlyphController {
     return sourceIndexMapping[nearestIndex];
   }
 
+  getSourceIndexForLayerName(layerName) {
+    let sourceIndex = this._layerNameToSourceIndex[layerName];
+    if (sourceIndex === undefined) {
+      for (const i of range(this.sources.length)) {
+        const names = this.getSourceLayerNamesForSourceIndex(i);
+        const layerNames = names.map((layer) => layer.fullName);
+        if (layerNames.includes(layerName)) {
+          sourceIndex = i;
+          break;
+        }
+      }
+    }
+    return sourceIndex;
+  }
+
+  getSourceLayerNamesForSourceIndex(sourceIndex) {
+    let sourceLayerNames = this._sourceIndexToSourceLayerNames.get(sourceIndex);
+
+    if (!sourceLayerNames) {
+      const source = this.sources[sourceIndex];
+      this._layerNameToSourceIndex[source.layerName] = sourceIndex;
+
+      const layerNamePrefix = source.layerName + ".";
+      const layerNames = Object.keys(this.glyph.layers).filter(
+        (layerName) =>
+          layerName.startsWith(layerNamePrefix) &&
+          layerName.length > layerNamePrefix.length
+      );
+      layerNames.forEach((layerName) => {
+        this._layerNameToSourceIndex[layerName] = sourceIndex;
+      });
+      sourceLayerNames = [{ fullName: source.layerName, shortName: null }];
+      sourceLayerNames.push(
+        ...layerNames.map((layerName) => ({
+          fullName: layerName,
+          shortName: layerName.slice(layerNamePrefix.length),
+        }))
+      );
+      this._sourceIndexToSourceLayerNames.set(sourceIndex, sourceLayerNames);
+    }
+
+    return sourceLayerNames;
+  }
+
+  getSourceIndexForSourceLocationString(sourceLocationString) {
+    if (!this._locationStringToSourceIndex) {
+      this._buildLocationStringToSourceIndexMapping();
+    }
+    return this._locationStringToSourceIndex[sourceLocationString];
+  }
+
+  _buildLocationStringToSourceIndexMapping() {
+    this._locationStringToSourceIndex = {};
+    for (const [sourceIndex, source] of enumerate(this.sources)) {
+      this._locationStringToSourceIndex[this.getSparseLocationStringForSource(source)] =
+        sourceIndex;
+    }
+  }
+
+  getSparseLocationStringForSource(source) {
+    return this.getSparseLocationStringForSourceLocation(
+      this.getSourceLocation(source)
+    );
+  }
+
+  getSparseLocationStringForSourceLocation(sourceLocation) {
+    return locationToString(makeSparseLocation(sourceLocation, this.combinedAxes));
+  }
+
   expandNLIAxes(sourceLocation) {
     return mapLocationExpandNLI(sourceLocation, this.axes);
   }

src/fontra/client/lang/de.js

@@ -231,10 +231,13 @@ export const strings = {
     "Entferne ausgewählten Glyphen von der Zeichenfläche",
   "menubar.view.replace-selected-glyph-on-canvas":
     "Ersetze ausgewählten Glyphen auf der Zeichenfläche",
+  "menubar.view.select-glyph-source-layer": "Select glyph/source/layer",
   "menubar.view.select-next-glyph": "Nächster Glyph",
   "menubar.view.select-next-source": "Nächste Source",
+  "menubar.view.select-next-source-layer": "Select next source layer",
   "menubar.view.select-previous-glyph": "Vorheriger Glyph",
   "menubar.view.select-previous-source": "Vorherige Source",
+  "menubar.view.select-previous-source-layer": "Select previous source layer",
   "message.cancel-editing": "Jemand anderes hat vor dir etwas geändert.",
   "message.edit-has-been-reverted": "Die Änderung wurde rückgängig gemacht.",
   "message.glyph-could-not-be-saved": "Glyph konnte nicht gespeichert werden.",

src/fontra/client/lang/en.js

@@ -226,10 +226,13 @@ export const strings = {
   "menubar.view.find-glyphs-that-use": "Find glyphs that use '%0'",
   "menubar.view.remove-selected-glyph-from-canvas": "Remove selected glyph from canvas",
   "menubar.view.replace-selected-glyph-on-canvas": "Replace selected glyph on canvas",
+  "menubar.view.select-glyph-source-layer": "Select glyph/source/layer",
   "menubar.view.select-next-glyph": "Select next glyph",
   "menubar.view.select-next-source": "Select next source",
+  "menubar.view.select-next-source-layer": "Select next source layer",
   "menubar.view.select-previous-glyph": "Select previous glyph",
   "menubar.view.select-previous-source": "Select previous source",
+  "menubar.view.select-previous-source-layer": "Select previous source layer",
   "message.cancel-editing": "Someone else made an edit just before you.",
   "message.edit-has-been-reverted": "The edit has been reverted.",
   "message.glyph-could-not-be-saved": "The glyph could not be saved.",

src/fontra/client/lang/fr.js

@@ -231,10 +231,13 @@ export const strings = {
     "Retirer le glyphe sélectionné du canvas",
   "menubar.view.replace-selected-glyph-on-canvas":
     "Remplacer le glyphe sélectionné du canvas",
+  "menubar.view.select-glyph-source-layer": "Select glyph/source/layer",
   "menubar.view.select-next-glyph": "Sélectionner le prochain glyphe",
   "menubar.view.select-next-source": "Sélectionner la source suivante ",
+  "menubar.view.select-next-source-layer": "Select next source layer",
   "menubar.view.select-previous-glyph": "Sélectionner le glyphe précédente",
   "menubar.view.select-previous-source": "Sélectionner la source précédente",
+  "menubar.view.select-previous-source-layer": "Select previous source layer",
   "message.cancel-editing": "Quelqu'un d'autre a édité juste avant vous",
   "message.edit-has-been-reverted": "L'édition a été annulé",
   "message.glyph-could-not-be-saved": "Le glyphe n'a pas pu être enregistré",

src/fontra/client/lang/ja.js

@@ -229,10 +229,13 @@ export const strings = {
   "menubar.view.remove-selected-glyph-from-canvas": "エディターから選択グリフを削除",
   "menubar.view.replace-selected-glyph-on-canvas":
     "選択中のグリフを別のグリフに切り替え",
+  "menubar.view.select-glyph-source-layer": "グリフ/ソース/レイヤーを選択",
   "menubar.view.select-next-glyph": "次のグリフを選択",
   "menubar.view.select-next-source": "次のソースを選択",
+  "menubar.view.select-next-source-layer": "次のソースレイヤーを選択",
   "menubar.view.select-previous-glyph": "前のグリフを選択",
   "menubar.view.select-previous-source": "前のソースを選択",
+  "menubar.view.select-previous-source-layer": "前のソースレイヤーを選択",
   "message.cancel-editing": "他のユーザーがあなたの直前に操作を行いました。",
   "message.edit-has-been-reverted": "このグリフは前の状態に戻されました。",
   "message.glyph-could-not-be-saved": "このグリフは保存されません。",

src/fontra/client/lang/nl.js

@@ -230,10 +230,13 @@ export const strings = {
     "Verwijder de geselecteerde glyph van het canvas",
   "menubar.view.replace-selected-glyph-on-canvas":
     "Vervang de geselecteerde glyph op het canvas",
+  "menubar.view.select-glyph-source-layer": "Select glyph/source/layer",
   "menubar.view.select-next-glyph": "Select next glyph",
   "menubar.view.select-next-source": "Selecteer de volgende source",
+  "menubar.view.select-next-source-layer": "Select next source layer",
   "menubar.view.select-previous-glyph": "Select previous glyph",
   "menubar.view.select-previous-source": "Selecteer de vorige source",
+  "menubar.view.select-previous-source-layer": "Select previous source layer",
   "message.cancel-editing": "Someone else made an edit just before you.",
   "message.edit-has-been-reverted": "The edit has been reverted.",
   "message.glyph-could-not-be-saved": "The glyph could not be saved.",

src/fontra/client/lang/zh-CN.js

@@ -217,10 +217,13 @@ export const strings = {
   "menubar.view.find-glyphs-that-use": "寻找使用了 '%0' 的字形",
   "menubar.view.remove-selected-glyph-from-canvas": "将选中字形从编辑区域中删除",
   "menubar.view.replace-selected-glyph-on-canvas": "在编辑区域中替换选中字形",
+  "menubar.view.select-glyph-source-layer": "选择字形/源/图层",
   "menubar.view.select-next-glyph": "选择下一个字形",
   "menubar.view.select-next-source": "选择下一个源",
+  "menubar.view.select-next-source-layer": "选择下一个源图层",
   "menubar.view.select-previous-glyph": "选择上一个字形",
   "menubar.view.select-previous-source": "选择上一个源",
+  "menubar.view.select-previous-source-layer": "选择上一个源图层",
   "message.cancel-editing": "有人在你之前做了编辑。",
   "message.edit-has-been-reverted": "编辑将被复原。",
   "message.glyph-could-not-be-saved": "该字形无法被保存。",

src/fontra/views/editor/edit-behavior.js

@@ -577,7 +577,11 @@ function unpackContours(path, selectedPointIndices) {
   // when no points from this contour are selected, or an object with contour info,
   const contours = new Array(path.contourInfo.length);
   let contourIndex = 0;
+  const numPoints = path.numPoints;
   for (const pointIndex of selectedPointIndices) {
+    if (pointIndex >= numPoints) {
+      break;
+    }
     while (path.contourInfo[contourIndex].endPoint < pointIndex) {
       contourIndex++;
     }