From 02dc29d18a7b67edf0eaa5d125be22eec6cfebb7 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 6 Feb 2020 11:15:48 +0100 Subject: =?UTF-8?q?Highlight=20bold=20/=20italic=20/=20monospace=20?= =?UTF-8?q?=F0=9F=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/text.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'src/layout/text.rs') diff --git a/src/layout/text.rs b/src/layout/text.rs index c6fa45d1..614d59fd 100644 --- a/src/layout/text.rs +++ b/src/layout/text.rs @@ -113,13 +113,28 @@ impl<'a> TextLayouter<'a> { async fn select_font(&mut self, c: char) -> Option<(FontIndex, Size)> { let mut loader = self.ctx.loader.borrow_mut(); - let query = FontQuery { - fallback: &self.ctx.style.fallback, - variant: self.ctx.style.variant, - c, + let mut variant = self.ctx.style.variant; + if self.ctx.style.bolder { + variant.weight.0 += 300; + } + + let queried = if self.ctx.style.monospace { + loader.get(FontQuery { + // FIXME: This is a hack. + fallback: std::iter::once("source code pro") + .chain(self.ctx.style.fallback.iter()), + variant, + c, + }).await + } else { + loader.get(FontQuery { + fallback: self.ctx.style.fallback.iter(), + variant, + c, + }).await }; - if let Some((font, index)) = loader.get(query).await { + if let Some((font, index)) = queried { // Determine the width of the char. let header = font.read_table::
().ok()?; let font_unit_ratio = 1.0 / (header.units_per_em as f32); -- cgit v1.2.3