Skip to content

Commit 19dfd56

Browse files
authored
Merge branch 'main' into slant
2 parents 0ea6b58 + 18a4ea3 commit 19dfd56

5 files changed

Lines changed: 54 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Trivially updated to Unicode 17.0.0
88
- Added numeral systems API under the `numeral-systems` feature flag
9+
- Compared to Typst 0.14.2, added Tibetan numerals to `numeral-systems`.
910

1011
### New in `sym`
1112

@@ -25,6 +26,8 @@
2526
- `gt.arc.eq`
2627
- `lt.arc`: ⪦
2728
- `lt.arc.eq`: ⪨
29+
- `mapsfrom`: ↤
30+
- `mapsfrom.long`
2831
- `subset.approx`: ⫉
2932
- `subset.closed`: ⫏
3033
- `subset.closed.eq`: ⫑
@@ -70,6 +73,12 @@
7073
- `tilde.gt.slant`: ⪞︀
7174
- `tilde.lt`: ⪝
7275
- `tilde.lt.slant`: ⪝︀
76+
- `eq.dot`: ≐
77+
- `plus.hat`: ⨣
78+
- `approx.hat`: ⩯
79+
- `lt.quest`: ⩻
80+
- `gt.quest`: ⩼
81+
- `eq.ast`: ⩮
7382

7483
- Miscellaneous technical
7584
- `bowtie.stroked`: ⋈
@@ -81,6 +90,13 @@
8190
- `bowtie.filled.l`: ⧑
8291
- `bowtie.filled.r`: ⧒
8392

93+
- Arrows
94+
- `arrow.tr.bar`: 🢹
95+
- `arrow.br.bar`: 🢺
96+
- `arrow.tl.bar`: 🢸
97+
- `arrow.bl.bar`: 🢻
98+
- `arrows.rl.long`: 🣐
99+
84100
- Currency
85101
- `riyal`: ⃁
86102

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ keywords = ["unicode", "symbols"]
1515
default = ["numeral-systems", "styling"]
1616
numeral-systems = ["dep:chinese-number"]
1717
styling = []
18-
_test-unicode-conformance = ["ureq"]
18+
_test-unicode-conformance = ["dep:ureq", "dep:rustls-webpki"]
1919

2020
[dependencies]
2121
chinese-number = { version = "0.7.7", default-features = false, features = ["number-to-chinese"], optional = true }
@@ -25,3 +25,5 @@ siphasher = "1.0.2"
2525

2626
[build-dependencies]
2727
ureq = { version = "3.0.12", optional = true }
28+
# Security fix. Can be removed again with a ureq update that transitively depends on at least this version.
29+
rustls-webpki = { version = "0.103.13", optional = true }

src/modules/sym.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ plus +
259259
.square ⊞
260260
.triangle ⨹
261261
.triple ⧻
262+
.hat ⨣
262263
minus −
263264
.o ⊖
264265
.dot ∸
@@ -287,9 +288,11 @@ ratio ∶
287288

288289
// Relations.
289290
eq =
291+
.ast ⩮
290292
.star ≛
291293
.o ⊜
292294
.colon ≕
295+
.dot ≐
293296
.dots ≑
294297
.dots.down ≒
295298
.dots.up ≓
@@ -312,6 +315,7 @@ eq =
312315
gt >
313316
.o ⧁
314317
.dot ⋗
318+
.quest ⩼
315319
.approx ⪆
316320
.arc ⪧
317321
.arc.eq ⪩
@@ -351,6 +355,7 @@ gt >
351355
lt <
352356
.o ⧀
353357
.dot ⋖
358+
.quest ⩻
354359
.approx ⪅
355360
.arc ⪦
356361
.arc.eq ⪨
@@ -390,6 +395,7 @@ lt <
390395
approx ≈
391396
.eq ≊
392397
.not ≉
398+
.hat ⩯
393399
prec ≺
394400
.approx ⪷
395401
@deprecated: `prec.curly.eq` is deprecated, use `prec.eq.slant` instead
@@ -594,6 +600,8 @@ qed ∎
594600
// Function and category theory.
595601
mapsto ↦
596602
.long ⟼
603+
mapsfrom ↤
604+
.long ⟻
597605
compose ∘
598606
.o ⊚
599607
convolve ∗
@@ -1036,21 +1044,25 @@ arrow
10361044
.t.b.filled ⬍
10371045
.t.b.stroked ⇳
10381046
.tr ↗\vs{text}
1047+
.tr.bar 🢹
10391048
.tr.double ⇗
10401049
.tr.filled ⬈
10411050
.tr.hook ⤤
10421051
.tr.stroked ⬀
10431052
.br ↘\vs{text}
1053+
.br.bar 🢺
10441054
.br.double ⇘
10451055
.br.filled ⬊
10461056
.br.hook ⤥
10471057
.br.stroked ⬂
10481058
.tl ↖\vs{text}
1059+
.tl.bar 🢸
10491060
.tl.double ⇖
10501061
.tl.filled ⬉
10511062
.tl.hook ⤣
10521063
.tl.stroked ⬁
10531064
.bl ↙\vs{text}
1065+
.bl.bar 🢻
10541066
.bl.double ⇙
10551067
.bl.filled ⬋
10561068
.bl.hook ⤦
@@ -1070,6 +1082,7 @@ arrows
10701082
.lr ⇆
10711083
.lr.stop ↹
10721084
.rl ⇄
1085+
.rl.long 🣐
10731086
.tb ⇅
10741087
.bt ⇵
10751088
.rrr ⇶

src/numeral_systems.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,20 @@ declare_named! {
442442
/// > ०, १, २, ३, ४, ५, ६, ७, ८, ९, १०, ११
443443
Devanagari = "devanagari" ("१"),
444444

445+
/// Decimal positional notation using
446+
/// [Tibetan numerals](https://en.wikipedia.org/wiki/Tibetan_numerals).
447+
///
448+
/// ## Representable Numbers
449+
///
450+
/// All non-negative integers can be represented.
451+
///
452+
/// ## Example
453+
///
454+
/// The first twelve non-negative integers are represented as follows:
455+
///
456+
/// > ༠, ༡, ༢, ༣, ༤, ༥, ༦, ༧, ༨, ༩, ༡༠, ༡༡
457+
Tibetan = "tibetan" ("༡"),
458+
445459
/// Decimal positional notation using
446460
/// [Bengali numerals](https://en.wikipedia.org/wiki/Bengali_numerals).
447461
///
@@ -816,6 +830,10 @@ impl NamedNumeralSystem {
816830
'०', '१', '२', '३', '४', '५', '६', '७', '८', '९',
817831
]),
818832

833+
Self::Tibetan => NumeralSystem::Positional(&[
834+
'༠', '༡', '༢', '༣', '༤', '༥', '༦', '༧', '༨', '༩',
835+
]),
836+
819837
Self::Bengali => NumeralSystem::Positional(&[
820838
'০', '১', '২', '৩', '৪', '৫', '৬', '৭', '৮', '৯',
821839
]),
@@ -1419,6 +1437,7 @@ mod tests {
14191437
NamedNumeralSystem::EasternArabic => 277754701051910363703826860323053920831,
14201438
NamedNumeralSystem::Persian => 6232158096065129450489636457808686806,
14211439
NamedNumeralSystem::Devanagari => 327133969362282954753636774557232534052,
1440+
NamedNumeralSystem::Tibetan => 87580519645280744681237273097105390953,
14221441
NamedNumeralSystem::Bengali => 79096832028418218544110224478554962928,
14231442
NamedNumeralSystem::BengaliLetters => 269999388716378396079918080520770981179,
14241443
NamedNumeralSystem::Symbols => 88780534058354093087932015985325954737,

0 commit comments

Comments
 (0)