diff --git a/NOTICE b/NOTICE index 813fdfac..46834822 100644 --- a/NOTICE +++ b/NOTICE @@ -77,7 +77,7 @@ The SIL Open Font License Version 1.1 applies to: Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public), with Reserved Font Names "PT Sans" and "ParaType". -* Fira math fonts in assets/fonts/FiraMath*.otf +* Fira Math fonts in assets/fonts/FiraMath*.otf Copyright (C) 2018--2021 by Xiangdong Zeng (https://github.com/firamath/firamath) @@ -918,3 +918,198 @@ licenses. Creative Commons may be contacted at creativecommons.org. ================================================================================ + +================================================================================ +The terms below apply to: + +* DejaVu fonts in assets/fonts/DejaVu*.ttf + (https://github.com/dejavu-fonts/dejavu-fonts) + +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, +SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE +THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ +================================================================================ diff --git a/assets/fonts/DejaVuSansMono-Bold.ttf b/assets/fonts/DejaVuSansMono-Bold.ttf new file mode 100644 index 00000000..8184ced8 Binary files /dev/null and b/assets/fonts/DejaVuSansMono-Bold.ttf differ diff --git a/assets/fonts/DejaVuSansMono.ttf b/assets/fonts/DejaVuSansMono.ttf new file mode 100644 index 00000000..f5786022 Binary files /dev/null and b/assets/fonts/DejaVuSansMono.ttf differ diff --git a/assets/fonts/IBMPlexMono-Bold.ttf b/assets/fonts/IBMPlexMono-Bold.ttf deleted file mode 100644 index 2ad2fa1d..00000000 Binary files a/assets/fonts/IBMPlexMono-Bold.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexMono-Regular.ttf b/assets/fonts/IBMPlexMono-Regular.ttf deleted file mode 100644 index ef3bc4b3..00000000 Binary files a/assets/fonts/IBMPlexMono-Regular.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSans-Bold.ttf b/assets/fonts/IBMPlexSans-Bold.ttf deleted file mode 100644 index 0e9eb07b..00000000 Binary files a/assets/fonts/IBMPlexSans-Bold.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSans-BoldItalic.ttf b/assets/fonts/IBMPlexSans-BoldItalic.ttf deleted file mode 100644 index 07f8bc87..00000000 Binary files a/assets/fonts/IBMPlexSans-BoldItalic.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSans-Italic.ttf b/assets/fonts/IBMPlexSans-Italic.ttf deleted file mode 100644 index 9ef096fe..00000000 Binary files a/assets/fonts/IBMPlexSans-Italic.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSans-Medium.ttf b/assets/fonts/IBMPlexSans-Medium.ttf deleted file mode 100644 index 9395402b..00000000 Binary files a/assets/fonts/IBMPlexSans-Medium.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSans-Regular.ttf b/assets/fonts/IBMPlexSans-Regular.ttf deleted file mode 100644 index f1c3da2f..00000000 Binary files a/assets/fonts/IBMPlexSans-Regular.ttf and /dev/null differ diff --git a/assets/fonts/IBMPlexSansDevanagari-Regular.ttf b/assets/fonts/IBMPlexSansDevanagari-Regular.ttf deleted file mode 100644 index 5d7c8f0f..00000000 Binary files a/assets/fonts/IBMPlexSansDevanagari-Regular.ttf and /dev/null differ diff --git a/assets/fonts/LatinModernRoman-Bold.otf b/assets/fonts/LatinModernRoman-Bold.otf deleted file mode 100644 index 7d6afa73..00000000 Binary files a/assets/fonts/LatinModernRoman-Bold.otf and /dev/null differ diff --git a/assets/fonts/LatinModernRoman-Regular.otf b/assets/fonts/LatinModernRoman-Regular.otf deleted file mode 100644 index 6a96b468..00000000 Binary files a/assets/fonts/LatinModernRoman-Regular.otf and /dev/null differ diff --git a/assets/fonts/NewCM10-Bold.otf b/assets/fonts/NewCM10-Bold.otf new file mode 100644 index 00000000..75245c65 Binary files /dev/null and b/assets/fonts/NewCM10-Bold.otf differ diff --git a/assets/fonts/NewCM10-Regular.otf b/assets/fonts/NewCM10-Regular.otf new file mode 100644 index 00000000..8afe6b42 Binary files /dev/null and b/assets/fonts/NewCM10-Regular.otf differ diff --git a/assets/fonts/NotoSerif-Regular.ttf b/assets/fonts/NotoSerif-Regular.ttf deleted file mode 100644 index 3d42893d..00000000 Binary files a/assets/fonts/NotoSerif-Regular.ttf and /dev/null differ diff --git a/docs/src/general/changelog.md b/docs/src/general/changelog.md index 6d3ad42f..b9f5c8d2 100644 --- a/docs/src/general/changelog.md +++ b/docs/src/general/changelog.md @@ -5,7 +5,16 @@ description: | --- # Changelog -## Unreleased +## February 25, 2023 +- Font changes + - New default font: Linux Libertine + - New default font for raw blocks: DejaVu Sans Mono + - New default font for math: Book weight of New Computer Modern Math + - Lots of new math fonts available + - Removed Latin Modern fonts in favor of New Computer Modern family + - Removed unnecessary smallcaps fonts which are already accessible through + the corresponding main font and the [`smallcaps`]($func/smallcaps) function +- Improved default spacing for headings - Added [`panic`]($func/panic) function - Added [`clusters`]($type/string.clusters) and [`codepoints`]($type/string.codepoints) methods for strings diff --git a/docs/src/reference/styling.md b/docs/src/reference/styling.md index 8e3937b4..a8e38b4f 100644 --- a/docs/src/reference/styling.md +++ b/docs/src/reference/styling.md @@ -20,7 +20,7 @@ settable parameters. In the example below, we use two set rules to change the [heading numbering]($func/heading.numbering) style. ```example -#set text("Latin Modern Roman") +#set text("New Computer Modern") #set heading(numbering: "I.") = Introduction @@ -131,7 +131,6 @@ to: See the documentation of the [`label` function]($func/label) for more details. ```example -#set text("Noto Serif") #show "Project": smallcaps #show "badly": "great" diff --git a/docs/src/tutorial/2-formatting.md b/docs/src/tutorial/2-formatting.md index dd0352bd..4c9704ef 100644 --- a/docs/src/tutorial/2-formatting.md +++ b/docs/src/tutorial/2-formatting.md @@ -100,7 +100,7 @@ Let's add a few more styles to our document. We want larger margins and a serif font. For the purposes of the example, we'll also set another page size. ```example -#set text(10pt, "Latin Modern Roman") +#set text(10pt, "New Computer Modern") #set page( "a6", margin: (x: 1.8cm, y: 1.5cm), @@ -151,7 +151,7 @@ We could also have specified separate margins for each side by passing a dictionary with the keys `{left}`, `{right}`, `{top}`, and `{bottom}`. Next is the set [`text`]($func/text) set rule. Here, we set the font size to -`{10pt}` and font family to `{"Latin Modern Roman"}`. The Typst app comes with +`{10pt}` and font family to `{"New Computer Modern"}`. The Typst app comes with many fonts that you can try for your document. When you are in the text function's argument list, you can discover the available fonts in the autocomplete panel. @@ -171,7 +171,7 @@ can do this by setting the `numbering` parameter of the [`heading`]($func/heading) function. ```example ->>> #set text("Latin Modern Roman") +>>> #set text("New Computer Modern") #set heading(numbering: "1.") = Introduction @@ -190,7 +190,7 @@ each level. We can also use [letters, roman numerals, and symbols]($func/numbering) for our headings: ```example ->>> #set text("Latin Modern Roman") +>>> #set text("New Computer Modern") #set heading(numbering: "1.a") = Introduction diff --git a/library/src/math/mod.rs b/library/src/math/mod.rs index 84af15cb..c455d106 100644 --- a/library/src/math/mod.rs +++ b/library/src/math/mod.rs @@ -30,6 +30,7 @@ pub use self::underover::*; use ttf_parser::{GlyphId, Rect}; use typst::font::Font; +use typst::font::FontWeight; use typst::model::{Guard, Module, Scope, SequenceNode, StyledNode}; use unicode_math_class::MathClass; @@ -113,7 +114,7 @@ pub fn module() -> Module { /// /// ## Example /// ```example -/// #set text("Latin Modern Roman") +/// #set text("New Computer Modern") /// /// Let $a$, $b$, and $c$ be the side /// lengths of right-angled triangle. @@ -179,10 +180,12 @@ impl Show for FormulaNode { impl Finalize for FormulaNode { fn finalize(&self, realized: Content) -> Content { - realized.styled( - TextNode::FAMILY, - FallbackList(vec![FontFamily::new("New Computer Modern Math")]), - ) + realized + .styled(TextNode::WEIGHT, FontWeight::from_number(450)) + .styled( + TextNode::FAMILY, + FallbackList(vec![FontFamily::new("New Computer Modern Math")]), + ) } } diff --git a/library/src/meta/heading.rs b/library/src/meta/heading.rs index c9032e88..f108cad1 100644 --- a/library/src/meta/heading.rs +++ b/library/src/meta/heading.rs @@ -1,9 +1,9 @@ use typst::font::FontWeight; use super::Numbering; -use crate::layout::{BlockNode, VNode}; +use crate::layout::{BlockNode, HNode, VNode}; use crate::prelude::*; -use crate::text::{SpaceNode, TextNode, TextSize}; +use crate::text::{TextNode, TextSize}; /// # Heading /// A section heading. @@ -145,7 +145,9 @@ impl Show for HeadingNode { let mut realized = self.title.clone(); let numbers = this.field("numbers").unwrap(); if numbers != Value::None { - realized = numbers.display() + SpaceNode.pack() + realized; + realized = numbers.display() + + HNode { amount: Em::new(0.3).into(), weak: true }.pack() + + realized; } Ok(BlockNode { body: realized, @@ -166,7 +168,7 @@ impl Finalize for HeadingNode { let size = Em::new(scale); let above = Em::new(if self.level.get() == 1 { 1.8 } else { 1.44 }) / scale; - let below = Em::new(0.66) / scale; + let below = Em::new(0.75) / scale; let mut map = StyleMap::new(); map.set(TextNode::SIZE, TextSize(size.into())); diff --git a/library/src/text/misc.rs b/library/src/text/misc.rs index 68d46d80..147f758a 100644 --- a/library/src/text/misc.rs +++ b/library/src/text/misc.rs @@ -321,7 +321,6 @@ impl Case { /// ## Example /// ```example /// #set par(justify: true) -/// #set text(family: "Noto Serif") /// #set heading(numbering: "I.") /// /// #show heading: it => { diff --git a/library/src/text/mod.rs b/library/src/text/mod.rs index 29217944..bdd2d0c2 100644 --- a/library/src/text/mod.rs +++ b/library/src/text/mod.rs @@ -80,7 +80,8 @@ impl TextNode { impl TextNode { /// A prioritized sequence of font families. #[property(skip, referenced)] - pub const FAMILY: FallbackList = FallbackList(vec![FontFamily::new("IBM Plex Sans")]); + pub const FAMILY: FallbackList = + FallbackList(vec![FontFamily::new("Linux Libertine")]); /// Whether to allow last resort font fallback when the primary font list /// contains no match. This lets Typst search through all available fonts @@ -115,7 +116,7 @@ impl TextNode { /// style later if you change your mind about how to signify the emphasis. /// /// ```example - /// #text("IBM Plex Sans", style: "italic")[Italic] + /// #text("Linux Libertine", style: "italic")[Italic] /// #text("DejaVu Sans", style: "oblique")[Oblique] /// ``` pub const STYLE: FontStyle = FontStyle::Normal; diff --git a/library/src/text/raw.rs b/library/src/text/raw.rs index 225c257d..ec11582c 100644 --- a/library/src/text/raw.rs +++ b/library/src/text/raw.rs @@ -4,6 +4,7 @@ use typst::syntax::{self, LinkedNode}; use super::{ FallbackList, FontFamily, Hyphenate, LinebreakNode, SmartQuoteNode, TextNode, + TextSize, }; use crate::layout::BlockNode; use crate::prelude::*; @@ -216,8 +217,12 @@ impl Finalize for RawNode { let mut map = StyleMap::new(); map.set(TextNode::OVERHANG, false); map.set(TextNode::HYPHENATE, Hyphenate(Smart::Custom(false))); + map.set(TextNode::SIZE, TextSize(Em::new(0.8).into())); + map.set( + TextNode::FAMILY, + FallbackList(vec![FontFamily::new("DejaVu Sans Mono")]), + ); map.set(SmartQuoteNode::ENABLED, false); - map.set(TextNode::FAMILY, FallbackList(vec![FontFamily::new("IBM Plex Mono")])); realized.styled_with_map(map) } } diff --git a/library/src/text/shaping.rs b/library/src/text/shaping.rs index 6d4e41dc..feb9b24b 100644 --- a/library/src/text/shaping.rs +++ b/library/src/text/shaping.rs @@ -551,7 +551,7 @@ pub fn variant(styles: StyleChain) -> FontVariant { /// Resolve a prioritized iterator over the font families. pub fn families(styles: StyleChain) -> impl Iterator + Clone { const FALLBACKS: &[&str] = &[ - "ibm plex sans", + "linux libertine", "twitter color emoji", "noto color emoji", "apple color emoji", diff --git a/tests/ref/bugs/columns-1.png b/tests/ref/bugs/columns-1.png index ecb3d417..4b462b60 100644 Binary files a/tests/ref/bugs/columns-1.png and b/tests/ref/bugs/columns-1.png differ diff --git a/tests/ref/bugs/flow-1.png b/tests/ref/bugs/flow-1.png index 2c5013c4..662a7b14 100644 Binary files a/tests/ref/bugs/flow-1.png and b/tests/ref/bugs/flow-1.png differ diff --git a/tests/ref/bugs/flow-2.png b/tests/ref/bugs/flow-2.png index 7661cf8f..c7ece308 100644 Binary files a/tests/ref/bugs/flow-2.png and b/tests/ref/bugs/flow-2.png differ diff --git a/tests/ref/bugs/flow-3.png b/tests/ref/bugs/flow-3.png index e12d5e12..25acc06d 100644 Binary files a/tests/ref/bugs/flow-3.png and b/tests/ref/bugs/flow-3.png differ diff --git a/tests/ref/bugs/flow-4.png b/tests/ref/bugs/flow-4.png index 59caa2fd..2adcbe15 100644 Binary files a/tests/ref/bugs/flow-4.png and b/tests/ref/bugs/flow-4.png differ diff --git a/tests/ref/bugs/grid-1.png b/tests/ref/bugs/grid-1.png index 1ed227e9..5570c165 100644 Binary files a/tests/ref/bugs/grid-1.png and b/tests/ref/bugs/grid-1.png differ diff --git a/tests/ref/bugs/grid-2.png b/tests/ref/bugs/grid-2.png index 2d39e186..ec2bd660 100644 Binary files a/tests/ref/bugs/grid-2.png and b/tests/ref/bugs/grid-2.png differ diff --git a/tests/ref/bugs/grid-3.png b/tests/ref/bugs/grid-3.png index c4569851..6b5ae649 100644 Binary files a/tests/ref/bugs/grid-3.png and b/tests/ref/bugs/grid-3.png differ diff --git a/tests/ref/bugs/place-base.png b/tests/ref/bugs/place-base.png index 5245d256..4442b173 100644 Binary files a/tests/ref/bugs/place-base.png and b/tests/ref/bugs/place-base.png differ diff --git a/tests/ref/coma.png b/tests/ref/coma.png index 8bfbc203..fc0f6ba1 100644 Binary files a/tests/ref/coma.png and b/tests/ref/coma.png differ diff --git a/tests/ref/compiler/array.png b/tests/ref/compiler/array.png index d41e2cbb..a7c52f1a 100644 Binary files a/tests/ref/compiler/array.png and b/tests/ref/compiler/array.png differ diff --git a/tests/ref/compiler/bench.png b/tests/ref/compiler/bench.png deleted file mode 100644 index cadc0914..00000000 Binary files a/tests/ref/compiler/bench.png and /dev/null differ diff --git a/tests/ref/compiler/block.png b/tests/ref/compiler/block.png index c5782da5..21a38de2 100644 Binary files a/tests/ref/compiler/block.png and b/tests/ref/compiler/block.png differ diff --git a/tests/ref/compiler/break-continue.png b/tests/ref/compiler/break-continue.png index e81c29fd..66197443 100644 Binary files a/tests/ref/compiler/break-continue.png and b/tests/ref/compiler/break-continue.png differ diff --git a/tests/ref/compiler/call.png b/tests/ref/compiler/call.png index f0f2e852..82e1bb55 100644 Binary files a/tests/ref/compiler/call.png and b/tests/ref/compiler/call.png differ diff --git a/tests/ref/compiler/closure.png b/tests/ref/compiler/closure.png index b4c83256..07c171c5 100644 Binary files a/tests/ref/compiler/closure.png and b/tests/ref/compiler/closure.png differ diff --git a/tests/ref/compiler/comment.png b/tests/ref/compiler/comment.png index 5928dc87..608df6ea 100644 Binary files a/tests/ref/compiler/comment.png and b/tests/ref/compiler/comment.png differ diff --git a/tests/ref/compiler/construct.png b/tests/ref/compiler/construct.png index aac79268..eba9aa9f 100644 Binary files a/tests/ref/compiler/construct.png and b/tests/ref/compiler/construct.png differ diff --git a/tests/ref/compiler/dict.png b/tests/ref/compiler/dict.png index 04a5dd7d..c97b2dbf 100644 Binary files a/tests/ref/compiler/dict.png and b/tests/ref/compiler/dict.png differ diff --git a/tests/ref/compiler/for.png b/tests/ref/compiler/for.png index 8c08ab04..48fde203 100644 Binary files a/tests/ref/compiler/for.png and b/tests/ref/compiler/for.png differ diff --git a/tests/ref/compiler/highlight.png b/tests/ref/compiler/highlight.png index 18e52dc5..182aca45 100644 Binary files a/tests/ref/compiler/highlight.png and b/tests/ref/compiler/highlight.png differ diff --git a/tests/ref/compiler/if.png b/tests/ref/compiler/if.png index cca9a570..bd3adc88 100644 Binary files a/tests/ref/compiler/if.png and b/tests/ref/compiler/if.png differ diff --git a/tests/ref/compiler/import.png b/tests/ref/compiler/import.png index 5fbd6e89..bf95f45d 100644 Binary files a/tests/ref/compiler/import.png and b/tests/ref/compiler/import.png differ diff --git a/tests/ref/compiler/include.png b/tests/ref/compiler/include.png index 09ff7498..7fdb0310 100644 Binary files a/tests/ref/compiler/include.png and b/tests/ref/compiler/include.png differ diff --git a/tests/ref/compiler/label.png b/tests/ref/compiler/label.png index ffad978c..21764f97 100644 Binary files a/tests/ref/compiler/label.png and b/tests/ref/compiler/label.png differ diff --git a/tests/ref/compiler/let.png b/tests/ref/compiler/let.png index 7a45eca1..4423fe0a 100644 Binary files a/tests/ref/compiler/let.png and b/tests/ref/compiler/let.png differ diff --git a/tests/ref/compiler/ops.png b/tests/ref/compiler/ops.png index ef6ffb4a..51fb9d1a 100644 Binary files a/tests/ref/compiler/ops.png and b/tests/ref/compiler/ops.png differ diff --git a/tests/ref/compiler/repr.png b/tests/ref/compiler/repr.png index b81083f5..fe0b0c55 100644 Binary files a/tests/ref/compiler/repr.png and b/tests/ref/compiler/repr.png differ diff --git a/tests/ref/compiler/return.png b/tests/ref/compiler/return.png index 6d558e62..e8fa3ab2 100644 Binary files a/tests/ref/compiler/return.png and b/tests/ref/compiler/return.png differ diff --git a/tests/ref/compiler/set.png b/tests/ref/compiler/set.png index 94470239..26409396 100644 Binary files a/tests/ref/compiler/set.png and b/tests/ref/compiler/set.png differ diff --git a/tests/ref/compiler/shorthand.png b/tests/ref/compiler/shorthand.png index ddb679f5..2f1634ca 100644 Binary files a/tests/ref/compiler/shorthand.png and b/tests/ref/compiler/shorthand.png differ diff --git a/tests/ref/compiler/show-bare.png b/tests/ref/compiler/show-bare.png index ff746d26..c6a1e101 100644 Binary files a/tests/ref/compiler/show-bare.png and b/tests/ref/compiler/show-bare.png differ diff --git a/tests/ref/compiler/show-node.png b/tests/ref/compiler/show-node.png index 1ea33e4f..014c45bf 100644 Binary files a/tests/ref/compiler/show-node.png and b/tests/ref/compiler/show-node.png differ diff --git a/tests/ref/compiler/show-recursive.png b/tests/ref/compiler/show-recursive.png index 4c47a7af..9e502c3f 100644 Binary files a/tests/ref/compiler/show-recursive.png and b/tests/ref/compiler/show-recursive.png differ diff --git a/tests/ref/compiler/show-selector.png b/tests/ref/compiler/show-selector.png index 9239602c..be5ba463 100644 Binary files a/tests/ref/compiler/show-selector.png and b/tests/ref/compiler/show-selector.png differ diff --git a/tests/ref/compiler/show-text.png b/tests/ref/compiler/show-text.png index fc76f132..4d5033bb 100644 Binary files a/tests/ref/compiler/show-text.png and b/tests/ref/compiler/show-text.png differ diff --git a/tests/ref/compiler/while.png b/tests/ref/compiler/while.png index 236be426..d0f86473 100644 Binary files a/tests/ref/compiler/while.png and b/tests/ref/compiler/while.png differ diff --git a/tests/ref/compute/construct.png b/tests/ref/compute/construct.png index 66ccd3ba..e1717473 100644 Binary files a/tests/ref/compute/construct.png and b/tests/ref/compute/construct.png differ diff --git a/tests/ref/compute/data.png b/tests/ref/compute/data.png index 5b232083..2dab6875 100644 Binary files a/tests/ref/compute/data.png and b/tests/ref/compute/data.png differ diff --git a/tests/ref/layout/align.png b/tests/ref/layout/align.png index 9b6e268c..a0113597 100644 Binary files a/tests/ref/layout/align.png and b/tests/ref/layout/align.png differ diff --git a/tests/ref/layout/block-sizing.png b/tests/ref/layout/block-sizing.png index d0a488ea..ff95c34c 100644 Binary files a/tests/ref/layout/block-sizing.png and b/tests/ref/layout/block-sizing.png differ diff --git a/tests/ref/layout/columns.png b/tests/ref/layout/columns.png index df7b7084..4bf76146 100644 Binary files a/tests/ref/layout/columns.png and b/tests/ref/layout/columns.png differ diff --git a/tests/ref/layout/container-fill.png b/tests/ref/layout/container-fill.png index c2cc78d4..74fdc73d 100644 Binary files a/tests/ref/layout/container-fill.png and b/tests/ref/layout/container-fill.png differ diff --git a/tests/ref/layout/container.png b/tests/ref/layout/container.png index b825471c..ce298d29 100644 Binary files a/tests/ref/layout/container.png and b/tests/ref/layout/container.png differ diff --git a/tests/ref/layout/enum-numbering.png b/tests/ref/layout/enum-numbering.png index 6745a2f5..4804d573 100644 Binary files a/tests/ref/layout/enum-numbering.png and b/tests/ref/layout/enum-numbering.png differ diff --git a/tests/ref/layout/enum.png b/tests/ref/layout/enum.png index 97c3f7a7..d80a584c 100644 Binary files a/tests/ref/layout/enum.png and b/tests/ref/layout/enum.png differ diff --git a/tests/ref/layout/flow-orphan.png b/tests/ref/layout/flow-orphan.png index 1e5fade4..434636c4 100644 Binary files a/tests/ref/layout/flow-orphan.png and b/tests/ref/layout/flow-orphan.png differ diff --git a/tests/ref/layout/grid-1.png b/tests/ref/layout/grid-1.png index 99a97bb7..9e33772c 100644 Binary files a/tests/ref/layout/grid-1.png and b/tests/ref/layout/grid-1.png differ diff --git a/tests/ref/layout/grid-2.png b/tests/ref/layout/grid-2.png index 8bc22660..23874076 100644 Binary files a/tests/ref/layout/grid-2.png and b/tests/ref/layout/grid-2.png differ diff --git a/tests/ref/layout/grid-3.png b/tests/ref/layout/grid-3.png index f6c17835..abae5c7b 100644 Binary files a/tests/ref/layout/grid-3.png and b/tests/ref/layout/grid-3.png differ diff --git a/tests/ref/layout/grid-5.png b/tests/ref/layout/grid-5.png index 2e9d1705..a57493e4 100644 Binary files a/tests/ref/layout/grid-5.png and b/tests/ref/layout/grid-5.png differ diff --git a/tests/ref/layout/grid-auto-shrink.png b/tests/ref/layout/grid-auto-shrink.png index 64b14f63..34995215 100644 Binary files a/tests/ref/layout/grid-auto-shrink.png and b/tests/ref/layout/grid-auto-shrink.png differ diff --git a/tests/ref/layout/grid-rtl.png b/tests/ref/layout/grid-rtl.png index d0cdb16e..603bd8af 100644 Binary files a/tests/ref/layout/grid-rtl.png and b/tests/ref/layout/grid-rtl.png differ diff --git a/tests/ref/layout/hide.png b/tests/ref/layout/hide.png index 6450d669..7367e8ce 100644 Binary files a/tests/ref/layout/hide.png and b/tests/ref/layout/hide.png differ diff --git a/tests/ref/layout/list-attach.png b/tests/ref/layout/list-attach.png index 9b0e4c68..4a6a4573 100644 Binary files a/tests/ref/layout/list-attach.png and b/tests/ref/layout/list-attach.png differ diff --git a/tests/ref/layout/list-marker.png b/tests/ref/layout/list-marker.png index cd0eab44..5d8523eb 100644 Binary files a/tests/ref/layout/list-marker.png and b/tests/ref/layout/list-marker.png differ diff --git a/tests/ref/layout/list.png b/tests/ref/layout/list.png index b184aefa..864a6e1d 100644 Binary files a/tests/ref/layout/list.png and b/tests/ref/layout/list.png differ diff --git a/tests/ref/layout/pad.png b/tests/ref/layout/pad.png index 55880ed1..c33b9736 100644 Binary files a/tests/ref/layout/pad.png and b/tests/ref/layout/pad.png differ diff --git a/tests/ref/layout/page-margin.png b/tests/ref/layout/page-margin.png index 6952189b..1a296141 100644 Binary files a/tests/ref/layout/page-margin.png and b/tests/ref/layout/page-margin.png differ diff --git a/tests/ref/layout/page-marginals.png b/tests/ref/layout/page-marginals.png index 78dd4591..5ad67ab4 100644 Binary files a/tests/ref/layout/page-marginals.png and b/tests/ref/layout/page-marginals.png differ diff --git a/tests/ref/layout/page.png b/tests/ref/layout/page.png index 4168d201..4881fa2b 100644 Binary files a/tests/ref/layout/page.png and b/tests/ref/layout/page.png differ diff --git a/tests/ref/layout/pagebreak.png b/tests/ref/layout/pagebreak.png index 741ed50f..ab055643 100644 Binary files a/tests/ref/layout/pagebreak.png and b/tests/ref/layout/pagebreak.png differ diff --git a/tests/ref/layout/par-bidi.png b/tests/ref/layout/par-bidi.png index c9be82d4..0406fbf1 100644 Binary files a/tests/ref/layout/par-bidi.png and b/tests/ref/layout/par-bidi.png differ diff --git a/tests/ref/layout/par-indent.png b/tests/ref/layout/par-indent.png index 7a0bd4b6..7aca22c1 100644 Binary files a/tests/ref/layout/par-indent.png and b/tests/ref/layout/par-indent.png differ diff --git a/tests/ref/layout/par-justify.png b/tests/ref/layout/par-justify.png index e8b50723..1ef78332 100644 Binary files a/tests/ref/layout/par-justify.png and b/tests/ref/layout/par-justify.png differ diff --git a/tests/ref/layout/par-knuth.png b/tests/ref/layout/par-knuth.png index fca0892e..afe590b0 100644 Binary files a/tests/ref/layout/par-knuth.png and b/tests/ref/layout/par-knuth.png differ diff --git a/tests/ref/layout/par-simple.png b/tests/ref/layout/par-simple.png index 92f98b36..a645bfd8 100644 Binary files a/tests/ref/layout/par-simple.png and b/tests/ref/layout/par-simple.png differ diff --git a/tests/ref/layout/par.png b/tests/ref/layout/par.png index 2c19ffcf..f25f56d2 100644 Binary files a/tests/ref/layout/par.png and b/tests/ref/layout/par.png differ diff --git a/tests/ref/layout/place-background.png b/tests/ref/layout/place-background.png index eb2c4b71..d9c1c42f 100644 Binary files a/tests/ref/layout/place-background.png and b/tests/ref/layout/place-background.png differ diff --git a/tests/ref/layout/place.png b/tests/ref/layout/place.png index f40b8c68..10686ab5 100644 Binary files a/tests/ref/layout/place.png and b/tests/ref/layout/place.png differ diff --git a/tests/ref/layout/repeat.png b/tests/ref/layout/repeat.png index e6a27ad9..8e21f102 100644 Binary files a/tests/ref/layout/repeat.png and b/tests/ref/layout/repeat.png differ diff --git a/tests/ref/layout/spacing.png b/tests/ref/layout/spacing.png index 6fe539f0..c733fb02 100644 Binary files a/tests/ref/layout/spacing.png and b/tests/ref/layout/spacing.png differ diff --git a/tests/ref/layout/stack-1.png b/tests/ref/layout/stack-1.png index 54ee1a08..1a3133b8 100644 Binary files a/tests/ref/layout/stack-1.png and b/tests/ref/layout/stack-1.png differ diff --git a/tests/ref/layout/stack-2.png b/tests/ref/layout/stack-2.png index af58d9c4..047a73af 100644 Binary files a/tests/ref/layout/stack-2.png and b/tests/ref/layout/stack-2.png differ diff --git a/tests/ref/layout/table.png b/tests/ref/layout/table.png index 9c91b892..340d93a7 100644 Binary files a/tests/ref/layout/table.png and b/tests/ref/layout/table.png differ diff --git a/tests/ref/layout/terms.png b/tests/ref/layout/terms.png index 5c695795..f14781bd 100644 Binary files a/tests/ref/layout/terms.png and b/tests/ref/layout/terms.png differ diff --git a/tests/ref/math/attach.png b/tests/ref/math/attach.png index 9c92a93d..aeab9af8 100644 Binary files a/tests/ref/math/attach.png and b/tests/ref/math/attach.png differ diff --git a/tests/ref/math/content.png b/tests/ref/math/content.png index 728e1a1e..92fe9860 100644 Binary files a/tests/ref/math/content.png and b/tests/ref/math/content.png differ diff --git a/tests/ref/math/delimited.png b/tests/ref/math/delimited.png index 29a8c915..34b61a70 100644 Binary files a/tests/ref/math/delimited.png and b/tests/ref/math/delimited.png differ diff --git a/tests/ref/math/op.png b/tests/ref/math/op.png index bb191606..ac93559c 100644 Binary files a/tests/ref/math/op.png and b/tests/ref/math/op.png differ diff --git a/tests/ref/math/root.png b/tests/ref/math/root.png index 1f08de70..267249b0 100644 Binary files a/tests/ref/math/root.png and b/tests/ref/math/root.png differ diff --git a/tests/ref/math/shorthand.png b/tests/ref/math/shorthand.png deleted file mode 100644 index e53e9465..00000000 Binary files a/tests/ref/math/shorthand.png and /dev/null differ diff --git a/tests/ref/math/simple.png b/tests/ref/math/simple.png deleted file mode 100644 index 60597c9e..00000000 Binary files a/tests/ref/math/simple.png and /dev/null differ diff --git a/tests/ref/meta/document.png b/tests/ref/meta/document.png index aa3da163..6db26511 100644 Binary files a/tests/ref/meta/document.png and b/tests/ref/meta/document.png differ diff --git a/tests/ref/meta/heading.png b/tests/ref/meta/heading.png index b4f99665..065f8e68 100644 Binary files a/tests/ref/meta/heading.png and b/tests/ref/meta/heading.png differ diff --git a/tests/ref/meta/link.png b/tests/ref/meta/link.png index 267490ad..d80acc6f 100644 Binary files a/tests/ref/meta/link.png and b/tests/ref/meta/link.png differ diff --git a/tests/ref/meta/numbering.png b/tests/ref/meta/numbering.png index ed97d891..93b9f394 100644 Binary files a/tests/ref/meta/numbering.png and b/tests/ref/meta/numbering.png differ diff --git a/tests/ref/meta/outline.png b/tests/ref/meta/outline.png index 26ee49ad..7bcb971e 100644 Binary files a/tests/ref/meta/outline.png and b/tests/ref/meta/outline.png differ diff --git a/tests/ref/text/baseline.png b/tests/ref/text/baseline.png index c28b454a..4ad82e1f 100644 Binary files a/tests/ref/text/baseline.png and b/tests/ref/text/baseline.png differ diff --git a/tests/ref/text/deco.png b/tests/ref/text/deco.png index 94bd8a38..7e3195ca 100644 Binary files a/tests/ref/text/deco.png and b/tests/ref/text/deco.png differ diff --git a/tests/ref/text/edge.png b/tests/ref/text/edge.png index 0ae2ec12..da8ed34d 100644 Binary files a/tests/ref/text/edge.png and b/tests/ref/text/edge.png differ diff --git a/tests/ref/text/em.png b/tests/ref/text/em.png index 6440e629..04cccd53 100644 Binary files a/tests/ref/text/em.png and b/tests/ref/text/em.png differ diff --git a/tests/ref/text/emphasis.png b/tests/ref/text/emphasis.png index da04d8d1..333f7006 100644 Binary files a/tests/ref/text/emphasis.png and b/tests/ref/text/emphasis.png differ diff --git a/tests/ref/text/escape.png b/tests/ref/text/escape.png index 96860fc5..47677745 100644 Binary files a/tests/ref/text/escape.png and b/tests/ref/text/escape.png differ diff --git a/tests/ref/text/fallback.png b/tests/ref/text/fallback.png index bcd0942a..d5d79ee2 100644 Binary files a/tests/ref/text/fallback.png and b/tests/ref/text/fallback.png differ diff --git a/tests/ref/text/features.png b/tests/ref/text/features.png index 1c3b030c..566694c6 100644 Binary files a/tests/ref/text/features.png and b/tests/ref/text/features.png differ diff --git a/tests/ref/text/font.png b/tests/ref/text/font.png index 65badc0a..7cf8beb5 100644 Binary files a/tests/ref/text/font.png and b/tests/ref/text/font.png differ diff --git a/tests/ref/text/hyphenate.png b/tests/ref/text/hyphenate.png index e304cb8c..7b386a51 100644 Binary files a/tests/ref/text/hyphenate.png and b/tests/ref/text/hyphenate.png differ diff --git a/tests/ref/text/lang.png b/tests/ref/text/lang.png index cbb66628..9ec88152 100644 Binary files a/tests/ref/text/lang.png and b/tests/ref/text/lang.png differ diff --git a/tests/ref/text/linebreak.png b/tests/ref/text/linebreak.png index 77eef20e..64d0d403 100644 Binary files a/tests/ref/text/linebreak.png and b/tests/ref/text/linebreak.png differ diff --git a/tests/ref/text/lorem.png b/tests/ref/text/lorem.png index ded76330..9d55df22 100644 Binary files a/tests/ref/text/lorem.png and b/tests/ref/text/lorem.png differ diff --git a/tests/ref/text/microtype.png b/tests/ref/text/microtype.png index e0d149e6..87622b0f 100644 Binary files a/tests/ref/text/microtype.png and b/tests/ref/text/microtype.png differ diff --git a/tests/ref/text/quotes.png b/tests/ref/text/quotes.png index 1054daca..20bf6828 100644 Binary files a/tests/ref/text/quotes.png and b/tests/ref/text/quotes.png differ diff --git a/tests/ref/text/raw-code.png b/tests/ref/text/raw-code.png index e7df5a34..25735e9d 100644 Binary files a/tests/ref/text/raw-code.png and b/tests/ref/text/raw-code.png differ diff --git a/tests/ref/text/raw.png b/tests/ref/text/raw.png index e2fd87d0..7a38e1a5 100644 Binary files a/tests/ref/text/raw.png and b/tests/ref/text/raw.png differ diff --git a/tests/ref/text/shaping.png b/tests/ref/text/shaping.png index 3d3e611d..7b33074f 100644 Binary files a/tests/ref/text/shaping.png and b/tests/ref/text/shaping.png differ diff --git a/tests/ref/text/shift.png b/tests/ref/text/shift.png index 1316fb77..09d68bac 100644 Binary files a/tests/ref/text/shift.png and b/tests/ref/text/shift.png differ diff --git a/tests/ref/text/space.png b/tests/ref/text/space.png index cfbf886d..d2b9a5aa 100644 Binary files a/tests/ref/text/space.png and b/tests/ref/text/space.png differ diff --git a/tests/ref/text/symbol.png b/tests/ref/text/symbol.png index f964d931..9c09732f 100644 Binary files a/tests/ref/text/symbol.png and b/tests/ref/text/symbol.png differ diff --git a/tests/ref/text/tracking-spacing.png b/tests/ref/text/tracking-spacing.png index 2ce0d549..68d80213 100644 Binary files a/tests/ref/text/tracking-spacing.png and b/tests/ref/text/tracking-spacing.png differ diff --git a/tests/ref/visualize/image.png b/tests/ref/visualize/image.png index eaea3499..0d1a0b8a 100644 Binary files a/tests/ref/visualize/image.png and b/tests/ref/visualize/image.png differ diff --git a/tests/ref/visualize/line.png b/tests/ref/visualize/line.png index 89323f76..d19dea0e 100644 Binary files a/tests/ref/visualize/line.png and b/tests/ref/visualize/line.png differ diff --git a/tests/ref/visualize/shape-aspect.png b/tests/ref/visualize/shape-aspect.png index 331c5fe5..39767fbc 100644 Binary files a/tests/ref/visualize/shape-aspect.png and b/tests/ref/visualize/shape-aspect.png differ diff --git a/tests/ref/visualize/shape-circle.png b/tests/ref/visualize/shape-circle.png index 27aaf819..a2ee279d 100644 Binary files a/tests/ref/visualize/shape-circle.png and b/tests/ref/visualize/shape-circle.png differ diff --git a/tests/ref/visualize/shape-ellipse.png b/tests/ref/visualize/shape-ellipse.png index da9278d5..6de5e9f6 100644 Binary files a/tests/ref/visualize/shape-ellipse.png and b/tests/ref/visualize/shape-ellipse.png differ diff --git a/tests/ref/visualize/shape-fill-stroke.png b/tests/ref/visualize/shape-fill-stroke.png index b8c78a55..cabbfb2e 100644 Binary files a/tests/ref/visualize/shape-fill-stroke.png and b/tests/ref/visualize/shape-fill-stroke.png differ diff --git a/tests/ref/visualize/shape-rect.png b/tests/ref/visualize/shape-rect.png index 9586d005..17675400 100644 Binary files a/tests/ref/visualize/shape-rect.png and b/tests/ref/visualize/shape-rect.png differ diff --git a/tests/ref/visualize/shape-square.png b/tests/ref/visualize/shape-square.png index d710b84c..46e243e1 100644 Binary files a/tests/ref/visualize/shape-square.png and b/tests/ref/visualize/shape-square.png differ diff --git a/tests/src/benches.rs b/tests/src/benches.rs index 50324c78..1628f32d 100644 --- a/tests/src/benches.rs +++ b/tests/src/benches.rs @@ -11,7 +11,7 @@ use typst::World; use unscanny::Scanner; const TEXT: &str = include_str!("../typ/compiler/bench.typ"); -const FONT: &[u8] = include_bytes!("../../assets/fonts/IBMPlexSans-Regular.ttf"); +const FONT: &[u8] = include_bytes!("../../assets/fonts/LinLibertine_R.ttf"); main!( bench_decode, diff --git a/tests/typ/compiler/bench.typ b/tests/typ/compiler/bench.typ index 194d996d..7276776d 100644 --- a/tests/typ/compiler/bench.typ +++ b/tests/typ/compiler/bench.typ @@ -1,3 +1,5 @@ +// Ref: false + // Configuration with `page` and `font` functions. #set page(width: 450pt, margin: 1cm) diff --git a/tests/typ/compiler/shorthand.typ b/tests/typ/compiler/shorthand.typ index 02c42ab0..6df5e340 100644 --- a/tests/typ/compiler/shorthand.typ +++ b/tests/typ/compiler/shorthand.typ @@ -7,7 +7,7 @@ The non-breaking~space does work. // Make sure non-breaking and normal space always // have the same width. Even if the font decided // differently. -#set text("Latin Modern Roman") +#set text("New Computer Modern") a b \ a~b diff --git a/tests/typ/compiler/show-text.typ b/tests/typ/compiler/show-text.typ index 705c1112..b175c17d 100644 --- a/tests/typ/compiler/show-text.typ +++ b/tests/typ/compiler/show-text.typ @@ -9,7 +9,7 @@ Die Zeitung Der Spiegel existiert. --- // Another classic example. #show "TeX": [T#h(-0.145em)#box(move(dy: 0.233em)[E])#h(-0.135em)X] -#show regex("(Lua)?(La)?TeX"): name => box(text("Latin Modern Roman")[#name]) +#show regex("(Lua)?(La)?TeX"): name => box(text("New Computer Modern")[#name]) TeX, LaTeX, LuaTeX and LuaLaTeX! diff --git a/tests/typ/compute/foundations.typ b/tests/typ/compute/foundations.typ index eb3e7e35..d6c0f82b 100644 --- a/tests/typ/compute/foundations.typ +++ b/tests/typ/compute/foundations.typ @@ -54,7 +54,7 @@ #eval("let") --- -#show raw: it => text("IBM Plex Sans", eval("[" + it.text + "]")) +#show raw: it => text("PT Sans", eval("[" + it.text + "]")) Interacting ``` diff --git a/tests/typ/layout/columns.typ b/tests/typ/layout/columns.typ index b5dbf96f..eafb0518 100644 --- a/tests/typ/layout/columns.typ +++ b/tests/typ/layout/columns.typ @@ -3,7 +3,7 @@ --- // Test normal operation and RTL directions. #set page(height: 3.25cm, width: 7.05cm, columns: 2) -#set text(lang: "ar", "Noto Sans Arabic", "IBM Plex Serif") +#set text(lang: "ar", "Noto Sans Arabic", "Linux Libertine") #set columns(gutter: 30pt) #box(fill: conifer, height: 8pt, width: 6pt) وتحفيز diff --git a/tests/typ/layout/container-fill.typ b/tests/typ/layout/container-fill.typ index 34849d88..f5947e06 100644 --- a/tests/typ/layout/container-fill.typ +++ b/tests/typ/layout/container-fill.typ @@ -1,7 +1,7 @@ #set page(height: 100pt) #let words = lorem(18).split() #block(inset: 8pt, width: 100%, fill: aqua, stroke: aqua.darken(30%))[ - #words.slice(0, 12).join(" ") - #box(fill: teal, outset: 2pt)[incididunt] - #words.slice(12).join(" ") + #words.slice(0, 13).join(" ") + #box(fill: teal, outset: 2pt)[tempor] + #words.slice(13).join(" ") ] diff --git a/tests/typ/layout/enum-numbering.typ b/tests/typ/layout/enum-numbering.typ index 1d905f69..ee4b25b9 100644 --- a/tests/typ/layout/enum-numbering.typ +++ b/tests/typ/layout/enum-numbering.typ @@ -37,7 +37,7 @@ --- // Test numbering with closure and nested lists. -#set text("Latin Modern Roman") +#set text("New Computer Modern") #set enum(numbering: (..args) => math.mat(args.pos()), full: true) + A + B diff --git a/tests/typ/layout/flow-orphan.typ b/tests/typ/layout/flow-orphan.typ index 482fd145..9c5c2399 100644 --- a/tests/typ/layout/flow-orphan.typ +++ b/tests/typ/layout/flow-orphan.typ @@ -8,7 +8,7 @@ This is the start and it goes on. --- -#set page("a8", height: 150pt) +#set page("a8", height: 140pt) #set text(weight: 700) // Fits fully onto the first page. diff --git a/tests/typ/layout/grid-2.typ b/tests/typ/layout/grid-2.typ index 7df64a56..66623878 100644 --- a/tests/typ/layout/grid-2.typ +++ b/tests/typ/layout/grid-2.typ @@ -1,7 +1,7 @@ // Test using the `grid` function to create a finance table. --- -#set page(width: 12cm, height: 2.5cm) +#set page(width: 11cm, height: 2.5cm) #grid( columns: 5, column-gutter: (2fr, 1fr, 1fr), diff --git a/tests/typ/layout/par-bidi.typ b/tests/typ/layout/par-bidi.typ index a7274e8a..aa881a7b 100644 --- a/tests/typ/layout/par-bidi.typ +++ b/tests/typ/layout/par-bidi.typ @@ -3,7 +3,6 @@ --- // Test reordering with different top-level paragraph directions. #let content = par[Text טֶקסט] -#set text("IBM Plex Serif") #text(lang: "he", content) #text(lang: "de", content) @@ -11,7 +10,7 @@ // Test that consecutive, embedded LTR runs stay LTR. // Here, we have two runs: "A" and italic "B". #let content = par[أنت A#emph[B]مطرC] -#set text("IBM Plex Serif", "Noto Sans Arabic") +#set text("PT Sans", "Noto Sans Arabic") #text(lang: "ar", content) #text(lang: "de", content) @@ -19,30 +18,29 @@ // Test that consecutive, embedded RTL runs stay RTL. // Here, we have three runs: "גֶ", bold "שֶׁ", and "ם". #let content = par[Aגֶ#strong[שֶׁ]םB] -#set text("IBM Plex Serif", "Noto Serif Hebrew") +#set text("Linux Libertine", "Noto Serif Hebrew") #text(lang: "he", content) #text(lang: "de", content) --- // Test embedding up to level 4 with isolates. -#set text(dir: rtl, "IBM Plex Serif") +#set text(dir: rtl) א\u{2066}A\u{2067}Bב\u{2069}? --- // Test hard line break (leads to two paragraphs in unicode-bidi). -#set text(lang: "ar", "Noto Sans Arabic", "IBM Plex Serif") +#set text(lang: "ar", "Noto Sans Arabic", "PT Sans") Life المطر هو الحياة \ الحياة تمطر is rain. --- // Test spacing. -#set text("IBM Plex Serif") L #h(1cm) ריווחR \ Lריווח #h(1cm) R --- // Test inline object. -#set text(lang: "he", "IBM Plex Serif") +#set text(lang: "he") קרנפיםRh#box(image("/rhino.png", height: 11pt))inoחיים --- diff --git a/tests/typ/layout/par-indent.typ b/tests/typ/layout/par-indent.typ index 3e44d73b..8efda42f 100644 --- a/tests/typ/layout/par-indent.typ +++ b/tests/typ/layout/par-indent.typ @@ -20,7 +20,7 @@ starts a paragraph without indent. Except if you have another paragraph in them. -#set text(8pt, lang: "ar", "Noto Sans Arabic", "IBM Plex Sans") +#set text(8pt, lang: "ar", "Noto Sans Arabic", "Linux Libertine") #set par(leading: 8pt) = Arabic diff --git a/tests/typ/layout/par-knuth.typ b/tests/typ/layout/par-knuth.typ index dbe13fc4..0467c9a1 100644 --- a/tests/typ/layout/par-knuth.typ +++ b/tests/typ/layout/par-knuth.typ @@ -1,6 +1,6 @@ #set page(width: auto, height: auto) #set par(leading: 4pt, justify: true) -#set text(family: "Latin Modern Roman") +#set text(family: "New Computer Modern") #let story = [ In olden times when wishing still helped one, there lived a king whose diff --git a/tests/typ/layout/terms.typ b/tests/typ/layout/terms.typ index 57864423..6e828094 100644 --- a/tests/typ/layout/terms.typ +++ b/tests/typ/layout/terms.typ @@ -25,10 +25,10 @@ --- // Test style change. #set text(8pt) -/ First list: #lorem(4) +/ First list: #lorem(6) #set terms(hanging-indent: 30pt) -/ Second list: #lorem(4) +/ Second list: #lorem(5) --- // Test grid like show rule. diff --git a/tests/typ/layout/transform.typ b/tests/typ/layout/transform.typ index cc744952..de193f72 100644 --- a/tests/typ/layout/transform.typ +++ b/tests/typ/layout/transform.typ @@ -23,7 +23,7 @@ [X] } -#set text("Latin Modern Roman", size) +#set text("New Computer Modern", size) Neither #tex, \ nor #xetex! diff --git a/tests/typ/math/op.typ b/tests/typ/math/op.typ index b76a2da6..882a7c4a 100644 --- a/tests/typ/math/op.typ +++ b/tests/typ/math/op.typ @@ -11,7 +11,7 @@ $ &sin x + log_2 x \ --- // Test scripts vs limits. -#set text("Latin Modern Roman") +#set text("New Computer Modern") Discuss $lim_(n->oo) 1/n$ now. $ lim_(n->infinity) 1/n = 0 $ diff --git a/tests/typ/text/features.typ b/tests/typ/text/features.typ index cae240f3..c706afed 100644 --- a/tests/typ/text/features.typ +++ b/tests/typ/text/features.typ @@ -7,7 +7,6 @@ --- // Test smallcaps. -#set text("Roboto") #smallcaps[Smallcaps] --- @@ -22,27 +21,24 @@ fi vs. #text(ligatures: false)[No fi] --- // Test number type. -#set text("Roboto") #set text(number-type: "old-style") 0123456789 \ #text(number-type: auto)[0123456789] --- // Test number width. -#set text("Roboto") #text(number-width: "proportional")[0123456789] \ #text(number-width: "tabular")[3456789123] \ #text(number-width: "tabular")[0123456789] --- // Test extra number stuff. -#set text("IBM Plex Sans") +#set text("IBM Plex Serif") 0 vs. #text(slashed-zero: true)[0] \ 1/2 vs. #text(fractions: true)[1/2] --- // Test raw features. -#set text("Roboto") #text(features: ("smcp",))[Smcp] \ fi vs. #text(features: (liga: 0))[No fi] diff --git a/tests/typ/text/font.typ b/tests/typ/text/font.typ index d2add0f1..e832ab1d 100644 --- a/tests/typ/text/font.typ +++ b/tests/typ/text/font.typ @@ -41,7 +41,7 @@ Emoji: 🐪, 🌋, 🏞 #text(red, "Text") \ #text("Ubuntu", blue, "Text") \ #text([Text], teal, "IBM Plex Serif") \ -#text(forest, "Latin Modern Roman", [Text]) \ +#text(forest, "New Computer Modern", [Text]) \ --- // Error: 11-16 unexpected argument diff --git a/tests/typ/text/hyphenate.typ b/tests/typ/text/hyphenate.typ index 4dc5255f..42946a88 100644 --- a/tests/typ/text/hyphenate.typ +++ b/tests/typ/text/hyphenate.typ @@ -5,13 +5,14 @@ #set text(hyphenate: true) #set page(width: auto) #grid( - columns: (70pt, 60pt), + columns: (50pt, 50pt), [Warm welcomes to Typst.], text(lang: "el")[διαμερίσματα. \ λατρευτός], ) --- // Test disabling hyphenation for short passages. +#set page(width: 110pt) #set text(hyphenate: true) Welcome to wonderful experiences. \ @@ -45,6 +46,6 @@ It's a #emph[Tree]beard. // punctuation instead of just the words. So this tests that we don't // do that. The test passes if there's just one hyphenation between // "net" and "works". -#set page(width: 70pt) +#set page(width: 60pt) #set text(hyphenate: true) #h(6pt) networks, the rest. diff --git a/tests/typ/text/microtype.typ b/tests/typ/text/microtype.typ index fc15ec07..252d163d 100644 --- a/tests/typ/text/microtype.typ +++ b/tests/typ/text/microtype.typ @@ -12,7 +12,7 @@ ] // Test hanging punctuation with RTL. -#set text(lang: "he", "IBM Plex Sans", "Noto Serif Hebrew") +#set text(lang: "he", "PT Sans", "Noto Serif Hebrew") בנייה נכונה של משפטים ארוכים דורשת ידע בשפה. אז בואו נדבר על מזג האוויר. --- diff --git a/tests/typ/text/tracking-spacing.typ b/tests/typ/text/tracking-spacing.typ index e0bd2696..413194ba 100644 --- a/tests/typ/text/tracking-spacing.typ +++ b/tests/typ/text/tracking-spacing.typ @@ -11,7 +11,7 @@ I'm in#text(tracking: 0.15em + 1.5pt)[ spaace]! --- // Test that tracking doesn't disrupt mark placement. -#set text("IBM Plex Sans", "Noto Serif Hebrew") +#set text("PT Sans", "Noto Serif Hebrew") #set text(tracking: 0.3em) טֶקסט