[glyphs2fontir] Don’t panic for unknown language label

Warn and skip instead.
googlefonts · Oct 9, 2024 · 202ad73 · 202ad73
1 parent e5bb5c5
commit 202ad73
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/glyphs-reader/src/font.rs b/glyphs-reader/src/font.rs
@@ -1969,16 +1969,18 @@ impl RawFeature {
         let labels = self
             .labels
             .iter()
-            .map(|label| {
-                let language_id = GLYPHS_TO_OPENTYPE_LANGUAGE_ID
+            .filter_map(|label| {
+                GLYPHS_TO_OPENTYPE_LANGUAGE_ID
                     .iter()
                     .find(|entry| entry.0 == label.language)
-                    .map(|entry| entry.1)
-                    .unwrap_or_else(|| {
-                        panic!("Unknown feature label language: {}", label.language);
-                    });
-                let name = label.value.replace("\\", "\\005c").replace("\"", "\\0022");
-                format!("  name 3 1 0x{:04X} \"{}\";", language_id, name)
+                    .map(|entry| {
+                        let name = label.value.replace("\\", "\\005c").replace("\"", "\\0022");
+                        format!("  name 3 1 0x{:04X} \"{}\";", entry.1, name)
+                    })
+                    .or_else(|| {
+                        warn!("Unknown feature label language: {}", label.language);
+                        None
+                    })
             })
             .collect::<Vec<_>>()
             .join("\n");

diff --git a/resources/testdata/glyphs3/Fea_Labels.glyphs b/resources/testdata/glyphs3/Fea_Labels.glyphs
@@ -20,6 +20,10 @@ value = "Test 1";
 {
 language = ARA;
 value = "اختبار ١";
+},
+{
+language = SKIPME;
+value = "Skip me";
 }
 );
 tag = ss01;