Skip to content

Commit 990fa09

Browse files
ManishearthManishearth
authored
Merge pull request #46 from Marcondiro/master
Update Unicode to version 17.0.0
2 parents 364fb5b + 4410add commit 990fa09

File tree

3 files changed

+56
-39
lines changed

3 files changed

+56
-39
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [Unreleased]
4+
5+
- Update to Unicode 17.0.0.
6+
37
## 0.2.6
48

59
- Update to Unicode 16.0.0.

‎scripts/unicode.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def format_table_content(f, content, indent):
8585
def load_properties(f, interestingprops):
8686
fetch(f)
8787
props = {}
88-
re1 = re.compile("^ *([0-9A-F]+) *; *(\w+)")
89-
re2 = re.compile("^ *([0-9A-F]+)\.\.([0-9A-F]+) *; *(\w+)")
88+
re1 = re.compile(r"^ *([0-9A-F]+) *; *(\w+)")
89+
re2 = re.compile(r"^ *([0-9A-F]+)\.\.([0-9A-F]+) *; *(\w+)")
9090

9191
for line in fileinput.input(os.path.basename(f)):
9292
prop = None
@@ -178,7 +178,7 @@ def emit_property_module(f, mod, tbl, emit):
178178
# download and parse all the data
179179
fetch("ReadMe.txt")
180180
with open("ReadMe.txt") as readme:
181-
pattern = "for Version (\d+)\.(\d+)\.(\d+) of the Unicode"
181+
pattern = r"for Version (\d+)\.(\d+)\.(\d+) of the Unicode"
182182
unicode_version = re.search(pattern, readme.read()).groups()
183183
rf.write("""
184184
/// The version of [Unicode](http://www.unicode.org/)

‎src/tables.rs‎

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
/// The version of [Unicode](http://www.unicode.org/)
1616
/// that this version of unicode-xid is based on.
17-
pub const UNICODE_VERSION: (u64, u64, u64) = (16, 0, 0);
17+
pub const UNICODE_VERSION: (u64, u64, u64) = (17, 0, 0);
1818

1919
fn bsearch_range_table(c: char, r: &[(char, char)]) -> bool {
2020
use core::cmp::Ordering::{Equal, Greater, Less};
@@ -90,7 +90,7 @@ pub mod derived_property {
9090
('\u{840}', '\u{85b}'),
9191
('\u{860}', '\u{86a}'),
9292
('\u{870}', '\u{887}'),
93-
('\u{889}', '\u{88e}'),
93+
('\u{889}', '\u{88f}'),
9494
('\u{897}', '\u{8e1}'),
9595
('\u{8e3}', '\u{963}'),
9696
('\u{966}', '\u{96f}'),
@@ -180,7 +180,7 @@ pub mod derived_property {
180180
('\u{c4a}', '\u{c4d}'),
181181
('\u{c55}', '\u{c56}'),
182182
('\u{c58}', '\u{c5a}'),
183-
('\u{c5d}', '\u{c5d}'),
183+
('\u{c5c}', '\u{c5d}'),
184184
('\u{c60}', '\u{c63}'),
185185
('\u{c66}', '\u{c6f}'),
186186
('\u{c80}', '\u{c83}'),
@@ -193,7 +193,7 @@ pub mod derived_property {
193193
('\u{cc6}', '\u{cc8}'),
194194
('\u{cca}', '\u{ccd}'),
195195
('\u{cd5}', '\u{cd6}'),
196-
('\u{cdd}', '\u{cde}'),
196+
('\u{cdc}', '\u{cde}'),
197197
('\u{ce0}', '\u{ce3}'),
198198
('\u{ce6}', '\u{cef}'),
199199
('\u{cf1}', '\u{cf3}'),
@@ -306,7 +306,8 @@ pub mod derived_property {
306306
('\u{1a90}', '\u{1a99}'),
307307
('\u{1aa7}', '\u{1aa7}'),
308308
('\u{1ab0}', '\u{1abd}'),
309-
('\u{1abf}', '\u{1ace}'),
309+
('\u{1abf}', '\u{1add}'),
310+
('\u{1ae0}', '\u{1aeb}'),
310311
('\u{1b00}', '\u{1b4c}'),
311312
('\u{1b50}', '\u{1b59}'),
312313
('\u{1b6b}', '\u{1b73}'),
@@ -399,11 +400,8 @@ pub mod derived_property {
399400
('\u{a67f}', '\u{a6f1}'),
400401
('\u{a717}', '\u{a71f}'),
401402
('\u{a722}', '\u{a788}'),
402-
('\u{a78b}', '\u{a7cd}'),
403-
('\u{a7d0}', '\u{a7d1}'),
404-
('\u{a7d3}', '\u{a7d3}'),
405-
('\u{a7d5}', '\u{a7dc}'),
406-
('\u{a7f2}', '\u{a827}'),
403+
('\u{a78b}', '\u{a7dc}'),
404+
('\u{a7f1}', '\u{a827}'),
407405
('\u{a82c}', '\u{a82c}'),
408406
('\u{a840}', '\u{a873}'),
409407
('\u{a880}', '\u{a8c5}'),
@@ -525,6 +523,7 @@ pub mod derived_property {
525523
('\u{108f4}', '\u{108f5}'),
526524
('\u{10900}', '\u{10915}'),
527525
('\u{10920}', '\u{10939}'),
526+
('\u{10940}', '\u{10959}'),
528527
('\u{10980}', '\u{109b7}'),
529528
('\u{109be}', '\u{109bf}'),
530529
('\u{10a00}', '\u{10a03}'),
@@ -553,8 +552,8 @@ pub mod derived_property {
553552
('\u{10e80}', '\u{10ea9}'),
554553
('\u{10eab}', '\u{10eac}'),
555554
('\u{10eb0}', '\u{10eb1}'),
556-
('\u{10ec2}', '\u{10ec4}'),
557-
('\u{10efc}', '\u{10f1c}'),
555+
('\u{10ec2}', '\u{10ec7}'),
556+
('\u{10efa}', '\u{10f1c}'),
558557
('\u{10f27}', '\u{10f27}'),
559558
('\u{10f30}', '\u{10f50}'),
560559
('\u{10f70}', '\u{10f85}'),
@@ -648,6 +647,7 @@ pub mod derived_property {
648647
('\u{11a50}', '\u{11a99}'),
649648
('\u{11a9d}', '\u{11a9d}'),
650649
('\u{11ab0}', '\u{11af8}'),
650+
('\u{11b60}', '\u{11b67}'),
651651
('\u{11bc0}', '\u{11be0}'),
652652
('\u{11bf0}', '\u{11bf9}'),
653653
('\u{11c00}', '\u{11c08}'),
@@ -670,6 +670,8 @@ pub mod derived_property {
670670
('\u{11d90}', '\u{11d91}'),
671671
('\u{11d93}', '\u{11d98}'),
672672
('\u{11da0}', '\u{11da9}'),
673+
('\u{11db0}', '\u{11ddb}'),
674+
('\u{11de0}', '\u{11de9}'),
673675
('\u{11ee0}', '\u{11ef6}'),
674676
('\u{11f00}', '\u{11f10}'),
675677
('\u{11f12}', '\u{11f3a}'),
@@ -700,15 +702,17 @@ pub mod derived_property {
700702
('\u{16d40}', '\u{16d6c}'),
701703
('\u{16d70}', '\u{16d79}'),
702704
('\u{16e40}', '\u{16e7f}'),
705+
('\u{16ea0}', '\u{16eb8}'),
706+
('\u{16ebb}', '\u{16ed3}'),
703707
('\u{16f00}', '\u{16f4a}'),
704708
('\u{16f4f}', '\u{16f87}'),
705709
('\u{16f8f}', '\u{16f9f}'),
706710
('\u{16fe0}', '\u{16fe1}'),
707711
('\u{16fe3}', '\u{16fe4}'),
708-
('\u{16ff0}', '\u{16ff1}'),
709-
('\u{17000}', '\u{187f7}'),
710-
('\u{18800}', '\u{18cd5}'),
711-
('\u{18cff}', '\u{18d08}'),
712+
('\u{16ff0}', '\u{16ff6}'),
713+
('\u{17000}', '\u{18cd5}'),
714+
('\u{18cff}', '\u{18d1e}'),
715+
('\u{18d80}', '\u{18df2}'),
712716
('\u{1aff0}', '\u{1aff3}'),
713717
('\u{1aff5}', '\u{1affb}'),
714718
('\u{1affd}', '\u{1affe}'),
@@ -786,6 +790,9 @@ pub mod derived_property {
786790
('\u{1e2c0}', '\u{1e2f9}'),
787791
('\u{1e4d0}', '\u{1e4f9}'),
788792
('\u{1e5d0}', '\u{1e5fa}'),
793+
('\u{1e6c0}', '\u{1e6de}'),
794+
('\u{1e6e0}', '\u{1e6f5}'),
795+
('\u{1e6fe}', '\u{1e6ff}'),
789796
('\u{1e7e0}', '\u{1e7e6}'),
790797
('\u{1e7e8}', '\u{1e7eb}'),
791798
('\u{1e7ed}', '\u{1e7ee}'),
@@ -829,14 +836,13 @@ pub mod derived_property {
829836
('\u{1eeab}', '\u{1eebb}'),
830837
('\u{1fbf0}', '\u{1fbf9}'),
831838
('\u{20000}', '\u{2a6df}'),
832-
('\u{2a700}', '\u{2b739}'),
833-
('\u{2b740}', '\u{2b81d}'),
834-
('\u{2b820}', '\u{2cea1}'),
839+
('\u{2a700}', '\u{2b81d}'),
840+
('\u{2b820}', '\u{2cead}'),
835841
('\u{2ceb0}', '\u{2ebe0}'),
836842
('\u{2ebf0}', '\u{2ee5d}'),
837843
('\u{2f800}', '\u{2fa1d}'),
838844
('\u{30000}', '\u{3134a}'),
839-
('\u{31350}', '\u{323af}'),
845+
('\u{31350}', '\u{33479}'),
840846
('\u{e0100}', '\u{e01ef}'),
841847
];
842848

@@ -895,7 +901,7 @@ pub mod derived_property {
895901
('\u{840}', '\u{858}'),
896902
('\u{860}', '\u{86a}'),
897903
('\u{870}', '\u{887}'),
898-
('\u{889}', '\u{88e}'),
904+
('\u{889}', '\u{88f}'),
899905
('\u{8a0}', '\u{8c9}'),
900906
('\u{904}', '\u{939}'),
901907
('\u{93d}', '\u{93d}'),
@@ -961,7 +967,7 @@ pub mod derived_property {
961967
('\u{c2a}', '\u{c39}'),
962968
('\u{c3d}', '\u{c3d}'),
963969
('\u{c58}', '\u{c5a}'),
964-
('\u{c5d}', '\u{c5d}'),
970+
('\u{c5c}', '\u{c5d}'),
965971
('\u{c60}', '\u{c61}'),
966972
('\u{c80}', '\u{c80}'),
967973
('\u{c85}', '\u{c8c}'),
@@ -970,7 +976,7 @@ pub mod derived_property {
970976
('\u{caa}', '\u{cb3}'),
971977
('\u{cb5}', '\u{cb9}'),
972978
('\u{cbd}', '\u{cbd}'),
973-
('\u{cdd}', '\u{cde}'),
979+
('\u{cdc}', '\u{cde}'),
974980
('\u{ce0}', '\u{ce1}'),
975981
('\u{cf1}', '\u{cf2}'),
976982
('\u{d04}', '\u{d0c}'),
@@ -1152,11 +1158,8 @@ pub mod derived_property {
11521158
('\u{a6a0}', '\u{a6ef}'),
11531159
('\u{a717}', '\u{a71f}'),
11541160
('\u{a722}', '\u{a788}'),
1155-
('\u{a78b}', '\u{a7cd}'),
1156-
('\u{a7d0}', '\u{a7d1}'),
1157-
('\u{a7d3}', '\u{a7d3}'),
1158-
('\u{a7d5}', '\u{a7dc}'),
1159-
('\u{a7f2}', '\u{a801}'),
1161+
('\u{a78b}', '\u{a7dc}'),
1162+
('\u{a7f1}', '\u{a801}'),
11601163
('\u{a803}', '\u{a805}'),
11611164
('\u{a807}', '\u{a80a}'),
11621165
('\u{a80c}', '\u{a822}'),
@@ -1279,6 +1282,7 @@ pub mod derived_property {
12791282
('\u{108f4}', '\u{108f5}'),
12801283
('\u{10900}', '\u{10915}'),
12811284
('\u{10920}', '\u{10939}'),
1285+
('\u{10940}', '\u{10959}'),
12821286
('\u{10980}', '\u{109b7}'),
12831287
('\u{109be}', '\u{109bf}'),
12841288
('\u{10a00}', '\u{10a00}'),
@@ -1301,7 +1305,7 @@ pub mod derived_property {
13011305
('\u{10d6f}', '\u{10d85}'),
13021306
('\u{10e80}', '\u{10ea9}'),
13031307
('\u{10eb0}', '\u{10eb1}'),
1304-
('\u{10ec2}', '\u{10ec4}'),
1308+
('\u{10ec2}', '\u{10ec7}'),
13051309
('\u{10f00}', '\u{10f1c}'),
13061310
('\u{10f27}', '\u{10f27}'),
13071311
('\u{10f30}', '\u{10f45}'),
@@ -1394,6 +1398,7 @@ pub mod derived_property {
13941398
('\u{11d67}', '\u{11d68}'),
13951399
('\u{11d6a}', '\u{11d89}'),
13961400
('\u{11d98}', '\u{11d98}'),
1401+
('\u{11db0}', '\u{11ddb}'),
13971402
('\u{11ee0}', '\u{11ef2}'),
13981403
('\u{11f02}', '\u{11f02}'),
13991404
('\u{11f04}', '\u{11f10}'),
@@ -1418,14 +1423,17 @@ pub mod derived_property {
14181423
('\u{16b7d}', '\u{16b8f}'),
14191424
('\u{16d40}', '\u{16d6c}'),
14201425
('\u{16e40}', '\u{16e7f}'),
1426+
('\u{16ea0}', '\u{16eb8}'),
1427+
('\u{16ebb}', '\u{16ed3}'),
14211428
('\u{16f00}', '\u{16f4a}'),
14221429
('\u{16f50}', '\u{16f50}'),
14231430
('\u{16f93}', '\u{16f9f}'),
14241431
('\u{16fe0}', '\u{16fe1}'),
14251432
('\u{16fe3}', '\u{16fe3}'),
1426-
('\u{17000}', '\u{187f7}'),
1427-
('\u{18800}', '\u{18cd5}'),
1428-
('\u{18cff}', '\u{18d08}'),
1433+
('\u{16ff2}', '\u{16ff6}'),
1434+
('\u{17000}', '\u{18cd5}'),
1435+
('\u{18cff}', '\u{18d1e}'),
1436+
('\u{18d80}', '\u{18df2}'),
14291437
('\u{1aff0}', '\u{1aff3}'),
14301438
('\u{1aff5}', '\u{1affb}'),
14311439
('\u{1affd}', '\u{1affe}'),
@@ -1480,6 +1488,12 @@ pub mod derived_property {
14801488
('\u{1e4d0}', '\u{1e4eb}'),
14811489
('\u{1e5d0}', '\u{1e5ed}'),
14821490
('\u{1e5f0}', '\u{1e5f0}'),
1491+
('\u{1e6c0}', '\u{1e6de}'),
1492+
('\u{1e6e0}', '\u{1e6e2}'),
1493+
('\u{1e6e4}', '\u{1e6e5}'),
1494+
('\u{1e6e7}', '\u{1e6ed}'),
1495+
('\u{1e6f0}', '\u{1e6f4}'),
1496+
('\u{1e6fe}', '\u{1e6ff}'),
14831497
('\u{1e7e0}', '\u{1e7e6}'),
14841498
('\u{1e7e8}', '\u{1e7eb}'),
14851499
('\u{1e7ed}', '\u{1e7ee}'),
@@ -1521,14 +1535,13 @@ pub mod derived_property {
15211535
('\u{1eea5}', '\u{1eea9}'),
15221536
('\u{1eeab}', '\u{1eebb}'),
15231537
('\u{20000}', '\u{2a6df}'),
1524-
('\u{2a700}', '\u{2b739}'),
1525-
('\u{2b740}', '\u{2b81d}'),
1526-
('\u{2b820}', '\u{2cea1}'),
1538+
('\u{2a700}', '\u{2b81d}'),
1539+
('\u{2b820}', '\u{2cead}'),
15271540
('\u{2ceb0}', '\u{2ebe0}'),
15281541
('\u{2ebf0}', '\u{2ee5d}'),
15291542
('\u{2f800}', '\u{2fa1d}'),
15301543
('\u{30000}', '\u{3134a}'),
1531-
('\u{31350}', '\u{323af}'),
1544+
('\u{31350}', '\u{33479}'),
15321545
];
15331546

15341547
pub fn XID_Start(c: char) -> bool {

0 commit comments

Comments
 (0)