Merge 3dc9acf4b39127ab399ea3e8a292ff83c6dcd48e into 36ecbb2c8dccc1a31c43fee1466f1425844d8607

crates/typst-layout/src/math/text.rs

@@ -4,7 +4,7 @@ use ecow::EcoString;
 use typst_library::diag::SourceResult;
 use typst_library::foundations::{Packed, StyleChain, SymbolElem};
 use typst_library::layout::{Abs, Size};
-use typst_library::math::{EquationElem, MathSize, MathVariant};
+use typst_library::math::{EquationElem, MathSize, MathStyle, MathVariant};
 use typst_library::text::{
     BottomEdge, BottomEdgeMetric, TextElem, TopEdge, TopEdgeMetric,
 };
@@ -171,15 +171,19 @@ fn styled_char(styles: StyleChain, c: char, auto_italic: bool) -> char {
 
     let variant = EquationElem::variant_in(styles);
     let bold = EquationElem::bold_in(styles);
-    let italic = EquationElem::italic_in(styles).unwrap_or(
+    let default_style = EquationElem::default_style_in(styles);
-        auto_italic
+    let default_italic = match c {
-            && matches!(
+        'a'..='z' | 'ħ' | 'ı' | 'ȷ' | 'α'..='ω' | 'ϵ' | 'ϑ' | 'ϰ' | 'ϕ' | 'ϱ' | 'ϖ' =>
-                c,
+        {
-                'a'..='z' | 'ħ' | 'ı' | 'ȷ' | 'A'..='Z' |
+            matches!(default_style, MathStyle::Iso | MathStyle::Tex | MathStyle::French)
-                'α'..='ω' | '∂' | 'ϵ' | 'ϑ' | 'ϰ' | 'ϕ' | 'ϱ' | 'ϖ'
+        }
-            )
+        'A'..='Z' => matches!(default_style, MathStyle::Iso | MathStyle::Tex),
-            && matches!(variant, Sans | Serif),
+        'Α'..='Ω' => matches!(default_style, MathStyle::Iso),
-    );
+        '∂' => matches!(default_style, MathStyle::Tex | MathStyle::French),
+        _ => false,
+    };
+    let italic = EquationElem::italic_in(styles)
+        .unwrap_or(auto_italic && default_italic && matches!(variant, Sans | Serif));
 
     if let Some(c) = basic_exception(c) {
         return c;

crates/typst-library/src/foundations/func.rs

@@ -20,7 +20,7 @@ use crate::foundations::{
 ///
 /// You can call a function by writing a comma-separated list of function
 /// _arguments_ enclosed in parentheses directly after the function name.
-/// Additionally, you can pass any number of trailing content blocks arguments
+/// Additionally, you can pass any number of trailing content block arguments
 /// to a function _after_ the normal argument list. If the normal argument list
 /// would become empty, it can be omitted. Typst supports positional and named
 /// arguments. The former are identified by position and type, while the latter

crates/typst-library/src/math/equation.rs

@@ -14,7 +14,7 @@ use crate::layout::{
     AlignElem, Alignment, BlockElem, InlineElem, OuterHAlignment, SpecificAlignment,
     VAlignment,
 };
-use crate::math::{MathSize, MathVariant};
+use crate::math::{MathSize, MathStyle, MathVariant};
 use crate::model::{Numbering, Outlinable, ParLine, Refable, Supplement};
 use crate::text::{FontFamily, FontList, FontWeight, LocalName, TextElem};
 
@@ -52,6 +52,10 @@ pub struct EquationElem {
     #[default(false)]
     pub block: bool,
 
+    /// The rule determining which letters and symbols are italic by default.
+    #[default(MathStyle::Tex)]
+    pub default_style: MathStyle,
+
     /// How to [number]($numbering) block-level equations.
     ///
     /// ```example

crates/typst-library/src/math/style.rs

@@ -252,3 +252,18 @@ pub enum MathVariant {
     Mono,
     Bb,
 }
+
+/// A rule describing which letters and symbols are italic by default.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Cast, Hash)]
+// #[derive(Serialize, Deserialize, Cast)]
+// #[serde(rename_all = "kebab-case")]
+pub enum MathStyle {
+    // Every latin or greek letter italic, [partial] upright.
+    Iso,
+    // Everything but capital greek letters italic.
+    Tex,
+    // Lowercase letters and [partial] italic.
+    French,
+    // Everything upright.
+    Upright,
+}

docs/reference/groups.yml

@@ -205,7 +205,7 @@
       single or double quotes.
 
       The value is always of type [string]($str). More complex data
-      may be parsed manually using functions like [`json.decode`]($json.decode).
+      may be parsed manually using functions like [`json`]($json).
 
 - name: sym
   title: General

tests/suite/math/style.typ

@@ -1,7 +1,16 @@
 // Test text styling in math.
 
 --- math-style-italic-default ---
-// Test italic defaults.
+// Test italic defaults for all `default-style`s.
+$a, A, delta, ϵ, partial, Delta, ϴ$
+
+#set math.equation(default-style: "iso")
+$a, A, delta, ϵ, partial, Delta, ϴ$
+
+#set math.equation(default-style: "french")
+$a, A, delta, ϵ, partial, Delta, ϴ$
+
+#set math.equation(default-style: "upright")
 $a, A, delta, ϵ, partial, Delta, ϴ$
 
 --- math-style ---