Respect ignore-invalid-name-records in writing as well

Author: IvanUkhov

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "truetype"
-version = "0.48.1"
+version = "0.48.2"
 edition = "2021"
 license = "Apache-2.0/MIT"
 authors = [

src/tables/names/mod.rs

@@ -160,25 +160,34 @@ impl Names {
         let mut data = vec![];
         let records = records
             .into_iter()
-            .map(
+            .filter_map(
                 |((platform_id, encoding_id, language_id, name_id), value)| {
                     let offset = data.len();
-                    encode(
+                    let result = encode(
                         platform_id,
                         encoding_id,
                         language_id,
                         value.as_ref(),
                         &mut data,
                         context,
-                    )?;
-                    Ok(Record {
+                    );
+                    if cfg!(feature = "ignore-invalid-name-records") {
+                        if let Err(_) = result {
+                            return None;
+                        }
+                    } else {
+                        if let Err(error) = result {
+                            return Some(Err(error));
+                        }
+                    }
+                    Some(Ok(Record {
                         platform_id,
                         encoding_id,
                         language_id,
                         name_id,
                         size: (data.len() - offset) as _,
                         offset: offset as _,
-                    })
+                    }))
                 },
             )
             .collect::<Result<Vec<_>>>()?;

tests/fixtures/AoboshiOne-Regular.ttf

@@ -1,12 +1,46 @@
 #[macro_use]
 mod support;
 
+mod aoboshi_one {
+    use std::fs::File;
+    use std::io::Cursor;
+
+    use truetype::tables::names::Names;
+    use truetype::tape::Read as TapeRead;
+    use truetype::tape::Write;
+    use truetype::value::Read as ValueRead;
+
+    #[test]
+    #[cfg_attr(not(feature = "ignore-invalid-name-records"), should_panic)]
+    fn write() {
+        let path = crate::support::Fixture::AoboshiOne.path();
+        let offset = crate::support::Fixture::AoboshiOne.offset("name");
+        let mut file = ok!(File::open(path));
+
+        ok!(file.jump(offset));
+        let table = ok!(Names::read(&mut file));
+
+        let records = table
+            .iter()
+            .map(|(ids, value)| (ids, value.unwrap_or_default()));
+        let language_tags = table.language_tags().map(Option::unwrap_or_default);
+        let table = ok!(Names::from_iter(
+            records,
+            language_tags,
+            &mut Default::default(),
+        ));
+
+        let mut cursor = Cursor::new(vec![]);
+        ok!(cursor.give(&table));
+    }
+}
+
 mod css_test {
     use truetype::tables::names::Names;
     use truetype::value::Read;
 
-    #[cfg_attr(not(feature = "ignore-invalid-language-ids"), should_panic)]
     #[test]
+    #[cfg_attr(not(feature = "ignore-invalid-language-ids"), should_panic)]
     fn read() {
         let table = ok!(Names::read(&mut setup!(CSSTest, "name")));
         let _: Vec<_> = table.iter().collect();
@@ -25,7 +59,7 @@ mod open_sans {
     #[test]
     fn read() {
         let table = ok!(Names::read(&mut setup!(OpenSans, "name")));
-        test(&table);
+        assert(&table);
     }
 
     #[test]
@@ -45,7 +79,7 @@ mod open_sans {
             language_tags,
             &mut Default::default(),
         ));
-        test(&other);
+        assert(&other);
         match (&one, &other) {
             (Names::Format0(one), Names::Format0(other)) => {
                 assert_eq!(one.data.len(), other.data.len() - 48);
@@ -58,7 +92,7 @@ mod open_sans {
         assert_eq!(size, cursor.into_inner().len() - 48);
     }
 
-    fn test(table: &Names) {
+    fn assert(table: &Names) {
         let records = table.iter().collect::<Vec<_>>();
         let name_ids = records
             .iter()

tests/names.rs

@@ -17,6 +17,7 @@ macro_rules! setup(
 #[allow(dead_code)]
 #[derive(Clone, Copy, Debug)]
 pub enum Fixture {
+    AoboshiOne,
     BungeeColor,
     CSSTest,
     Englebert,
@@ -32,6 +33,7 @@ pub enum Fixture {
 impl Fixture {
     pub fn file_name(&self) -> &'static str {
         match *self {
+            Fixture::AoboshiOne => "AoboshiOne-Regular.ttf",
             Fixture::BungeeColor => "BungeeColor-Regular.ttf",
             Fixture::CSSTest => "csstest-basic-regular.ttf",
             Fixture::Englebert => "Englebert-Regular.ttf",
@@ -52,6 +54,10 @@ impl Fixture {
 
     pub fn offset(&self, table: &str) -> u64 {
         match *self {
+            Fixture::AoboshiOne => match table {
+                "name" => 105912,
+                _ => unreachable!(),
+            },
             Fixture::BungeeColor => match table {
                 "OS/2" => 376,
                 _ => unreachable!(),