New default style

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 <xdzeng96@gmail.com>
   (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$
+================================================================================

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

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"
 

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

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")]),
+            )
     }
 }
 

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()));

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 => {

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;

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)
     }
 }

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<Item = &str> + Clone {
     const FALLBACKS: &[&str] = &[
-        "ibm plex sans",
+        "linux libertine",
         "twitter color emoji",
         "noto color emoji",
         "apple color emoji",