From adfd7dd0735d8a4efeac634c53bbf386e91a4c41 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 30 Mar 2019 20:13:30 +0100 Subject: =?UTF-8?q?Create=20complex=20font=5Finfo=20macro=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index fb81949a..44c7642e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,8 +25,9 @@ //! // (the default sans-serif fonts and a fallback for the emoji). //! let mut compiler = Compiler::new(); //! compiler.add_font_provider(FileSystemFontProvider::new("../fonts", vec![ -//! // Font family name, generic families, file, bold, italic -//! ("NotoSans-Regular.ttf", font_info!("NotoSans", [SansSerif], false, false)), +//! ("NotoSans-Regular.ttf", font_info!(["NotoSans", "Noto", SansSerif])), +//! ("NotoSans-Italic.ttf", font_info!(["NotoSans", "Noto", SansSerif], italic)), +//! ("NotoEmoji-Regular.ttf", font_info!(["NotoEmoji", "Noto", SansSerif, Serif, Monospace])), //! ])); //! //! // Compile the source code with the compiler. @@ -152,13 +153,12 @@ mod test { // Create compiler let mut compiler = Compiler::new(); compiler.add_font_provider(FileSystemFontProvider::new("../fonts", vec![ - ("NotoSans-Regular.ttf", font_info!("NotoSans", [SansSerif], false, false)), - ("NotoSans-Bold.ttf", font_info!("NotoSans", [SansSerif], true, false)), - ("NotoSans-Italic.ttf", font_info!("NotoSans", [SansSerif], false, true)), - ("NotoSans-BoldItalic.ttf", font_info!("NotoSans", [SansSerif], true, true)), - ("NotoSansMath-Regular.ttf", font_info!("NotoSansMath", [SansSerif], false, false)), - ("NotoEmoji-Regular.ttf", - font_info!("NotoEmoji", [SansSerif, Serif, Monospace], false, false)), + ("NotoSans-Regular.ttf", font_info!(["NotoSans", "Noto", SansSerif])), + ("NotoSans-Italic.ttf", font_info!(["NotoSans", "Noto", SansSerif], italic)), + ("NotoSans-Bold.ttf", font_info!(["NotoSans", "Noto", SansSerif], bold)), + ("NotoSans-BoldItalic.ttf", font_info!(["NotoSans", "Noto", SansSerif], italic, bold)), + ("NotoSansMath-Regular.ttf", font_info!(["NotoSansMath", "Noto", SansSerif])), + ("NotoEmoji-Regular.ttf", font_info!(["NotoEmoji", "Noto", SansSerif, Serif, Monospace])), ])); // Compile into document -- cgit v1.2.3