Check for and surface cmap conflicts.

Fixes #457
googlefonts · Mar 20, 2024 · f54b52b · f54b52b
1 parent 6c6b830
commit f54b52b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ clap = { version = "4.0.32", features = ["derive"] }
 rayon = "1.6"
 
 # fontations etc
-write-fonts = { version = "0.24.0", features = ["serde", "read"] }
+write-fonts = { version = "0.25.0", features = ["serde", "read"] }
 skrifa = "0.17.0"
 norad = "0.12"
 

diff --git a/fontbe/src/cmap.rs b/fontbe/src/cmap.rs
@@ -54,7 +54,7 @@ impl Work<Context, AnyWorkId, Error> for CmapWork {
                     .collect::<Vec<_>>()
             });
 
-        let cmap = Cmap::from_mappings(mappings);
+        let cmap = Cmap::from_mappings(mappings)?;
         context.cmap.set_unconditionally(cmap.into());
         Ok(())
     }

diff --git a/fontbe/src/error.rs b/fontbe/src/error.rs
@@ -11,6 +11,7 @@ use thiserror::Error;
 use write_fonts::{
     read::ReadError,
     tables::{
+        cmap::CmapConflict,
         glyf::MalformedPath,
         gvar::{iup::IupError, GvarInputError},
     },
@@ -87,6 +88,8 @@ pub enum Error {
     MissingGlyphId(GlyphName),
     #[error("Missing kern group {0:?}")]
     MissingKernGroup(KernGroup),
+    #[error("Error making CMap: {0}")]
+    CmapConflict(#[from] CmapConflict),
 }
 
 #[derive(Debug)]