konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forbid auto for raw and math family

Browse Source
This commit is contained in:
Laurenz 2022-05-18 18:09:32 +02:00
parent 242b01549a
commit 486f7b1bca
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/library/math/mod.rs
View File

@ -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<FontFamily> =
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<BlockSpacing> = Some(Ratio::one().into());
@ -62,9 +60,7 @@ impl Show for MathNode {
mut realized: Content,
) -> TypResult<Content> {
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));

11
src/library/text/raw.rs
View File

@ -27,11 +27,9 @@ impl RawNode {
/// The language to syntax-highlight in.
#[property(referenced)]
pub const LANG: Option<EcoString> = 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<FontFamily> = 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<BlockSpacing> = Some(Ratio::one().into());
@ -124,14 +122,11 @@ impl Show for RawNode {
mut realized: Content,
) -> TypResult<Content> {
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));
}