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

Update Skrifa to 0.22.0 #697

Merged
merged 5 commits into from
Sep 23, 2024
Merged

Update Skrifa to 0.22.0 #697

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a091b64
Update Skrifa to 0.22
DJMcNab Sep 23, 2024
024481a
Remove the `glyph` module entirely - this code was unused
DJMcNab Sep 23, 2024
d751c7d
Address other consequences of the upgrade
DJMcNab Sep 23, 2024
48a73ba
Use the supported settings API
DJMcNab Sep 23, 2024
97f7e43
Change TODO comments
DJMcNab Sep 23, 2024
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
18 changes: 12 additions & 6 deletions vello_encoding/src/glyph_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use super::{Encoding, StreamOffsets};

use peniko::{Font, Style};
use skrifa::instance::{NormalizedCoord, Size};
use skrifa::outline::{HintingInstance, HintingMode, LcdLayout, OutlineGlyphFormat};
use skrifa::outline::{HintingInstance, HintingOptions, OutlineGlyphFormat};
use skrifa::{GlyphId, MetadataProvider, OutlineGlyphCollection};

#[derive(Default)]
Expand Down Expand Up @@ -245,13 +245,19 @@ pub(crate) struct HintKey<'a> {

impl<'a> HintKey<'a> {
fn instance(&self) -> Option<HintingInstance> {
HintingInstance::new(self.outlines, self.size, self.coords, HINTING_MODE).ok()
HintingInstance::new(self.outlines, self.size, self.coords, HINTING_OPTIONS).ok()
}
}

const HINTING_MODE: HintingMode = HintingMode::Smooth {
lcd_subpixel: Some(LcdLayout::Horizontal),
preserve_linear_metrics: true,
const HINTING_OPTIONS: HintingOptions = HintingOptions {
engine: skrifa::outline::Engine::AutoFallback,
target: skrifa::outline::Target::Smooth {
mode: skrifa::outline::SmoothMode::Lcd,
// TODO: Set based on whether the anti-aliasing mode is Area?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should always set this to false as you’ve done here. See googlefonts/fontations#1080

symmetric_rendering: false,
// TODO: Does Parley handle layout in a hinting-aware way?
Copy link
Collaborator

@dfrg dfrg Sep 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parley expects linear metrics. Hinting aware layout requires scaling glyph outlines to compute hinted advance widths which is incredibly expensive.

preserve_linear_metrics: true,
},
};

#[derive(Default)]
Expand All @@ -278,7 +284,7 @@ impl HintCache {
entry.font_index = key.font_index;
entry
.instance
.reconfigure(key.outlines, key.size, key.coords, HINTING_MODE)
.reconfigure(key.outlines, key.size, key.coords, HINTING_OPTIONS)
.ok()?;
}
Some(&entry.instance)
Expand Down