leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shape as fake italic if no matching italic font exists

Browse source
This commit is contained in:
Todd York 2026-01-01 14:45:26 +08:00 • committed by Jeremy Soller
parent e9075aeae8
commit a288f1d775
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/font/mod.rs
View file

@ -15,7 +15,7 @@ use core::fmt;
use alloc::sync::Arc; use alloc::sync::Arc;
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
use alloc::vec::Vec; use alloc::vec::Vec;
use fontdb::Style;
use self_cell::self_cell; use self_cell::self_cell;
pub mod fallback; pub mod fallback;
@ -54,6 +54,7 @@ pub struct Font {
data: FontData, data: FontData,
id: fontdb::ID, id: fontdb::ID,
monospace_fallback: Option<FontMonospaceFallback>, monospace_fallback: Option<FontMonospaceFallback>,
pub(crate) italic_or_oblique: bool,
} }
impl fmt::Debug for Font { impl fmt::Debug for Font {
@ -234,6 +235,7 @@ impl Font {
) )
.ok()?, .ok()?,
data: FontData::new(Blob::new(data), info.index), data: FontData::new(Blob::new(data), info.index),
italic_or_oblique: info.style == Style::Italic || info.style == Style::Oblique,
}) })
} }
} }

34
src/shape.rs
View file

@ -4,7 +4,7 @@
use crate::fallback::FontFallbackIter; use crate::fallback::FontFallbackIter;
use crate::{ use crate::{
math, Align, AttrsList, CacheKeyFlags, Color, Font, FontSystem, Hinting, LayoutGlyph, math, Align, Attrs, AttrsList, CacheKeyFlags, Color, Font, FontSystem, Hinting, LayoutGlyph,
LayoutLine, Metrics, Wrap, LayoutLine, Metrics, Wrap,
}; };
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
@ -18,6 +18,7 @@ use core::ops::Range;
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
use core_maths::CoreFloat; use core_maths::CoreFloat;
use fontdb::Style;
use unicode_script::{Script, UnicodeScript}; use unicode_script::{Script, UnicodeScript};
use unicode_segmentation::UnicodeSegmentation; use unicode_segmentation::UnicodeSegmentation;
@ -233,7 +234,7 @@ fn shape_fallback(
//TODO: color should not be related to shaping //TODO: color should not be related to shaping
color_opt: attrs.color_opt, color_opt: attrs.color_opt,
metadata: attrs.metadata, metadata: attrs.metadata,
cache_key_flags: attrs.cache_key_flags, cache_key_flags: override_fake_italic(attrs.cache_key_flags, font, &attrs),
metrics_opt: attrs.metrics_opt.map(Into::into), metrics_opt: attrs.metrics_opt.map(Into::into),
}); });
} }
@ -496,11 +497,11 @@ fn shape_skip(
let font = font_iter.next().expect("no default font found"); let font = font_iter.next().expect("no default font found");
let font_id = font.id(); let font_id = font.id();
let font_monospace_em_width = font.monospace_em_width(); let font_monospace_em_width = font.monospace_em_width();
let font = font.as_swash(); let swash_font = font.as_swash();
let charmap = font.charmap(); let charmap = swash_font.charmap();
let metrics = font.metrics(&[]); let metrics = swash_font.metrics(&[]);
let glyph_metrics = font.glyph_metrics(&[]).scale(1.0); let glyph_metrics = swash_font.glyph_metrics(&[]).scale(1.0);
let ascent = metrics.ascent / f32::from(metrics.units_per_em); let ascent = metrics.ascent / f32::from(metrics.units_per_em);
let descent = metrics.descent / f32::from(metrics.units_per_em); let descent = metrics.descent / f32::from(metrics.units_per_em);
@ -529,13 +530,32 @@ fn shape_skip(
glyph_id, glyph_id,
color_opt: attrs.color_opt, color_opt: attrs.color_opt,
metadata: attrs.metadata, metadata: attrs.metadata,
cache_key_flags: attrs.cache_key_flags, cache_key_flags: override_fake_italic(
attrs.cache_key_flags,
font.as_ref(),
&attrs,
),
metrics_opt: attrs.metrics_opt.map(Into::into), metrics_opt: attrs.metrics_opt.map(Into::into),
} }
}), }),
); );
} }
fn override_fake_italic(
cache_key_flags: CacheKeyFlags,
font: &Font,
attrs: &Attrs,
) -> CacheKeyFlags {
cache_key_flags
| if !font.italic_or_oblique
&& (attrs.style == Style::Italic || attrs.style == Style::Oblique)
{
CacheKeyFlags::FAKE_ITALIC
} else {
CacheKeyFlags::empty()
}
}
/// A shaped glyph /// A shaped glyph
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ShapeGlyph { pub struct ShapeGlyph {