Upgrade pedantry for issue #54

Author: ctrlcctrlv

src/glif/read.rs

@@ -102,7 +102,11 @@ pub fn read_ufo_glif_pedantic<PD: PointData>(glif: &str, pedantry: Pedantry) ->
 
         match widthc {
             Err(e) => if let Ok((f, false)) = width.parse::<f32>().map(|f|(f, f.is_subnormal())) {
-                log::warn!("Floating point value given as <advance> width — OpenType `hmtx` / `vmtx` will truncate it, so we do too!");
+                const FLOATPOINTWARNING: &str = "Floating point value given as <advance> width — OpenType `hmtx` / `vmtx` will truncate it";
+                if !pedantry.should_mend() {
+                    Err(input_error!(FLOATPOINTWARNING))?
+                }
+                log::warn!("{}, so we do too!", FLOATPOINTWARNING);
                 Some(f as u64)
             } else {
                 log::trace!("<advance> parsing as int rose {:?}", e);

src/pedantry.rs

@@ -8,6 +8,12 @@ pub struct Pedantry {
     pub mend: Mend,
 }
 
+impl Pedantry {
+    pub fn should_mend(&self) -> bool {
+        !(self.level.is_sfnt() && self.mend.is_never())
+    }
+}
+
 #[derive(Derivative, Debug, Copy, Clone, PartialEq, Eq, IsVariant, Unwrap)]
 #[derivative(Default)]
 pub enum Mend {
@@ -39,14 +45,25 @@ pub enum Level {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, IsVariant, Unwrap)]
 pub enum FloatClass {
     Anchor,
+    AdvanceWidth
+}
+
+impl FloatClass {
+    fn should_round(&self) -> bool {
+        *self == FloatClass::Anchor
+    }
 }
 
 impl Level {
     pub fn maybe_round(&self, f: IntegerOrFloat, fc: FloatClass) -> f32 {
-        if (self.is_open_type() || self.is_true_type()) && fc == FloatClass::Anchor {
+        if self.is_sfnt() && fc.should_round() {
             f32::from(f).round()
         } else {
             f.into()
         }
     }
+
+    pub fn is_sfnt(&self) -> bool {
+        self.is_open_type() || self.is_true_type()
+    }
 }

tests/bugfixes/issue54.rs

@@ -1,13 +1,20 @@
-use glifparser;
+use super::gp;
+use super::GPResult;
 
 #[super::test]
 fn test_bug_fixed() {
     let gliffn = "test_data/bugfixes/issue54.glif";
     log::trace!("{}", gliffn);
-    let glif: glifparser::Glif<()> = glifparser::glif::read_from_filename(gliffn).unwrap();
+    let glif: gp::Glif<()> = gp::glif::read_from_filename(gliffn).unwrap();
+    assert_eq!(glif.width, Some(1143));
+    log::trace!("{}", gliffn);
+    let glif: GPResult = gp::glif::read_from_filename_pedantic(gliffn, gp::Pedantry::new(gp::pedantry::Level::OpenType, gp::pedantry::Mend::Never));
+    assert!(glif.is_err());
+    log::trace!("{}", gliffn);
+    let glif: gp::Glif<()> = gp::glif::read_from_filename_pedantic(gliffn, gp::Pedantry::default()).unwrap();
     assert_eq!(glif.width, Some(1143));
     let gliffn = "test_data/bugfixes/Q_.glif";
     log::trace!("{}", gliffn);
-    let glif: Result<glifparser::Glif<()>, glifparser::error::GlifParserError> = glifparser::glif::read_from_filename(gliffn);
+    let glif: GPResult = gp::glif::read_from_filename(gliffn);
     assert!(glif.is_err());
 }

tests/bugfixes/mod.rs

@@ -1,3 +1,5 @@
 use test_log::{self, test};
+use glifparser as gp;
+type GPResult = Result<gp::Glif<()>, gp::error::GlifParserError>;
 
 mod issue54;