Skip to content

Commit ddfe70a

Browse files
rsheeterrsheeter
committed
Naming is the hardest part
1 parent db60fc8 commit ddfe70a

File tree

8 files changed

+55
-55
lines changed

8 files changed

+55
-55
lines changed

‎fontbe/src/features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ impl Work<Context, AnyWorkId, Error> for FeatureWork {
426426
.variant(FeWorkId::GlyphOrder)
427427
.variant(FeWorkId::StaticMetadata)
428428
.variant(FeWorkId::Features)
429-
.variant(WorkId::Kerns)
429+
.variant(WorkId::GatherBeKerning)
430430
.variant(WorkId::Marks)
431431
.build()
432432
}

‎fontbe/src/kern.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::{
2222
error::Error,
2323
features::resolve_variable_metric,
2424
orchestration::{
25-
AnyWorkId, BeWork, Context, KernAdjustments, KernSegment, Kerning, Kerns, PairPosEntry,
25+
AnyWorkId, BeWork, Context, KernAdjustments, KernFragment, Kerning, Kerns, PairPosEntry,
2626
WorkId,
2727
},
2828
};
@@ -32,18 +32,18 @@ use crate::{
3232
const KERNS_PER_BLOCK: usize = 2048;
3333

3434
#[derive(Debug)]
35-
struct KerningWork;
35+
struct GatherIrKerningWork;
3636

3737
#[derive(Debug)]
38-
struct KerningSegmentWork {
38+
struct KerningFragmentWork {
3939
segment: usize,
4040
}
4141

4242
#[derive(Debug)]
4343
struct KerningGatherWork;
4444

45-
pub fn create_kerning_work() -> Box<BeWork> {
46-
Box::new(KerningWork {})
45+
pub fn create_gather_ir_kerning_work() -> Box<BeWork> {
46+
Box::new(GatherIrKerningWork {})
4747
}
4848

4949
pub fn create_kern_segment_work(kern_pairs: &Kerning) -> Vec<Box<BeWork>> {
@@ -55,7 +55,7 @@ pub fn create_kern_segment_work(kern_pairs: &Kerning) -> Vec<Box<BeWork>> {
5555
segments
5656
);
5757
for segment in 0..segments {
58-
work.push(Box::new(KerningSegmentWork { segment }));
58+
work.push(Box::new(KerningFragmentWork { segment }));
5959
}
6060
work
6161
}
@@ -71,9 +71,9 @@ fn gid(glyph_order: &GlyphOrder, name: &GlyphName) -> Result<GlyphId, Error> {
7171
.ok_or_else(|| Error::MissingGlyphId(name.clone()))
7272
}
7373

74-
impl Work<Context, AnyWorkId, Error> for KerningWork {
74+
impl Work<Context, AnyWorkId, Error> for GatherIrKerningWork {
7575
fn id(&self) -> AnyWorkId {
76-
WorkId::KernPairs.into()
76+
WorkId::GatherIrKerning.into()
7777
}
7878

7979
fn read_access(&self) -> Access<AnyWorkId> {
@@ -85,7 +85,7 @@ impl Work<Context, AnyWorkId, Error> for KerningWork {
8585
}
8686

8787
fn write_access(&self) -> Access<AnyWorkId> {
88-
Access::Variant(WorkId::KernPairs.into())
88+
Access::Variant(WorkId::GatherIrKerning.into())
8989
}
9090

9191
/// Generate kerning data structures.
@@ -142,15 +142,15 @@ impl Work<Context, AnyWorkId, Error> for KerningWork {
142142
}
143143
}
144144

145-
impl Work<Context, AnyWorkId, Error> for KerningSegmentWork {
145+
impl Work<Context, AnyWorkId, Error> for KerningFragmentWork {
146146
fn id(&self) -> AnyWorkId {
147-
WorkId::KernSegment(self.segment).into()
147+
WorkId::KernFragment(self.segment).into()
148148
}
149149

150150
fn read_access(&self) -> Access<AnyWorkId> {
151151
AccessBuilder::new()
152152
.variant(FeWorkId::StaticMetadata)
153-
.variant(WorkId::KernPairs)
153+
.variant(WorkId::GatherIrKerning)
154154
.build()
155155
}
156156

@@ -238,7 +238,7 @@ impl Work<Context, AnyWorkId, Error> for KerningSegmentWork {
238238
}
239239
}
240240

241-
context.kern_segments.set(KernSegment {
241+
context.kern_segments.set(KernFragment {
242242
segment: self.segment,
243243
kerns,
244244
});
@@ -249,13 +249,13 @@ impl Work<Context, AnyWorkId, Error> for KerningSegmentWork {
249249

250250
impl Work<Context, AnyWorkId, Error> for KerningGatherWork {
251251
fn id(&self) -> AnyWorkId {
252-
WorkId::Kerns.into()
252+
WorkId::GatherBeKerning.into()
253253
}
254254

255255
fn read_access(&self) -> Access<AnyWorkId> {
256256
AccessBuilder::new()
257-
.variant(WorkId::KernPairs) // wait for pairs because kern segments don't spawn until pairs are done
258-
.variant(WorkId::KernSegment(0))
257+
.variant(WorkId::GatherIrKerning) // wait for pairs because kern segments don't spawn until pairs are done
258+
.variant(WorkId::KernFragment(0))
259259
.build()
260260
}
261261

‎fontbe/src/orchestration.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ pub enum WorkId {
9595
Hhea,
9696
Hmtx,
9797
Hvar,
98-
KernPairs,
99-
KernSegment(KernBlock),
100-
Kerns,
98+
GatherIrKerning,
99+
KernFragment(KernBlock),
100+
GatherBeKerning,
101101
Loca,
102102
LocaFormat,
103103
Marks,
@@ -127,9 +127,9 @@ impl Identifier for WorkId {
127127
WorkId::Hhea => "BeHhea",
128128
WorkId::Hmtx => "BeHmtx",
129129
WorkId::Hvar => "BeHvar",
130-
WorkId::KernPairs => "BeKerning",
131-
WorkId::KernSegment(..) => "BeKern",
132-
WorkId::Kerns => "BeKernGather",
130+
WorkId::GatherIrKerning => "BeGatherIr",
131+
WorkId::KernFragment(..) => "BeKernFragment",
132+
WorkId::GatherBeKerning => "BeGatherKernFragments",
133133
WorkId::Loca => "BeLoca",
134134
WorkId::LocaFormat => "BeLocaFormat",
135135
WorkId::Marks => "BeMarks",
@@ -422,18 +422,18 @@ impl PairPosEntry {
422422

423423
/// A chunk of kerning that needs to be fed into a [PairPosBuilder]
424424
#[derive(Default, Clone, Serialize, Deserialize, PartialEq)]
425-
pub struct KernSegment {
425+
pub struct KernFragment {
426426
pub(crate) segment: usize,
427427
pub(crate) kerns: Vec<PairPosEntry>,
428428
}
429429

430-
impl IdAware<AnyWorkId> for KernSegment {
430+
impl IdAware<AnyWorkId> for KernFragment {
431431
fn id(&self) -> AnyWorkId {
432-
AnyWorkId::Be(WorkId::KernSegment(self.segment))
432+
AnyWorkId::Be(WorkId::KernFragment(self.segment))
433433
}
434434
}
435435

436-
impl Persistable for KernSegment {
436+
impl Persistable for KernFragment {
437437
fn read(from: &mut dyn Read) -> Self {
438438
bincode::deserialize_from(from).unwrap()
439439
}
@@ -596,7 +596,7 @@ pub struct Context {
596596
pub hmtx: BeContextItem<Bytes>,
597597
pub hvar: BeContextItem<BeValue<Hvar>>,
598598
pub kern_pairs: BeContextItem<Kerning>,
599-
pub kern_segments: BeContextMap<KernSegment>,
599+
pub kern_segments: BeContextMap<KernFragment>,
600600
pub kerns: BeContextItem<Kerns>,
601601
pub marks: BeContextItem<Marks>,
602602
pub stat: BeContextItem<BeValue<Stat>>,
@@ -674,13 +674,13 @@ impl Context {
674674
hmtx: ContextItem::new(WorkId::Hmtx.into(), acl.clone(), persistent_storage.clone()),
675675
hvar: ContextItem::new(WorkId::Hvar.into(), acl.clone(), persistent_storage.clone()),
676676
kern_pairs: ContextItem::new(
677-
WorkId::KernPairs.into(),
677+
WorkId::GatherIrKerning.into(),
678678
acl.clone(),
679679
persistent_storage.clone(),
680680
),
681681
kern_segments: ContextMap::new(acl.clone(), persistent_storage.clone()),
682682
kerns: ContextItem::new(
683-
WorkId::Kerns.into(),
683+
WorkId::GatherBeKerning.into(),
684684
acl.clone(),
685685
persistent_storage.clone(),
686686
),

‎fontbe/src/paths.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ impl Paths {
5757
self.glyph_dir.join(safe_filename(name, ".gvar"))
5858
}
5959

60-
fn kern_slice_file(&self, segment: usize) -> PathBuf {
60+
fn kern_fragment_file(&self, segment: usize) -> PathBuf {
6161
self.build_dir
62-
.join(safe_filename(&format!("kern_{segment}"), ".bin"))
62+
.join(safe_filename(&format!("kern_fragment_{segment}"), ".bin"))
6363
}
6464

6565
pub fn target_file(&self, id: &WorkId) -> PathBuf {
@@ -81,9 +81,9 @@ impl Paths {
8181
WorkId::Hhea => self.build_dir.join("hhea.table"),
8282
WorkId::Hmtx => self.build_dir.join("hmtx.table"),
8383
WorkId::Hvar => self.build_dir.join("hvar.table"),
84-
WorkId::KernPairs => self.build_dir.join("kern_scatter.bin"),
85-
WorkId::KernSegment(segment) => self.kern_slice_file(*segment),
86-
WorkId::Kerns => self.build_dir.join("kern_gather.bin"),
84+
WorkId::GatherIrKerning => self.build_dir.join("kern_scatter.bin"),
85+
WorkId::KernFragment(segment) => self.kern_fragment_file(*segment),
86+
WorkId::GatherBeKerning => self.build_dir.join("kern_gather.bin"),
8787
WorkId::Marks => self.build_dir.join("marks.bin"),
8888
WorkId::Maxp => self.build_dir.join("maxp.table"),
8989
WorkId::Name => self.build_dir.join("name.table"),

‎fontc/src/change_detector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl ChangeDetector {
300300
self.kerning_groups_ir_change()
301301
|| !self
302302
.be_paths
303-
.target_file(&BeWorkIdentifier::KernPairs)
303+
.target_file(&BeWorkIdentifier::GatherIrKerning)
304304
.is_file()
305305
}
306306

‎fontc/src/lib.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use fontbe::{
3131
gvar::create_gvar_work,
3232
head::create_head_work,
3333
hvar::create_hvar_work,
34-
kern::{create_kerning_work, create_kerns_work},
34+
kern::{create_gather_ir_kerning_work, create_kerns_work},
3535
marks::create_mark_work,
3636
metrics_and_limits::create_metric_and_limit_work,
3737
name::create_name_work,
@@ -168,7 +168,7 @@ fn add_marks_be_job(workload: &mut Workload) -> Result<(), Error> {
168168
}
169169

170170
fn add_kern_pair_be_job(workload: &mut Workload) -> Result<(), Error> {
171-
let work = create_kerning_work();
171+
let work = create_gather_ir_kerning_work();
172172
// Features are extremely prone to not making sense when glyphs are filtered
173173
if workload.change_detector.kerning_be_change() {
174174
if workload.change_detector.glyph_name_filter().is_some() {
@@ -696,9 +696,9 @@ mod tests {
696696
BeWorkIdentifier::Hhea.into(),
697697
BeWorkIdentifier::Hmtx.into(),
698698
BeWorkIdentifier::Hvar.into(),
699-
BeWorkIdentifier::KernPairs.into(),
700-
BeWorkIdentifier::KernSegment(0).into(),
701-
BeWorkIdentifier::Kerns.into(),
699+
BeWorkIdentifier::GatherIrKerning.into(),
700+
BeWorkIdentifier::KernFragment(0).into(),
701+
BeWorkIdentifier::GatherBeKerning.into(),
702702
BeWorkIdentifier::Loca.into(),
703703
BeWorkIdentifier::LocaFormat.into(),
704704
BeWorkIdentifier::Marks.into(),
@@ -838,9 +838,9 @@ mod tests {
838838
BeWorkIdentifier::Gpos.into(),
839839
BeWorkIdentifier::Gsub.into(),
840840
BeWorkIdentifier::Gdef.into(),
841-
BeWorkIdentifier::KernPairs.into(),
842-
BeWorkIdentifier::KernSegment(0).into(),
843-
BeWorkIdentifier::Kerns.into(),
841+
BeWorkIdentifier::GatherIrKerning.into(),
842+
BeWorkIdentifier::KernFragment(0).into(),
843+
BeWorkIdentifier::GatherBeKerning.into(),
844844
],
845845
completed
846846
);
@@ -951,9 +951,9 @@ mod tests {
951951
BeWorkIdentifier::Gpos.into(),
952952
BeWorkIdentifier::Gsub.into(),
953953
BeWorkIdentifier::Gdef.into(),
954-
BeWorkIdentifier::KernPairs.into(),
955-
BeWorkIdentifier::KernSegment(0).into(),
956-
BeWorkIdentifier::Kerns.into(),
954+
BeWorkIdentifier::GatherIrKerning.into(),
955+
BeWorkIdentifier::KernFragment(0).into(),
956+
BeWorkIdentifier::GatherBeKerning.into(),
957957
],
958958
completed
959959
);

‎fontc/src/timing.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ fn short_name(id: &AnyWorkId) -> &'static str {
148148
AnyWorkId::Be(BeWorkIdentifier::Hhea) => "hhea",
149149
AnyWorkId::Be(BeWorkIdentifier::Hmtx) => "hmtx",
150150
AnyWorkId::Be(BeWorkIdentifier::Hvar) => "HVAR",
151-
AnyWorkId::Be(BeWorkIdentifier::KernPairs) => "kern-be",
152-
AnyWorkId::Be(BeWorkIdentifier::KernSegment(..)) => "kern-frag",
153-
AnyWorkId::Be(BeWorkIdentifier::Kerns) => "kern-gather-be",
151+
AnyWorkId::Be(BeWorkIdentifier::GatherIrKerning) => "kern-be",
152+
AnyWorkId::Be(BeWorkIdentifier::KernFragment(..)) => "kern-frag",
153+
AnyWorkId::Be(BeWorkIdentifier::GatherBeKerning) => "kern-gather-be",
154154
AnyWorkId::Be(BeWorkIdentifier::Loca) => "loca",
155155
AnyWorkId::Be(BeWorkIdentifier::LocaFormat) => "loca-fmt",
156156
AnyWorkId::Be(BeWorkIdentifier::Marks) => "Marks",
@@ -191,9 +191,9 @@ fn color(id: &AnyWorkId) -> &'static str {
191191
AnyWorkId::Be(BeWorkIdentifier::Hhea) => "gray",
192192
AnyWorkId::Be(BeWorkIdentifier::Hmtx) => "v",
193193
AnyWorkId::Be(BeWorkIdentifier::Hvar) => "gray",
194-
AnyWorkId::Be(BeWorkIdentifier::KernPairs) => "gray",
195-
AnyWorkId::Be(BeWorkIdentifier::KernSegment(..)) => "gray",
196-
AnyWorkId::Be(BeWorkIdentifier::Kerns) => "gray",
194+
AnyWorkId::Be(BeWorkIdentifier::GatherIrKerning) => "gray",
195+
AnyWorkId::Be(BeWorkIdentifier::KernFragment(..)) => "gray",
196+
AnyWorkId::Be(BeWorkIdentifier::GatherBeKerning) => "gray",
197197
AnyWorkId::Be(BeWorkIdentifier::Marks) => "gray",
198198
AnyWorkId::Be(BeWorkIdentifier::Loca) => "gray",
199199
AnyWorkId::Be(BeWorkIdentifier::LocaFormat) => "gray",

‎fontc/src/workload.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn priority(id: &AnyWorkId) -> u32 {
8181
AnyWorkId::Fe(FeWorkIdentifier::PreliminaryGlyphOrder) => 99,
8282
AnyWorkId::Fe(FeWorkIdentifier::StaticMetadata) => 99,
8383
AnyWorkId::Fe(FeWorkIdentifier::GlobalMetrics) => 99,
84-
AnyWorkId::Be(BeWorkIdentifier::KernPairs) => 99,
84+
AnyWorkId::Be(BeWorkIdentifier::GatherIrKerning) => 99,
8585
AnyWorkId::Be(BeWorkIdentifier::Features) => 99,
8686
AnyWorkId::Be(BeWorkIdentifier::GlyfFragment(..)) => 0,
8787
AnyWorkId::Be(BeWorkIdentifier::GvarFragment(..)) => 0,
@@ -294,7 +294,7 @@ impl<'a> Workload<'a> {
294294
}
295295
}
296296

297-
if let AnyWorkId::Be(BeWorkIdentifier::KernPairs) = success {
297+
if let AnyWorkId::Be(BeWorkIdentifier::GatherIrKerning) = success {
298298
let kern_pairs = be_root.kern_pairs.get();
299299
for work in create_kern_segment_work(&kern_pairs) {
300300
self.add(work.into(), true);

0 commit comments

Comments
 (0)