-
Notifications
You must be signed in to change notification settings - Fork 133
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.
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
Update Skrifa to 0.22.0 #697
Changes from 4 commits
a091b64
024481a
d751c7d
48a73ba
97f7e43
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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)] | ||
|
@@ -162,7 +162,7 @@ impl<'a> GlyphCacheSession<'a> { | |
entry.serial = self.serial; | ||
return Some((entry.encoding.clone(), entry.stream_sizes)); | ||
} | ||
let outline = self.outlines.get(GlyphId::new(key.glyph_id as u16))?; | ||
let outline = self.outlines.get(GlyphId::new(key.glyph_id))?; | ||
let mut encoding = self.free_list.pop().unwrap_or_default(); | ||
let encoding_ptr = Arc::make_mut(&mut encoding); | ||
encoding_ptr.reset(); | ||
|
@@ -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? | ||
symmetric_rendering: false, | ||
// TODO: Does Parley handle layout in a hinting-aware way? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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)] | ||
|
@@ -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) | ||
|
There was a problem hiding this comment.
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