From 2818ceee44a523308d83643b8d2f921b4a5e5d2e Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 30 Sep 2021 22:46:03 +0200 Subject: New default fonts --- src/eval/state.rs | 14 +++++++------- src/loading/fs.rs | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/eval/state.rs b/src/eval/state.rs index b6c0c9af..a71ae39a 100644 --- a/src/eval/state.rs +++ b/src/eval/state.rs @@ -110,8 +110,8 @@ pub struct ParState { impl Default for ParState { fn default() -> Self { Self { - par_spacing: Relative::new(1.0).into(), - line_spacing: Relative::new(0.5).into(), + par_spacing: Relative::new(1.2).into(), + line_spacing: Relative::new(0.65).into(), } } } @@ -235,12 +235,12 @@ pub struct FamilyState { impl Default for FamilyState { fn default() -> Self { Self { - list: Rc::new(vec![FontFamily::Serif]), - serif: Rc::new(vec!["eb garamond".into()]), - sans_serif: Rc::new(vec!["pt sans".into()]), - monospace: Rc::new(vec!["inconsolata".into()]), + list: Rc::new(vec![FontFamily::SansSerif]), + serif: Rc::new(vec!["ibm plex serif".into()]), + sans_serif: Rc::new(vec!["ibm plex sans".into()]), + monospace: Rc::new(vec!["ibm plex mono".into()]), base: Rc::new(vec![ - "eb garamond".into(), + "ibm plex sans".into(), "latin modern math".into(), "twitter color emoji".into(), ]), diff --git a/src/loading/fs.rs b/src/loading/fs.rs index fc49d6b5..34d8e9b5 100644 --- a/src/loading/fs.rs +++ b/src/loading/fs.rs @@ -157,12 +157,12 @@ mod tests { paths.sort(); assert_eq!(paths, [ - Path::new("fonts/EBGaramond-Bold.ttf"), - Path::new("fonts/EBGaramond-BoldItalic.ttf"), - Path::new("fonts/EBGaramond-Italic.ttf"), - Path::new("fonts/EBGaramond-Regular.ttf"), - Path::new("fonts/Inconsolata-Bold.ttf"), - Path::new("fonts/Inconsolata-Regular.ttf"), + Path::new("fonts/IBMPlexMono-Regular.ttf"), + Path::new("fonts/IBMPlexSans-Bold.ttf"), + Path::new("fonts/IBMPlexSans-BoldItalic.ttf"), + Path::new("fonts/IBMPlexSans-Italic.ttf"), + Path::new("fonts/IBMPlexSans-Regular.ttf"), + Path::new("fonts/IBMPlexSerif-Regular.ttf"), Path::new("fonts/LatinModernMath.otf"), Path::new("fonts/NotoSansArabic-Regular.ttf"), Path::new("fonts/NotoSerifCJKsc-Regular.otf"), -- cgit v1.2.3