From 3c90878460cecaaa7ac879ba0973f94705b7c062 Mon Sep 17 00:00:00 2001
From: Malo <57839069+MDLC01@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:30:36 +0200
Subject: [PATCH] Miscellaneous `sym.rs` improvements (#5045)

---
 crates/typst/src/symbols/sym.rs | 205 ++++++++++++++++----------------
 1 file changed, 104 insertions(+), 101 deletions(-)

diff --git a/crates/typst/src/symbols/sym.rs b/crates/typst/src/symbols/sym.rs
index 9d38e412c..1d78ee3f3 100644
--- a/crates/typst/src/symbols/sym.rs
+++ b/crates/typst/src/symbols/sym.rs
@@ -100,8 +100,8 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
     dash: [
         #[call(crate::math::accent::dash)] en: '–',
         em: '—',
-        em.two: '\u{2e3a}',
-        em.three: '\u{2e3b}',
+        em.two: '⸺',
+        em.three: '⸻',
         fig: '‒',
         wave: '〜',
         colon: '∹',
@@ -129,7 +129,7 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
     pilcrow: ['¶', rev: '⁋'],
     section: '§',
     semi: [';', rev: '⁏'],
-    slash: ['/', double: '⫽', triple: '⫻', big: '\u{29f8}'],
+    slash: ['/', double: '⫽', triple: '⫻', big: '⧸'],
     dots: [h.c: '⋯', h: '…', v: '⋮', down: '⋱', up: '⋰'],
     tilde: [
         #[call(crate::math::accent::tilde)] op: '∼',
@@ -888,106 +888,109 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
         l.r: '⟛',
     ],
 
-     // Lowercase Greek.
-     alpha: 'α',
-     beta: ['β', alt: 'ϐ'],
-     chi: 'χ',
-     delta: 'δ',
-     epsilon: ['ε', alt: 'ϵ'],
-     eta: 'η',
-     gamma: 'γ',
-     iota: 'ι',
-     kai: 'ϗ',
-     kappa: ['κ', alt: 'ϰ'],
-     lambda: 'λ',
-     mu: 'μ',
-     nu: 'ν',
-     ohm: ['Ω', inv: '℧'],
-     omega: 'ω',
-     omicron: 'ο',
-     phi: ['φ', alt: 'ϕ'],
-     pi: ['π', alt: 'ϖ'],
-     psi: 'ψ',
-     rho: ['ρ', alt: 'ϱ'],
-     sigma: ['σ', alt: 'ς'],
-     tau: 'τ',
-     theta: ['θ', alt: 'ϑ'],
-     upsilon: 'υ',
-     xi: 'ξ',
-     zeta: 'ζ',
+    // Lowercase Greek.
+    alpha: 'α',
+    beta: ['β', alt: 'ϐ'],
+    chi: 'χ',
+    delta: 'δ',
+    epsilon: ['ε', alt: 'ϵ'],
+    eta: 'η',
+    gamma: 'γ',
+    iota: 'ι',
+    kai: 'ϗ',
+    kappa: ['κ', alt: 'ϰ'],
+    lambda: 'λ',
+    mu: 'μ',
+    nu: 'ν',
+    ohm: ['Ω', inv: '℧'],
+    omega: 'ω',
+    omicron: 'ο',
+    phi: ['φ', alt: 'ϕ'],
+    pi: ['π', alt: 'ϖ'],
+    psi: 'ψ',
+    rho: ['ρ', alt: 'ϱ'],
+    sigma: ['σ', alt: 'ς'],
+    tau: 'τ',
+    theta: ['θ', alt: 'ϑ'],
+    upsilon: 'υ',
+    xi: 'ξ',
+    zeta: 'ζ',
 
-     // Uppercase Greek.
-     Alpha: 'Α',
-     Beta: 'Β',
-     Chi: 'Χ',
-     Delta: 'Δ',
-     Epsilon: 'Ε',
-     Eta: 'Η',
-     Gamma: 'Γ',
-     Iota: 'Ι',
-     Kai: 'Ϗ',
-     Kappa: 'Κ',
-     Lambda: 'Λ',
-     Mu: 'Μ',
-     Nu: 'Ν',
-     Omega: 'Ω',
-     Omicron: 'Ο',
-     Phi: 'Φ',
-     Pi: 'Π',
-     Psi: 'Ψ',
-     Rho: 'Ρ',
-     Sigma: 'Σ',
-     Tau: 'Τ',
-     Theta: 'Θ',
-     Upsilon: 'Υ',
-     Xi: 'Ξ',
-     Zeta: 'Ζ',
+    // Uppercase Greek.
+    Alpha: 'Α',
+    Beta: 'Β',
+    Chi: 'Χ',
+    Delta: 'Δ',
+    Epsilon: 'Ε',
+    Eta: 'Η',
+    Gamma: 'Γ',
+    Iota: 'Ι',
+    Kai: 'Ϗ',
+    Kappa: 'Κ',
+    Lambda: 'Λ',
+    Mu: 'Μ',
+    Nu: 'Ν',
+    Omega: 'Ω',
+    Omicron: 'Ο',
+    Phi: 'Φ',
+    Pi: 'Π',
+    Psi: 'Ψ',
+    Rho: 'Ρ',
+    Sigma: 'Σ',
+    Tau: 'Τ',
+    Theta: 'Θ',
+    Upsilon: 'Υ',
+    Xi: 'Ξ',
+    Zeta: 'Ζ',
 
-     // Hebrew.
-     aleph: 'א',
-     alef: 'א',
-     beth: 'ב',
-     bet: 'ב',
-     gimmel: 'ג',
-     gimel: 'ג',
-     daleth: 'ד',
-     dalet: 'ד',
-     shin: 'ש',
+    // Hebrew.
+    // In math, the following symbols are replaced with corresponding characters
+    // from Letterlike Symbols.
+    // See https://github.com/typst/typst/pull/3375.
+    aleph: 'א',
+    alef: 'א',
+    beth: 'ב',
+    bet: 'ב',
+    gimmel: 'ג',
+    gimel: 'ג',
+    daleth: 'ד',
+    dalet: 'ד',
+    shin: 'ש',
 
-     // Double-struck.
-     AA: '𝔸',
-     BB: '𝔹',
-     CC: 'ℂ',
-     DD: '𝔻',
-     EE: '𝔼',
-     FF: '𝔽',
-     GG: '𝔾',
-     HH: 'ℍ',
-     II: '𝕀',
-     JJ: '𝕁',
-     KK: '𝕂',
-     LL: '𝕃',
-     MM: '𝕄',
-     NN: 'ℕ',
-     OO: '𝕆',
-     PP: 'ℙ',
-     QQ: 'ℚ',
-     RR: 'ℝ',
-     SS: '𝕊',
-     TT: '𝕋',
-     UU: '𝕌',
-     VV: '𝕍',
-     WW: '𝕎',
-     XX: '𝕏',
-     YY: '𝕐',
-     ZZ: 'ℤ',
+    // Double-struck.
+    AA: '𝔸',
+    BB: '𝔹',
+    CC: 'ℂ',
+    DD: '𝔻',
+    EE: '𝔼',
+    FF: '𝔽',
+    GG: '𝔾',
+    HH: 'ℍ',
+    II: '𝕀',
+    JJ: '𝕁',
+    KK: '𝕂',
+    LL: '𝕃',
+    MM: '𝕄',
+    NN: 'ℕ',
+    OO: '𝕆',
+    PP: 'ℙ',
+    QQ: 'ℚ',
+    RR: 'ℝ',
+    SS: '𝕊',
+    TT: '𝕋',
+    UU: '𝕌',
+    VV: '𝕍',
+    WW: '𝕎',
+    XX: '𝕏',
+    YY: '𝕐',
+    ZZ: 'ℤ',
 
-     // Miscellaneous letter-likes.
-     ell: 'ℓ',
-     planck: ['ℎ', reduce: 'ℏ'],
-     angstrom: 'Å',
-     kelvin: 'K',
-     Re: 'ℜ',
-     Im: 'ℑ',
-     dotless: [i: '𝚤', j: '𝚥'],
+    // Miscellaneous letter-likes.
+    ell: 'ℓ',
+    planck: ['ℎ', reduce: 'ℏ'],
+    angstrom: 'Å',
+    kelvin: 'K',
+    Re: 'ℜ',
+    Im: 'ℑ',
+    dotless: [i: '𝚤', j: '𝚥'],
 };