Expose and fix name processing discrepency

googlefonts · Oct 8, 2024 · 9eb9ab9 · 9eb9ab9
1 parent ab711bf
commit 9eb9ab9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/glyphs-reader/src/font.rs b/glyphs-reader/src/font.rs
@@ -2133,14 +2133,16 @@ impl TryFrom<RawFont> for Font {
 
         let mut names = BTreeMap::new();
         for name in from.properties {
-            // TODO: we only support dflt, .glyphs l10n names are ignored
+            // We don't support full l10n of names, just the limited capability of glyphsLib
+            // See <https://github.com/googlefonts/fontc/issues/1011>
             name.value
                 .or_else(|| {
                     name.values
                         .iter()
                         .find(|v| v.language == "dflt")
                         .map(|v| v.value.clone())
                 })
+                .or_else(|| name.values.first().map(|v| v.value.clone()))
                 .and_then(|value| names.insert(name.key, value));
         }
         names.insert("familyNames".into(), from.family_name);

diff --git a/resources/testdata/glyphs3/TheBestNames.glyphs b/resources/testdata/glyphs3/TheBestNames.glyphs
@@ -294,6 +294,10 @@ value = "A trade in marks";
 key = manufacturers;
 values = (
 {
+language = ENG;
+value = "Who made you?!";
+},
+{
 language = dflt;
 value = "Who made you?!";
 }
@@ -307,8 +311,12 @@ value = "https://example.com/manufacturer";
 key = designers;
 values = (
 {
-language = dflt;
+language = IT_CAN_BE_ANYTHING;
 value = "Designed by me!";
+},
+{
+language = NOT_THIS_ONE;
+value = "Designed by ... you?!";
 }
 );
 },