From 486f7b1bca15af3805ae1a8f63d72827f227a3d2 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 18 May 2022 18:09:32 +0200 Subject: [PATCH] Forbid `auto` for raw and math family --- src/library/math/mod.rs | 10 +++------- src/library/text/raw.rs | 11 +++-------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/library/math/mod.rs b/src/library/math/mod.rs index ad01f28a6..5656890d6 100644 --- a/src/library/math/mod.rs +++ b/src/library/math/mod.rs @@ -15,11 +15,9 @@ pub struct MathNode { #[node(showable)] impl MathNode { - /// The raw text's font family. Just the normal text family if `auto`. + /// The math font family. #[property(referenced)] - pub const FAMILY: Smart = - Smart::Custom(FontFamily::new("Latin Modern Math")); - + pub const FAMILY: FontFamily = FontFamily::new("Latin Modern Math"); /// The spacing above display math. #[property(resolve, shorthand(around))] pub const ABOVE: Option = Some(Ratio::one().into()); @@ -62,9 +60,7 @@ impl Show for MathNode { mut realized: Content, ) -> TypResult { let mut map = StyleMap::new(); - if let Smart::Custom(family) = styles.get(Self::FAMILY) { - map.set_family(family.clone(), styles); - } + map.set_family(styles.get(Self::FAMILY).clone(), styles); if self.display { realized = realized.spaced(styles.get(Self::ABOVE), styles.get(Self::BELOW)); diff --git a/src/library/text/raw.rs b/src/library/text/raw.rs index 52cabe3d7..9db9c4434 100644 --- a/src/library/text/raw.rs +++ b/src/library/text/raw.rs @@ -27,11 +27,9 @@ impl RawNode { /// The language to syntax-highlight in. #[property(referenced)] pub const LANG: Option = None; - - /// The raw text's font family. Just the normal text family if `none`. + /// The raw text's font family. #[property(referenced)] - pub const FAMILY: Smart = Smart::Custom(FontFamily::new("IBM Plex Mono")); - + pub const FAMILY: FontFamily = FontFamily::new("IBM Plex Mono"); /// The spacing above block-level raw. #[property(resolve, shorthand(around))] pub const ABOVE: Option = Some(Ratio::one().into()); @@ -124,14 +122,11 @@ impl Show for RawNode { mut realized: Content, ) -> TypResult { let mut map = StyleMap::new(); + map.set_family(styles.get(Self::FAMILY).clone(), styles); map.set(TextNode::OVERHANG, false); map.set(TextNode::HYPHENATE, Smart::Custom(Hyphenate(false))); map.set(TextNode::SMART_QUOTES, false); - if let Smart::Custom(family) = styles.get(Self::FAMILY) { - map.set_family(family.clone(), styles); - } - if self.block { realized = realized.spaced(styles.get(Self::ABOVE), styles.get(Self::BELOW)); }