fix: 修复国标宋体效果

Cargo.toml

@@ -14,7 +14,7 @@ harfbuzz_rs_now = "2.2.6"
 lang-unicodes = { version = "0.1.0", path = "crates/lang_unicodes" }
 log = "0.4.22"
 md5 = "0.7.0"
-opentype = "0.38.0"
+opentype = "0.38.1"
 prost = "0.13.3"
 cn-font-proto = { version = "0.1.1", path = "crates/proto" }
 rayon = "1.10.0"

src/pre_subset/features/gsub.rs

@@ -1,3 +1,4 @@
+use log::error;
 use opentype::layout::{context, ChainedContext, Coverage};
 use opentype::tables::glyph_substitution::Type;
 use opentype::tables::GlyphSubstitution;
@@ -7,8 +8,15 @@ pub fn analyze_gsub(
     font: &Font,
     font_file: &mut Cursor<&Vec<u8>>,
 ) -> Vec<Vec<u16>> {
+    let temp: Result<Option<GlyphSubstitution>, std::io::Error> =
+    font.take(font_file);
+    // 国标宋体，解析就报错，所以干脆先不解析
+    if temp.is_err() {
+        error!("{}", temp.unwrap_err());
+        return vec![vec![]];
+    }
     // GSUB
-    let data: GlyphSubstitution = font.take(font_file).unwrap().unwrap();
+    let data: GlyphSubstitution = temp.unwrap().unwrap();
 
     // let mut feature_tags: Vec<&str> = data
     //     .features
@@ -237,9 +245,10 @@ pub fn analyze_gsub(
 #[test]
 fn test_gsub() {
     use cn_font_utils::read_binary_file;
-    let font_file =
-        read_binary_file("./packages/demo/public/WorkSans-VariableFont_wght.ttf")
-            .unwrap();
+    let font_file = read_binary_file(
+        "./packages/demo/public/WorkSans-VariableFont_wght.ttf",
+    )
+    .unwrap();
     let mut font_file = Cursor::new(&font_file);
     let font = Font::read(&mut font_file).unwrap();
     let result = analyze_gsub(&font, &mut font_file);

src/run_subset.rs

@@ -105,6 +105,7 @@ pub fn run_subset(ctx: &mut Context) {
         warn!(
             "subsets result diff: {}",
             diff.iter()
+                .filter(|x| **x != 0)
                 .map(|x| x.to_string())
                 .collect::<Vec<String>>()
                 .join(" ")