[write-fonts] Fixups for table_type

write-fonts/src/offsets.rs

@@ -116,6 +116,10 @@ impl<const N: usize, T: FontWrite> FontWrite for OffsetMarker<T, N> {
     fn write_into(&self, writer: &mut TableWriter) {
         writer.write_offset(&self.obj, N);
     }
+
+    fn table_type(&self) -> crate::table_type::TableType {
+        self.obj.table_type()
+    }
 }
 
 impl<const N: usize, T: FontWrite> FontWrite for NullableOffsetMarker<T, N> {
@@ -125,6 +129,13 @@ impl<const N: usize, T: FontWrite> FontWrite for NullableOffsetMarker<T, N> {
             None => writer.write_slice([0u8; N].as_slice()),
         }
     }
+
+    fn table_type(&self) -> crate::table_type::TableType {
+        match self.obj.as_ref() {
+            Some(obj) => obj.table_type(),
+            None => crate::table_type::TableType::Unknown,
+        }
+    }
 }
 
 impl<T, const N: usize> Default for NullableOffsetMarker<T, N> {

write-fonts/src/table_type.rs

@@ -112,7 +112,10 @@ impl Display for TableType {
 
 #[cfg(test)]
 mod tests {
-    use crate::tables::{gpos, gsub};
+    use crate::tables::{
+        gpos, gsub,
+        layout::{Lookup, LookupFlag},
+    };
     use crate::FontWrite;
 
     use super::*;
@@ -139,4 +142,11 @@ mod tests {
             TableType::GsubLookup(7)
         );
     }
+
+    #[test]
+    fn gpos_type() {
+        let pairpos = gpos::PairPos::Format1(Default::default());
+        let lookup = gpos::PositionLookup::Pair(Lookup::new(LookupFlag::empty(), vec![pairpos], 0));
+        assert_eq!(lookup.table_type(), TableType::GposLookup(2));
+    }
 }

write-fonts/src/write.rs

@@ -250,7 +250,7 @@ impl TableData {
         TableData {
             bytes: vec![0xca; size], // has no special meaning
             offsets: Vec::new(),
-            type_: TableType::Unknown,
+            type_: TableType::MockTable,
         }
     }