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

fontique: Move creation of attributes from fontconfig #212

Merged
merged 3 commits into from
Dec 9, 2024
Merged

fontique: Move creation of attributes from fontconfig #212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1bb86
fontique: Move creation of attributes from fontconfig
waywardmonkeys Dec 9, 2024
3ee4327
Update fontique/src/attributes.rs
waywardmonkeys Dec 9, 2024
b0e2617
Update fontique/src/attributes.rs
waywardmonkeys Dec 9, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ This release has an [MSRV] of 1.75.

### Added

#### Fontique

- `FontStretch`, `FontStyle`, and `FontWeight` get helper functions `from_fontconfig` ([#212] by [@waywardmonkeys][])

#### Parley

- `Generation` on `PlainEditor` to help implement lazy drawing. ([#143] by [@xorgy])
Expand Down
77 changes: 77 additions & 0 deletions fontique/src/attributes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,28 @@ impl FontStretch {
}
}

impl FontStretch {
/// Creates a new stretch attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
pub fn from_fontconfig(width: i32) -> Self {
match width {
50 => Self::ULTRA_CONDENSED,
63 => Self::EXTRA_CONDENSED,
75 => Self::CONDENSED,
87 => Self::SEMI_CONDENSED,
100 => Self::NORMAL,
113 => Self::SEMI_EXPANDED,
125 => Self::EXPANDED,
150 => Self::EXTRA_EXPANDED,
200 => Self::ULTRA_EXPANDED,
_ => Self::from_ratio(width as f32 / 100.0),
waywardmonkeys marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

impl fmt::Display for FontStretch {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let value = self.0 * 1000.0;
Expand Down Expand Up @@ -304,6 +326,46 @@ impl FontWeight {
}
}

impl FontWeight {
/// Creates a new weight attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
pub fn from_fontconfig(weight: i32) -> Self {
const MAP: &[(i32, i32)] = &[
waywardmonkeys marked this conversation as resolved.
Show resolved Hide resolved
(0, 0),
(100, 0),
(200, 40),
(300, 50),
(350, 55),
(380, 75),
(400, 80),
(500, 100),
(600, 180),
(700, 200),
(800, 205),
(900, 210),
(950, 215),
];
for (i, (ot, fc)) in MAP.iter().skip(1).enumerate() {
if weight == *fc {
return Self::new(*ot as f32);
}
if weight < *fc {
waywardmonkeys marked this conversation as resolved.
Show resolved Hide resolved
let weight = weight as f32;
let fc_a = MAP[i - 1].1 as f32;
let fc_b = *fc as f32;
let ot_a = MAP[i - 1].1 as f32;
let ot_b = *ot as f32;
let t = (fc_a - fc_b) / (weight - fc_a);
return Self::new(ot_a + (ot_b - ot_a) * t);
}
}
Self::EXTRA_BLACK
}
}

impl Default for FontWeight {
fn default() -> Self {
Self::NORMAL
Expand Down Expand Up @@ -399,6 +461,21 @@ impl FontStyle {
}
}

impl FontStyle {
/// Creates a new style attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
pub fn from_fontconfig(slant: i32) -> Self {
match slant {
100 => Self::Italic,
110 => Self::Oblique(None),
_ => Self::Normal,
}
}
}

impl fmt::Display for FontStyle {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let value = match self {
Expand Down
83 changes: 3 additions & 80 deletions fontique/src/backend/fontconfig/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,83 +6,6 @@ use fontconfig_cache_parser::{Cache, CharSetLeaf, Object, Pattern, Value};
use std::io::Read;
use std::path::PathBuf;

impl FontStretch {
/// Creates a new stretch attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
pub fn from_fc(width: i32) -> Self {
match width {
50 => Self::ULTRA_CONDENSED,
63 => Self::EXTRA_CONDENSED,
75 => Self::CONDENSED,
87 => Self::SEMI_CONDENSED,
100 => Self::NORMAL,
113 => Self::SEMI_EXPANDED,
125 => Self::EXPANDED,
150 => Self::EXTRA_EXPANDED,
200 => Self::ULTRA_EXPANDED,
_ => Self::from_ratio(width as f32 / 100.0),
}
}
}

impl FontStyle {
/// Creates a new style attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
fn from_fc(slant: i32) -> Self {
match slant {
100 => Self::Italic,
110 => Self::Oblique(None),
_ => Self::Normal,
}
}
}

impl FontWeight {
/// Creates a new weight attribute with the given value from Fontconfig.
///
/// The values are determined based on the [fonts.conf documentation].
///
/// [fonts.conf documentation]: https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
fn from_fc(weight: i32) -> Self {
const MAP: &[(i32, i32)] = &[
(0, 0),
(100, 0),
(200, 40),
(300, 50),
(350, 55),
(380, 75),
(400, 80),
(500, 100),
(600, 180),
(700, 200),
(800, 205),
(900, 210),
(950, 215),
];
for (i, (ot, fc)) in MAP.iter().skip(1).enumerate() {
if weight == *fc {
return Self::new(*ot as f32);
}
if weight < *fc {
let weight = weight as f32;
let fc_a = MAP[i - 1].1 as f32;
let fc_b = *fc as f32;
let ot_a = MAP[i - 1].1 as f32;
let ot_b = *ot as f32;
let t = (fc_a - fc_b) / (weight - fc_a);
return Self::new(ot_a + (ot_b - ot_a) * t);
}
}
Self::EXTRA_BLACK
}
}

#[derive(Default)]
pub struct CachedFont {
pub family: Vec<String>,
Expand Down Expand Up @@ -177,21 +100,21 @@ fn parse_font(
Object::Slant => {
for val in elt.values().ok()? {
if let Value::Int(i) = val.ok()? {
font.style = FontStyle::from_fc(i as _);
font.style = FontStyle::from_fontconfig(i as _);
}
}
}
Object::Weight => {
for val in elt.values().ok()? {
if let Value::Int(i) = val.ok()? {
font.weight = FontWeight::from_fc(i as _);
font.weight = FontWeight::from_fontconfig(i as _);
}
}
}
Object::Width => {
for val in elt.values().ok()? {
if let Value::Int(i) = val.ok()? {
font.stretch = FontStretch::from_fc(i as _);
font.stretch = FontStretch::from_fontconfig(i as _);
}
}
}
Expand Down
Loading