[fea-rs] Rename valuerecordext -> metrics

googlefonts · Nov 28, 2023 · 8803e87 · 8803e87
1 parent b5e3192
commit 8803e87
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/fea-rs/src/compile.rs b/fea-rs/src/compile.rs
@@ -19,9 +19,9 @@ pub use lookups::{
     FeatureKey, LookupId, MarkToBaseBuilder, MarkToMarkBuilder, PairPosBuilder,
     PreviouslyAssignedClass,
 };
+pub use metrics::{Anchor, ValueRecord};
 pub use opts::Opts;
 pub use output::Compilation;
-pub use valuerecordext::{Anchor, ValueRecord};
 pub use variations::{AxisLocation, VariationInfo};
 
 #[cfg(any(test, feature = "test", feature = "cli"))]
@@ -35,12 +35,12 @@ mod features;
 mod glyph_range;
 mod language_system;
 mod lookups;
+mod metrics;
 mod opts;
 mod output;
 mod tables;
 mod tags;
 mod validate;
-mod valuerecordext;
 mod variations;
 
 /// Run the validation pass, returning any diagnostics.

diff --git a/fea-rs/src/compile/compile_ctx.rs b/fea-rs/src/compile/compile_ctx.rs
@@ -43,11 +43,10 @@ use super::{
     lookups::{
         AllLookups, FilterSetId, LookupFlagInfo, LookupId, PreviouslyAssignedClass, SomeLookup,
     },
+    metrics::{Anchor, DeviceOrDeltas, Metric, ValueRecord},
     output::Compilation,
     tables::{ClassId, ScriptRecord, Tables},
-    tags,
-    valuerecordext::{Anchor, DeviceOrDeltas, Metric, ValueRecord},
-    VariationInfo,
+    tags, VariationInfo,
 };
 
 /// Context that manages state for a compilation.

diff --git a/fea-rs/src/compile/lookups.rs b/fea-rs/src/compile/lookups.rs
@@ -29,11 +29,11 @@ use write_fonts::{
 
 use crate::{
     common::{GlyphId, GlyphOrClass, GlyphSet},
-    compile::{lookups::contextual::ChainOrNot, valuerecordext::ValueRecord},
+    compile::{lookups::contextual::ChainOrNot, metrics::ValueRecord},
     Kind,
 };
 
-use super::{features::AllFeatures, tables::ClassId, tags, valuerecordext::Anchor};
+use super::{features::AllFeatures, metrics::Anchor, tables::ClassId, tags};
 
 use contextual::{
     ContextualLookupBuilder, PosChainContextBuilder, PosContextBuilder, ReverseChainBuilder,

diff --git a/fea-rs/src/compile/lookups/contextual.rs b/fea-rs/src/compile/lookups/contextual.rs
@@ -17,7 +17,7 @@ use write_fonts::{
     FontWrite,
 };
 
-use crate::{common::GlyphOrClass, compile::valuerecordext::ValueRecord};
+use crate::{common::GlyphOrClass, compile::metrics::ValueRecord};
 
 use super::{
     Builder, ClassDefBuilder2, FilterSetId, LookupBuilder, LookupId, PositionLookup,

diff --git a/fea-rs/src/compile/lookups/gpos_builders.rs b/fea-rs/src/compile/lookups/gpos_builders.rs
@@ -14,7 +14,7 @@ use write_fonts::{
 
 use crate::{
     common::GlyphSet,
-    compile::valuerecordext::{Anchor, ValueRecord},
+    compile::metrics::{Anchor, ValueRecord},
 };
 
 use super::{Builder, ClassDefBuilder2};
@@ -351,7 +351,6 @@ impl Builder for CursivePosBuilder {
                 )
             })
             .collect();
-        //let record = write_gpos::EntryExitRecord::new(entry, exit);
         vec![write_gpos::CursivePosFormat1::new(coverage, records)]
     }
 }

diff --git a/fea-rs/src/compile/valuerecordext.rs → fea-rs/src/compile/metrics.rs b/fea-rs/src/compile/valuerecordext.rs → fea-rs/src/compile/metrics.rs
@@ -1,4 +1,4 @@
-//! Extra helper methods on ValueRecord
+//! Variable-first metrics, ValueRecords & Anchors
 
 use write_fonts::tables::{
     gpos::{AnchorTable, ValueFormat},
@@ -34,6 +34,7 @@ pub struct Anchor {
     pub contourpoint: Option<u16>,
 }
 
+/// Either a `Device` table or a set of deltas
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum DeviceOrDeltas {