fix: use indexmap to keep order of fvar data

Cargo.toml

@@ -46,6 +46,7 @@ unicode-script = { version = "0.5.4", optional = true }
 woff2-patched = { version = "0.3.0", optional = true }
 png = { version = "0.17.13", optional = true }
 inflections = "1.1.1"
+indexmap = "2.6.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wit-bindgen-rt = { version = "0.24.0", optional = true }

src/font.rs

@@ -1,10 +1,10 @@
 use arc_swap::ArcSwap;
 #[cfg(feature = "parse")]
 use byteorder::{BigEndian, ReadBytesExt};
+#[cfg(feature = "parse")]
+use indexmap::IndexMap;
 use ordered_float::OrderedFloat;
 use ouroboros::self_referencing;
-#[cfg(feature = "parse")]
-use std::collections::HashMap;
 use std::fmt;
 use std::hash::Hash;
 #[cfg(feature = "parse")]
@@ -114,16 +114,6 @@ pub(super) struct FvarInstance {
     pub(super) postscript: Name,
 }
 
-#[derive(Clone)]
-enum Variant {
-    Index(u32),
-    Instance {
-        coords: Vec<Fixed>,
-        names: Vec<FvarInstance>,
-        axes: Vec<VariationAxis>,
-    },
-}
-
 /// Returns whether a buffer is WOFF font data.
 pub fn is_woff(buf: &[u8]) -> bool {
     buf.len() > 4 && buf[0] == 0x77 && buf[1] == 0x4F && buf[2] == 0x46 && buf[3] == 0x46
@@ -154,6 +144,7 @@ pub fn is_otf(buf: &[u8]) -> bool {
         && buf[4] == 0x00
 }
 
+#[derive(Debug)]
 pub(crate) struct VariationData {
     pub key: FontKey,
     pub names: Vec<Name>,
@@ -177,7 +168,7 @@ impl VariationData {
             .collect::<Vec<_>>();
 
         // get fvar if any
-        let mut instances: HashMap<Vec<OrderedFloat<f32>>, Vec<FvarInstance>> = HashMap::new();
+        let mut instances: IndexMap<Vec<OrderedFloat<f32>>, Vec<FvarInstance>> = IndexMap::new();
         if let (Some(_), Some(name_table)) = (face.tables().fvar, face.tables().name) {
             // currently ttf-parser is missing `fvar`'s instance records, we parse them
             // directly from `RawFace`
@@ -339,7 +330,6 @@ impl VariationData {
             if let Some(value) = weight_axis_index.and_then(|i| coords.get(i)) {
                 key.weight = Some(value.0 as u16);
             }
-            key.family = variation_names[0].postscript.name.clone();
             for (coord, axis) in coords.iter().zip(axes.iter()) {
                 key.variations
                     .push((String::from_utf8(axis.tag.to_bytes().to_vec())?, coord.0));
@@ -488,8 +478,12 @@ impl Font {
         let filters = Filter::from_key(key);
         let mut queue = self.variants.iter().collect::<Vec<_>>();
         for filter in filters {
-            queue.retain(|v| v.fulfils(&filter));
-            if queue.len() == 1 {
+            let mut q = queue.clone();
+            q.retain(|v| v.fulfils(&filter));
+            if q.len() == 1 {
+                queue = q;
+                break;
+            } else if q.is_empty() {
                 break;
             }
         }

src/lib.rs

@@ -163,6 +163,19 @@ impl FontKit {
         }
         None
     }
+
+    pub fn keys(&self) -> Vec<FontKey> {
+        self.fonts
+            .iter()
+            .flat_map(|i| {
+                i.value()
+                    .variants()
+                    .iter()
+                    .map(|i| i.key.clone())
+                    .collect::<Vec<_>>()
+            })
+            .collect()
+    }
 }
 
 #[cfg(feature = "parse")]
@@ -206,7 +219,7 @@ fn load_font_from_path(path: impl AsRef<std::path::Path>) -> Option<Font> {
                 }
             };
             font.set_path(path.to_path_buf());
-            // println!("{:?}", font.names);
+            // println!("{:?}", font.variants());
             font.unload();
             Some(font)
         }

src/metrics.rs

@@ -253,7 +253,7 @@ impl TextMetrics {
         }
     }
 
-    pub(crate) fn has_missing(&self) -> bool {
+    pub fn has_missing(&self) -> bool {
         self.positions
             .read()
             .map(|p| p.iter().any(|c| c.metrics.missing))

tests/basic.rs

@@ -101,6 +101,6 @@ pub fn test_complex_text_wrap() -> Result<(), Error> {
     });
     area.unwrap_text();
     area.wrap_text(64.4)?;
-    assert_eq!(area.value_string(), "商家\n热卖\n1234\n567\n8");
+    assert_eq!(area.value_string(), "商家\n热卖\n123\n456\n78");
     Ok(())
 }