summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKG <41345727+kg583@users.noreply.github.com>2023-07-17 09:54:26 -0400
committerGitHub <noreply@github.com>2023-07-17 15:54:26 +0200
commit31efd542cb1d86a0cb036876fdb174ac5d1cb102 (patch)
tree1643ad5b3d05dad00b165c2216642e65cd0f4bc5
parented15e1062a319d99780887ef5edc6252bc192c2b (diff)
Rename math symbols (#1124)
Co-authored-by: Ryan Pitasky <111201305+rpitasky@users.noreply.github.com> Co-authored-by: Daniel Csillag <15617291+dccsillag@users.noreply.github.com>
-rw-r--r--crates/typst-library/src/symbols/sym.rs58
-rw-r--r--tests/typ/math/spacing.typ10
2 files changed, 48 insertions, 20 deletions
diff --git a/crates/typst-library/src/symbols/sym.rs b/crates/typst-library/src/symbols/sym.rs
index 8b1b0b39..366d54ed 100644
--- a/crates/typst-library/src/symbols/sym.rs
+++ b/crates/typst-library/src/symbols/sym.rs
@@ -71,7 +71,7 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
triple: '⁂',
small: '﹡',
circle: '⊛',
- sq: '⧆',
+ square: '⧆',
],
at: '@',
backslash: ['\\', circle: '⦸', not: '⧷'],
@@ -118,12 +118,12 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
eq: '≃',
eq.not: '≄',
eq.rev: '⋍',
- eqq: '≅',
- eqq.not: '≇',
- neqq: '≆',
+ equiv: '≅',
+ equiv.not: '≇',
+ nequiv: '≆',
not: '≁',
rev: '∽',
- rev.eqq: '≌',
+ rev.equiv: '≌',
triple: '≋',
],
@@ -218,20 +218,33 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
quest: '≟',
small: '﹦',
succ: '⋟',
+ triple: '≡',
+ quad: '≣',
],
gt: [
'>',
circle: '⧁',
+ curly: '≻',
+ curly.approx: '⪸',
+ curly.double: '⪼',
+ curly.eq: '≽',
+ curly.eq.not: '⋡',
+ curly.equiv: '⪴',
+ curly.napprox: '⪺',
+ curly.nequiv: '⪶',
+ curly.not: '⊁',
+ curly.ntilde: '⋩',
+ curly.tilde: '≿',
dot: '⋗',
double: '≫',
eq: '≥',
eq.slant: '⩾',
eq.lt: '⋛',
eq.not: '≱',
- eqq: '≧',
+ equiv: '≧',
lt: '≷',
lt.not: '≹',
- neqq: '≩',
+ nequiv: '≩',
not: '≯',
ntilde: '⋧',
small: '﹥',
@@ -247,16 +260,27 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
lt: [
'<',
circle: '⧀',
+ curly: '≺',
+ curly.approx: '⪷',
+ curly.double: '⪻',
+ curly.eq: '≼',
+ curly.eq.not: '⋠',
+ curly.equiv: '⪳',
+ curly.napprox: '⪹',
+ curly.nequiv: '⪵',
+ curly.not: '⊀',
+ curly.ntilde: '⋨',
+ curly.tilde: '≾',
dot: '⋖',
double: '≪',
eq: '≤',
eq.slant: '⩽' ,
eq.gt: '⋚',
eq.not: '≰',
- eqq: '≦',
+ equiv: '≦',
gt: '≶',
gt.not: '≸',
- neqq: '≨',
+ nequiv: '≨',
not: '≮',
ntilde: '⋦',
small: '﹤',
@@ -276,9 +300,9 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
double: '⪻',
eq: '≼',
eq.not: '⋠',
- eqq: '⪳',
+ equiv: '⪳',
napprox: '⪹',
- neqq: '⪵',
+ nequiv: '⪵',
not: '⊀',
ntilde: '⋨',
tilde: '≾',
@@ -289,17 +313,18 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
double: '⪼',
eq: '≽',
eq.not: '⋡',
- eqq: '⪴',
+ equiv: '⪴',
napprox: '⪺',
- neqq: '⪶',
+ nequiv: '⪶',
not: '⊁',
ntilde: '⋩',
tilde: '≿',
],
- ident: ['≡', not: '≢', strict: '≣'],
+ equiv: ['≡', not: '≢'],
prop: '∝',
// Set theory.
+ emptyset: ['∅', rev: '⦰'],
nothing: ['∅', rev: '⦰'],
without: '∖',
complement: '∁',
@@ -381,7 +406,7 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
double: '∬',
quad: '⨌',
sect: '⨙',
- sq: '⨖',
+ square: '⨖',
surf: '∯',
times: '⨘',
triple: '∭',
@@ -798,8 +823,11 @@ pub(crate) const SYM: &[(&str, Symbol)] = symbols! {
Zeta: 'Ζ',
// Hebrew.
+ aleph: 'א',
alef: 'א',
+ beth: 'ב',
bet: 'ב',
+ gimmel: 'ג',
gimel: 'ג',
shin: 'ש',
diff --git a/tests/typ/math/spacing.typ b/tests/typ/math/spacing.typ
index 969c26c1..b763fb2d 100644
--- a/tests/typ/math/spacing.typ
+++ b/tests/typ/math/spacing.typ
@@ -23,7 +23,7 @@ $a"is"b, a "is" b$
// Test predefined spacings.
$a thin b, a med b, a thick b, a quad b$ \
$a = thin b$ \
-$a - b ident c quad (mod 2)$
+$a - b equiv c quad (mod 2)$
---
// Test spacing for set comprehension.
@@ -33,8 +33,8 @@ $ { x in RR | x "is natural" and x < 10 } $
---
// Test spacing for operators with decorations and modifiers on them
#set page(width: auto)
-$a ident b + c - d => e log 5 op("ln") 6$ \
-$a cancel(ident) b overline(+) c arrow(-) d hat(=>) e cancel(log) 5 dot(op("ln")) 6$ \
-$a overbrace(ident) b underline(+) c grave(-) d underbracket(=>) e circle(log) 5 caron(op("ln")) 6$ \
+$a equiv b + c - d => e log 5 op("ln") 6$ \
+$a cancel(equiv) b overline(+) c arrow(-) d hat(=>) e cancel(log) 5 dot(op("ln")) 6$ \
+$a overbrace(equiv) b underline(+) c grave(-) d underbracket(=>) e circle(log) 5 caron(op("ln")) 6$ \
\
-$a attach(ident, tl: a, tr: b) b attach(limits(+), t: a, b: b) c tilde(-) d breve(=>) e attach(limits(log), t: a, b: b) 5 attach(op("ln"), tr: a, bl: b) 6$
+$a attach(equiv, tl: a, tr: b) b attach(limits(+), t: a, b: b) c tilde(-) d breve(=>) e attach(limits(log), t: a, b: b) 5 attach(op("ln"), tr: a, bl: b) 6$