Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate kerning fea with normalized units #410

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Generate kerning fea with normalized units #410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions fontbe/src/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ fn enumerated(kp1: &KernParticipant, kp2: &KernParticipant) -> bool {
///
/// * See <https://github.com/fonttools/fonttools/issues/3168> wrt sparse kerning.
/// * See <https://github.com/adobe-type-tools/afdko/pull/1350> wrt variable fea.
fn create_kerning_fea(axes: &HashMap<Tag, &Axis>, kerning: &Kerning) -> Result<String, Error> {
fn create_kerning_fea(kerning: &Kerning) -> Result<String, Error> {
// Every kern must be defined at these locations. For human readability lets order things consistently.
let kerned_locations: HashSet<_> = kerning.kerns.values().flat_map(|v| v.keys()).collect();
let mut kerned_locations: Vec<_> = kerned_locations.into_iter().collect();
Expand Down Expand Up @@ -404,14 +404,10 @@ fn create_kerning_fea(axes: &HashMap<Tag, &Axis>, kerning: &Kerning) -> Result<S
// TODO: kerning lookup
.unwrap_or_else(|| 0.0);

// TODO: use the n suffix as soon as fea-rs supports it
let location = location.to_user(axes);

let pos_str = pos_strings.entry(location.clone()).or_insert_with(|| {
let pos_str = pos_strings.entry(*location).or_insert_with(|| {
location
.iter()
// TODO normalized: .map(|(tag, value)| format!("{tag}={}n", value.into_inner()))
.map(|(tag, value)| format!("{tag}={}", value.into_inner()))
.map(|(tag, value)| format!("{tag}={}n", value.into_inner()))
.collect::<Vec<_>>()
.join(",")
});
Expand Down Expand Up @@ -483,8 +479,7 @@ impl Work<Context, AnyWorkId, Error> for FeatureWork {
let kerning = context.ir.kerning.get();

let features = if !kerning.is_empty() {
let axes = static_metadata.axes.iter().map(|a| (a.tag, a)).collect();
let kern_fea = create_kerning_fea(&axes, &kerning)?;
let kern_fea = create_kerning_fea(&kerning)?;
integrate_kerning(&context.ir.features.get(), kern_fea)?
} else {
(*context.ir.features.get()).clone()
Expand Down