Merge pull request #489 from daltonmaag/postscript-names

Postscript names for UFO sources

fontbe/src/features.rs

@@ -645,6 +645,7 @@ mod tests {
             ],
             Default::default(),
             HashSet::from([min_wght, def_wght, max_wght]),
+            Default::default(),
         )
         .unwrap()
     }

fontbe/src/fvar.rs

@@ -114,6 +114,7 @@ mod tests {
             axes.to_vec(),
             Default::default(),
             Default::default(),
+            Default::default(),
         )
         .unwrap()
     }

fontbe/src/post.rs

@@ -37,8 +37,13 @@ impl Work<Context, AnyWorkId, Error> for PostWork {
         // TODO optionally drop glyph names with format 3.0.
         // TODO a more serious post
         let static_metadata = context.ir.static_metadata.get();
+        let postscript_names = &static_metadata.postscript_names;
         let glyph_order = context.ir.glyph_order.get();
-        let mut post = Post::new_v2(glyph_order.iter().map(|g| g.as_str()));
+        let mut post = Post::new_v2(
+            glyph_order
+                .iter()
+                .map(|g| postscript_names.get(g).unwrap_or(g).as_str()),
+        );
         post.underline_position = FWord::new(static_metadata.misc.underline_position.0 as i16);
         post.underline_thickness = FWord::new(static_metadata.misc.underline_thickness.0 as i16);
         context.post.set_unconditionally(post.into());

fontc/src/args.rs

@@ -63,6 +63,12 @@ pub struct Args {
     // https://github.com/googlefonts/fontmake/blob/6a8b2907/Lib/fontmake/__main__.py#L443
     #[arg(long, default_value = "false")]
     pub keep_direction: bool,
+
+    /// Don't rename glyphs with production names
+    // Named to match fontmake's homonymous flag:
+    // https://github.com/googlefonts/fontmake/blob/6a8b2907/Lib/fontmake/__main__.py#L602
+    #[arg(long, default_value = "false")]
+    pub no_production_names: bool,
 }
 
 impl Args {
@@ -80,6 +86,7 @@ impl Args {
         );
         flags.set(Flags::EMIT_TIMING, self.emit_timing);
         flags.set(Flags::KEEP_DIRECTION, self.keep_direction);
+        flags.set(Flags::PRODUCTION_NAMES, !self.no_production_names);
 
         flags
     }
@@ -104,6 +111,7 @@ impl Args {
                 .contains(Flags::DECOMPOSE_TRANSFORMED_COMPONENTS),
             skip_features: false,
             keep_direction: false,
+            no_production_names: false,
         }
     }
 }
@@ -120,6 +128,12 @@ mod tests {
     fn arg_default_matches_flags_default() {
         let arg_default = Args::parse_from(vec!["program", "--source", "dont.care"]).flags();
         let flags_default = Flags::default();
-        assert_eq!(flags_default.bits(), arg_default.bits());
+        assert_eq!(
+            flags_default.bits(),
+            arg_default.bits(),
+            "mismatch in defaults. flags_default: {:#032b}. args_default: {:#032b}",
+            flags_default.bits(),
+            arg_default.bits(),
+        );
     }
 }

fontir/src/ir.rs

@@ -67,6 +67,10 @@ pub struct StaticMetadata {
     /// See <https://learn.microsoft.com/en-us/typography/opentype/spec/name>.
     pub names: HashMap<NameKey, String>,
 
+    /// See <https://learn.microsoft.com/en-us/typography/opentype/spec/post> and
+    /// <https://github.com/adobe-type-tools/agl-specification>
+    pub postscript_names: PostscriptNames,
+
     /// Miscellaneous font-wide data that didn't seem worthy of top billing
     pub misc: MiscMetadata,
 }
@@ -178,6 +182,9 @@ impl IntoIterator for GlyphOrder {
     }
 }
 
+/// Glyph names mapped to postscript names
+pub type PostscriptNames = HashMap<GlyphName, GlyphName>;
+
 /// In logical (reading) order
 type KernPair = (KernParticipant, KernParticipant);
 type KernValues = BTreeMap<NormalizedLocation, OrderedFloat<f32>>;
@@ -235,6 +242,7 @@ impl StaticMetadata {
         axes: Vec<Axis>,
         named_instances: Vec<NamedInstance>,
         glyph_locations: HashSet<NormalizedLocation>,
+        postscript_names: PostscriptNames,
     ) -> Result<StaticMetadata, VariationModelError> {
         // Point axes are less exciting than ranged ones
         let variable_axes: Vec<_> = axes.iter().filter(|a| !a.is_point()).cloned().collect();
@@ -275,6 +283,7 @@ impl StaticMetadata {
             variation_model,
             axes_default,
             variable_axes_default,
+            postscript_names,
             misc: MiscMetadata {
                 selection_flags: Default::default(),
                 vendor_id: DEFAULT_VENDOR_ID_TAG,

fontir/src/orchestration.rs

@@ -34,12 +34,14 @@ bitflags! {
         const EMIT_TIMING = 0b00100000;
         // If set, the direction of contours will NOT be reversed
         const KEEP_DIRECTION = 0b01000000;
+        // If set, production names are read & used
+        const PRODUCTION_NAMES = 0b10000000;
     }
 }
 
 impl Default for Flags {
     fn default() -> Self {
-        Flags::EMIT_IR | Flags::PREFER_SIMPLE_GLYPHS
+        Flags::EMIT_IR | Flags::PREFER_SIMPLE_GLYPHS | Flags::PRODUCTION_NAMES
     }
 }
 

fontir/src/serde.rs

@@ -14,7 +14,8 @@ use crate::{
     coords::{CoordConverter, DesignCoord, NormalizedLocation, UserCoord},
     ir::{
         Axis, GlobalMetric, GlobalMetrics, Glyph, GlyphBuilder, GlyphInstance, GlyphOrder,
-        KernParticipant, Kerning, MiscMetadata, NameKey, NamedInstance, StaticMetadata,
+        KernParticipant, Kerning, MiscMetadata, NameKey, NamedInstance, PostscriptNames,
+        StaticMetadata,
     },
     stateset::{FileState, MemoryState, State, StateIdentifier, StateSet},
 };
@@ -59,6 +60,7 @@ pub(crate) struct StaticMetadataSerdeRepr {
     pub named_instances: Vec<NamedInstance>,
     pub glyph_locations: Vec<NormalizedLocation>,
     pub names: HashMap<NameKey, String>,
+    pub postscript_names: PostscriptNames,
     pub misc: MiscSerdeRepr,
 }
 
@@ -70,6 +72,7 @@ impl From<StaticMetadataSerdeRepr> for StaticMetadata {
             from.axes,
             from.named_instances,
             from.glyph_locations.into_iter().collect(),
+            from.postscript_names,
         )
         .unwrap()
     }
@@ -84,6 +87,7 @@ impl From<StaticMetadata> for StaticMetadataSerdeRepr {
             named_instances: from.named_instances,
             glyph_locations,
             names: from.names,
+            postscript_names: from.postscript_names,
             misc: from.misc.into(),
         }
     }

glyphs2fontir/src/source.rs

@@ -348,6 +348,7 @@ impl Work<Context, WorkId, WorkError> for StaticMetadataWork {
             axes,
             named_instances,
             glyph_locations,
+            Default::default(), // TODO: impl reading PS names from Glyphs
         )
         .map_err(WorkError::VariationModelError)?;
         static_metadata.misc.selection_flags = selection_flags;