From 5bcf6ef85e59432eeaf820d26fb211d7c124257c Mon Sep 17 00:00:00 2001 From: Wesley Moore Date: Thu, 3 Oct 2024 16:27:34 +1000 Subject: [PATCH] Upgrade to Unicode 16.0 --- Makefile | 7 +- README.md | 10 +- src/case_folding_simple.rs | 36 +++++- src/lib.rs | 4 +- src/tables.rs | 241 +++++++++++++------------------------ 5 files changed, 128 insertions(+), 170 deletions(-) diff --git a/Makefile b/Makefile index 36926ee..f3725fd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ tables: - yeslogic-ucd-generate case-folding-simple --rust-match ../ucd-generate/ucd-15.0.0/ > src/case_folding_simple.rs - yeslogic-ucd-generate case-mapping ../ucd-generate/ucd-15.0.0/ > src/tables.rs + yeslogic-ucd-generate case-folding-simple --rust-match ../ucd-generate/ucd-16.0.0/ > src/case_folding_simple.rs + yeslogic-ucd-generate case-mapping ../ucd-generate/ucd-16.0.0/ > src/tables.rs + cargo fmt + sed -i.bak -E '/\(([0-9]+), &\[\1\]\)/d' src/tables.rs + rm src/tables.rs.bak .PHONY: tables diff --git a/README.md b/README.md index 12d79ab..3fd50a4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ unicode-case-mapping Version - Unicode Version + Unicode Version License @@ -19,7 +19,7 @@ unicode-case-mapping
Fast mapping of a `char` to lowercase, uppercase, titlecase, or its simple case folding -in Rust using Unicode 15.0 data. +in Rust using Unicode 16.0 data. Usage ----- @@ -79,10 +79,8 @@ some runs of repeated values in the first level array. Regenerating `tables.rs` ------------------------ -1. Regenerate with `yeslogic-ucd-generate` (see header of file). -2. Add `#[allow(dead_code)]` to each table to prevent warnings. -3. Delete entries that map to themselves. E.g. in Vim: - `:g/(\(\d\+\), &\[\1\])/d`. +1. Regenerate with `yeslogic-ucd-generate` (run `make`). +2. Add/restore `#[allow(dead_code)]` to each table to prevent warnings. [ucd-generate]: https://github.com/yeslogic/ucd-generate [to_uppercase]: https://doc.rust-lang.org/std/primitive.char.html#method.to_uppercase diff --git a/src/case_folding_simple.rs b/src/case_folding_simple.rs index 174cc6b..993564c 100644 --- a/src/case_folding_simple.rs +++ b/src/case_folding_simple.rs @@ -1,10 +1,10 @@ // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY: // -// yeslogic-ucd-generate case-folding-simple --rust-match ../ucd-generate/ucd-15.0.0/ +// yeslogic-ucd-generate case-folding-simple --rust-match ../ucd-generate/ucd-16.0.0/ // -// Unicode version: 15.0.0. +// Unicode version: 16.0.0. // -// yeslogic-ucd-generate 0.6.0 is available on crates.io. +// yeslogic-ucd-generate 0.7.0 is available on crates.io. use std::num::NonZeroU32; @@ -547,6 +547,7 @@ pub fn case_folding_simple(cp: u32) -> Option { 7302 => Some(NonZeroU32::new_unchecked(1098)), 7303 => Some(NonZeroU32::new_unchecked(1123)), 7304 => Some(NonZeroU32::new_unchecked(42571)), + 7305 => Some(NonZeroU32::new_unchecked(7306)), 7312 => Some(NonZeroU32::new_unchecked(4304)), 7313 => Some(NonZeroU32::new_unchecked(4305)), 7314 => Some(NonZeroU32::new_unchecked(4306)), @@ -801,10 +802,12 @@ pub fn case_folding_simple(cp: u32) -> Option { 8138 => Some(NonZeroU32::new_unchecked(8052)), 8139 => Some(NonZeroU32::new_unchecked(8053)), 8140 => Some(NonZeroU32::new_unchecked(8131)), + 8147 => Some(NonZeroU32::new_unchecked(912)), 8152 => Some(NonZeroU32::new_unchecked(8144)), 8153 => Some(NonZeroU32::new_unchecked(8145)), 8154 => Some(NonZeroU32::new_unchecked(8054)), 8155 => Some(NonZeroU32::new_unchecked(8055)), + 8163 => Some(NonZeroU32::new_unchecked(944)), 8168 => Some(NonZeroU32::new_unchecked(8160)), 8169 => Some(NonZeroU32::new_unchecked(8161)), 8170 => Some(NonZeroU32::new_unchecked(8058)), @@ -1097,9 +1100,13 @@ pub fn case_folding_simple(cp: u32) -> Option { 42950 => Some(NonZeroU32::new_unchecked(7566)), 42951 => Some(NonZeroU32::new_unchecked(42952)), 42953 => Some(NonZeroU32::new_unchecked(42954)), + 42955 => Some(NonZeroU32::new_unchecked(612)), + 42956 => Some(NonZeroU32::new_unchecked(42957)), 42960 => Some(NonZeroU32::new_unchecked(42961)), 42966 => Some(NonZeroU32::new_unchecked(42967)), 42968 => Some(NonZeroU32::new_unchecked(42969)), + 42970 => Some(NonZeroU32::new_unchecked(42971)), + 42972 => Some(NonZeroU32::new_unchecked(411)), 42997 => Some(NonZeroU32::new_unchecked(42998)), 43888 => Some(NonZeroU32::new_unchecked(5024)), 43889 => Some(NonZeroU32::new_unchecked(5025)), @@ -1181,6 +1188,7 @@ pub fn case_folding_simple(cp: u32) -> Option { 43965 => Some(NonZeroU32::new_unchecked(5101)), 43966 => Some(NonZeroU32::new_unchecked(5102)), 43967 => Some(NonZeroU32::new_unchecked(5103)), + 64261 => Some(NonZeroU32::new_unchecked(64262)), 65313 => Some(NonZeroU32::new_unchecked(65345)), 65314 => Some(NonZeroU32::new_unchecked(65346)), 65315 => Some(NonZeroU32::new_unchecked(65347)), @@ -1369,6 +1377,28 @@ pub fn case_folding_simple(cp: u32) -> Option { 68784 => Some(NonZeroU32::new_unchecked(68848)), 68785 => Some(NonZeroU32::new_unchecked(68849)), 68786 => Some(NonZeroU32::new_unchecked(68850)), + 68944 => Some(NonZeroU32::new_unchecked(68976)), + 68945 => Some(NonZeroU32::new_unchecked(68977)), + 68946 => Some(NonZeroU32::new_unchecked(68978)), + 68947 => Some(NonZeroU32::new_unchecked(68979)), + 68948 => Some(NonZeroU32::new_unchecked(68980)), + 68949 => Some(NonZeroU32::new_unchecked(68981)), + 68950 => Some(NonZeroU32::new_unchecked(68982)), + 68951 => Some(NonZeroU32::new_unchecked(68983)), + 68952 => Some(NonZeroU32::new_unchecked(68984)), + 68953 => Some(NonZeroU32::new_unchecked(68985)), + 68954 => Some(NonZeroU32::new_unchecked(68986)), + 68955 => Some(NonZeroU32::new_unchecked(68987)), + 68956 => Some(NonZeroU32::new_unchecked(68988)), + 68957 => Some(NonZeroU32::new_unchecked(68989)), + 68958 => Some(NonZeroU32::new_unchecked(68990)), + 68959 => Some(NonZeroU32::new_unchecked(68991)), + 68960 => Some(NonZeroU32::new_unchecked(68992)), + 68961 => Some(NonZeroU32::new_unchecked(68993)), + 68962 => Some(NonZeroU32::new_unchecked(68994)), + 68963 => Some(NonZeroU32::new_unchecked(68995)), + 68964 => Some(NonZeroU32::new_unchecked(68996)), + 68965 => Some(NonZeroU32::new_unchecked(68997)), 71840 => Some(NonZeroU32::new_unchecked(71872)), 71841 => Some(NonZeroU32::new_unchecked(71873)), 71842 => Some(NonZeroU32::new_unchecked(71874)), diff --git a/src/lib.rs b/src/lib.rs index af3a8f0..e54344f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,7 @@ //! //! // U+0307 is COMBINING DOT ABOVE //! assert_eq!(unicode_case_mapping::to_lowercase('İ'), ['i' as u32, 0x0307]); -//! assert_eq!(unicode_case_mapping::to_lowercase('ß'), ['ß' as u32, 0]); +//! assert_eq!(unicode_case_mapping::to_lowercase('ß'), [0; 2]); //! assert_eq!(unicode_case_mapping::to_uppercase('ß'), ['S' as u32, 'S' as u32, 0]); //! assert_eq!(unicode_case_mapping::to_titlecase('ß'), ['S' as u32, 's' as u32, 0]); //! assert_eq!(unicode_case_mapping::to_titlecase('-'), [0; 3]); @@ -23,4 +23,4 @@ pub use case_mapping::{case_folded, to_lowercase, to_titlecase, to_uppercase}; /// The version of [Unicode](http://www.unicode.org/) /// that this version of unicode-case-mapping was generated from. -pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0); +pub const UNICODE_VERSION: (u64, u64, u64) = (16, 0, 0); diff --git a/src/tables.rs b/src/tables.rs index f52d396..16bca4c 100644 --- a/src/tables.rs +++ b/src/tables.rs @@ -1,10 +1,10 @@ // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY: // -// yeslogic-ucd-generate case-mapping ../ucd-generate/ucd-15.0.0/ +// yeslogic-ucd-generate case-mapping ../ucd-generate/ucd-16.0.0/ // -// Unicode version: 15.0.0. +// Unicode version: 16.0.0. // -// yeslogic-ucd-generate 0.6.0 is available on crates.io. +// yeslogic-ucd-generate 0.7.0 is available on crates.io. #[allow(dead_code)] pub const LOWER: &'static [(u32, &'static [u32])] = &[ @@ -64,7 +64,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (220, &[252]), (221, &[253]), (222, &[254]), - (223, &[223]), (256, &[257]), (258, &[259]), (260, &[261]), @@ -101,7 +100,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (323, &[324]), (325, &[326]), (327, &[328]), - (329, &[329]), (330, &[331]), (332, &[333]), (334, &[335]), @@ -188,7 +186,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (490, &[491]), (492, &[493]), (494, &[495]), - (496, &[496]), (497, &[499]), (498, &[499]), (500, &[501]), @@ -248,7 +245,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (908, &[972]), (910, &[973]), (911, &[974]), - (912, &[912]), (913, &[945]), (914, &[946]), (915, &[947]), @@ -275,7 +271,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (937, &[969]), (938, &[970]), (939, &[971]), - (944, &[944]), (975, &[983]), (984, &[985]), (986, &[987]), @@ -482,7 +477,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (1364, &[1412]), (1365, &[1413]), (1366, &[1414]), - (1415, &[1415]), (4256, &[11520]), (4257, &[11521]), (4258, &[11522]), @@ -609,6 +603,7 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (5107, &[5115]), (5108, &[5116]), (5109, &[5117]), + (7305, &[7306]), (7312, &[4304]), (7313, &[4305]), (7314, &[4306]), @@ -730,11 +725,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (7824, &[7825]), (7826, &[7827]), (7828, &[7829]), - (7830, &[7830]), - (7831, &[7831]), - (7832, &[7832]), - (7833, &[7833]), - (7834, &[7834]), (7838, &[223]), (7840, &[7841]), (7842, &[7843]), @@ -820,10 +810,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (8011, &[8003]), (8012, &[8004]), (8013, &[8005]), - (8016, &[8016]), - (8018, &[8018]), - (8020, &[8020]), - (8022, &[8022]), (8025, &[8017]), (8027, &[8019]), (8029, &[8021]), @@ -836,14 +822,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (8045, &[8037]), (8046, &[8038]), (8047, &[8039]), - (8064, &[8064]), - (8065, &[8065]), - (8066, &[8066]), - (8067, &[8067]), - (8068, &[8068]), - (8069, &[8069]), - (8070, &[8070]), - (8071, &[8071]), (8072, &[8064]), (8073, &[8065]), (8074, &[8066]), @@ -852,14 +830,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (8077, &[8069]), (8078, &[8070]), (8079, &[8071]), - (8080, &[8080]), - (8081, &[8081]), - (8082, &[8082]), - (8083, &[8083]), - (8084, &[8084]), - (8085, &[8085]), - (8086, &[8086]), - (8087, &[8087]), (8088, &[8080]), (8089, &[8081]), (8090, &[8082]), @@ -868,14 +838,6 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (8093, &[8085]), (8094, &[8086]), (8095, &[8087]), - (8096, &[8096]), - (8097, &[8097]), - (8098, &[8098]), - (8099, &[8099]), - (8100, &[8100]), - (8101, &[8101]), - (8102, &[8102]), - (8103, &[8103]), (8104, &[8096]), (8105, &[8097]), (8106, &[8098]), @@ -884,49 +846,25 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (8109, &[8101]), (8110, &[8102]), (8111, &[8103]), - (8114, &[8114]), - (8115, &[8115]), - (8116, &[8116]), - (8118, &[8118]), - (8119, &[8119]), (8120, &[8112]), (8121, &[8113]), (8122, &[8048]), (8123, &[8049]), (8124, &[8115]), - (8130, &[8130]), - (8131, &[8131]), - (8132, &[8132]), - (8134, &[8134]), - (8135, &[8135]), (8136, &[8050]), (8137, &[8051]), (8138, &[8052]), (8139, &[8053]), (8140, &[8131]), - (8146, &[8146]), - (8147, &[8147]), - (8150, &[8150]), - (8151, &[8151]), (8152, &[8144]), (8153, &[8145]), (8154, &[8054]), (8155, &[8055]), - (8162, &[8162]), - (8163, &[8163]), - (8164, &[8164]), - (8166, &[8166]), - (8167, &[8167]), (8168, &[8160]), (8169, &[8161]), (8170, &[8058]), (8171, &[8059]), (8172, &[8165]), - (8178, &[8178]), - (8179, &[8179]), - (8180, &[8180]), - (8182, &[8182]), - (8183, &[8183]), (8184, &[8056]), (8185, &[8057]), (8186, &[8060]), @@ -1214,22 +1152,14 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (42950, &[7566]), (42951, &[42952]), (42953, &[42954]), + (42955, &[612]), + (42956, &[42957]), (42960, &[42961]), (42966, &[42967]), (42968, &[42969]), + (42970, &[42971]), + (42972, &[411]), (42997, &[42998]), - (64256, &[64256]), - (64257, &[64257]), - (64258, &[64258]), - (64259, &[64259]), - (64260, &[64260]), - (64261, &[64261]), - (64262, &[64262]), - (64275, &[64275]), - (64276, &[64276]), - (64277, &[64277]), - (64278, &[64278]), - (64279, &[64279]), (65313, &[65345]), (65314, &[65346]), (65315, &[65347]), @@ -1418,6 +1348,28 @@ pub const LOWER: &'static [(u32, &'static [u32])] = &[ (68784, &[68848]), (68785, &[68849]), (68786, &[68850]), + (68944, &[68976]), + (68945, &[68977]), + (68946, &[68978]), + (68947, &[68979]), + (68948, &[68980]), + (68949, &[68981]), + (68950, &[68982]), + (68951, &[68983]), + (68952, &[68984]), + (68953, &[68985]), + (68954, &[68986]), + (68955, &[68987]), + (68956, &[68988]), + (68957, &[68989]), + (68958, &[68990]), + (68959, &[68991]), + (68960, &[68992]), + (68961, &[68993]), + (68962, &[68994]), + (68963, &[68995]), + (68964, &[68996]), + (68965, &[68997]), (71840, &[71872]), (71841, &[71873]), (71842, &[71874]), @@ -1603,7 +1555,6 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (299, &[298]), (301, &[300]), (303, &[302]), - (304, &[304]), (305, &[73]), (307, &[306]), (309, &[308]), @@ -1653,6 +1604,7 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (405, &[502]), (409, &[408]), (410, &[573]), + (411, &[42972]), (414, &[544]), (417, &[416]), (419, &[418]), @@ -1744,6 +1696,7 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (608, &[403]), (609, &[42924]), (611, &[404]), + (612, &[42955]), (613, &[42893]), (614, &[42922]), (616, &[407]), @@ -2083,6 +2036,7 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (7302, &[1066]), (7303, &[1122]), (7304, &[42570]), + (7306, &[7305]), (7545, &[42877]), (7549, &[11363]), (7566, &[42950]), @@ -2663,9 +2617,11 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (42947, &[42946]), (42952, &[42951]), (42954, &[42953]), + (42957, &[42956]), (42961, &[42960]), (42967, &[42966]), (42969, &[42968]), + (42971, &[42970]), (42998, &[42997]), (43859, &[42931]), (43888, &[5024]), @@ -2948,6 +2904,28 @@ pub const UPPER: &'static [(u32, &'static [u32])] = &[ (68848, &[68784]), (68849, &[68785]), (68850, &[68786]), + (68976, &[68944]), + (68977, &[68945]), + (68978, &[68946]), + (68979, &[68947]), + (68980, &[68948]), + (68981, &[68949]), + (68982, &[68950]), + (68983, &[68951]), + (68984, &[68952]), + (68985, &[68953]), + (68986, &[68954]), + (68987, &[68955]), + (68988, &[68956]), + (68989, &[68957]), + (68990, &[68958]), + (68991, &[68959]), + (68992, &[68960]), + (68993, &[68961]), + (68994, &[68962]), + (68995, &[68963]), + (68996, &[68964]), + (68997, &[68965]), (71872, &[71840]), (71873, &[71841]), (71874, &[71842]), @@ -3133,7 +3111,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (299, &[298]), (301, &[300]), (303, &[302]), - (304, &[304]), (305, &[73]), (307, &[306]), (309, &[308]), @@ -3183,6 +3160,7 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (405, &[502]), (409, &[408]), (410, &[573]), + (411, &[42972]), (414, &[544]), (417, &[416]), (419, &[418]), @@ -3196,13 +3174,10 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (445, &[444]), (447, &[503]), (452, &[453]), - (453, &[453]), (454, &[453]), (455, &[456]), - (456, &[456]), (457, &[456]), (458, &[459]), - (459, &[459]), (460, &[459]), (462, &[461]), (464, &[463]), @@ -3224,7 +3199,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (495, &[494]), (496, &[74, 780]), (497, &[498]), - (498, &[498]), (499, &[498]), (501, &[500]), (505, &[504]), @@ -3278,6 +3252,7 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (608, &[403]), (609, &[42924]), (611, &[404]), + (612, &[42955]), (613, &[42893]), (614, &[42922]), (616, &[407]), @@ -3556,52 +3531,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (1413, &[1365]), (1414, &[1366]), (1415, &[1333, 1410]), - (4304, &[4304]), - (4305, &[4305]), - (4306, &[4306]), - (4307, &[4307]), - (4308, &[4308]), - (4309, &[4309]), - (4310, &[4310]), - (4311, &[4311]), - (4312, &[4312]), - (4313, &[4313]), - (4314, &[4314]), - (4315, &[4315]), - (4316, &[4316]), - (4317, &[4317]), - (4318, &[4318]), - (4319, &[4319]), - (4320, &[4320]), - (4321, &[4321]), - (4322, &[4322]), - (4323, &[4323]), - (4324, &[4324]), - (4325, &[4325]), - (4326, &[4326]), - (4327, &[4327]), - (4328, &[4328]), - (4329, &[4329]), - (4330, &[4330]), - (4331, &[4331]), - (4332, &[4332]), - (4333, &[4333]), - (4334, &[4334]), - (4335, &[4335]), - (4336, &[4336]), - (4337, &[4337]), - (4338, &[4338]), - (4339, &[4339]), - (4340, &[4340]), - (4341, &[4341]), - (4342, &[4342]), - (4343, &[4343]), - (4344, &[4344]), - (4345, &[4345]), - (4346, &[4346]), - (4349, &[4349]), - (4350, &[4350]), - (4351, &[4351]), (5112, &[5104]), (5113, &[5105]), (5114, &[5106]), @@ -3617,6 +3546,7 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (7302, &[1066]), (7303, &[1122]), (7304, &[42570]), + (7306, &[7305]), (7545, &[42877]), (7549, &[11363]), (7566, &[42950]), @@ -3823,14 +3753,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (8069, &[8077]), (8070, &[8078]), (8071, &[8079]), - (8072, &[8072]), - (8073, &[8073]), - (8074, &[8074]), - (8075, &[8075]), - (8076, &[8076]), - (8077, &[8077]), - (8078, &[8078]), - (8079, &[8079]), (8080, &[8088]), (8081, &[8089]), (8082, &[8090]), @@ -3839,14 +3761,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (8085, &[8093]), (8086, &[8094]), (8087, &[8095]), - (8088, &[8088]), - (8089, &[8089]), - (8090, &[8090]), - (8091, &[8091]), - (8092, &[8092]), - (8093, &[8093]), - (8094, &[8094]), - (8095, &[8095]), (8096, &[8104]), (8097, &[8105]), (8098, &[8106]), @@ -3855,14 +3769,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (8101, &[8109]), (8102, &[8110]), (8103, &[8111]), - (8104, &[8104]), - (8105, &[8105]), - (8106, &[8106]), - (8107, &[8107]), - (8108, &[8108]), - (8109, &[8109]), - (8110, &[8110]), - (8111, &[8111]), (8112, &[8120]), (8113, &[8121]), (8114, &[8122, 837]), @@ -3870,14 +3776,12 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (8116, &[902, 837]), (8118, &[913, 834]), (8119, &[913, 834, 837]), - (8124, &[8124]), (8126, &[921]), (8130, &[8138, 837]), (8131, &[8140]), (8132, &[905, 837]), (8134, &[919, 834]), (8135, &[919, 834, 837]), - (8140, &[8140]), (8144, &[8152]), (8145, &[8153]), (8146, &[921, 776, 768]), @@ -3897,7 +3801,6 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (8180, &[911, 837]), (8182, &[937, 834]), (8183, &[937, 834, 837]), - (8188, &[8188]), (8526, &[8498]), (8560, &[8544]), (8561, &[8545]), @@ -4197,9 +4100,11 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (42947, &[42946]), (42952, &[42951]), (42954, &[42953]), + (42957, &[42956]), (42961, &[42960]), (42967, &[42966]), (42969, &[42968]), + (42971, &[42970]), (42998, &[42997]), (43859, &[42931]), (43888, &[5024]), @@ -4482,6 +4387,28 @@ pub const TITLE: &'static [(u32, &'static [u32])] = &[ (68848, &[68784]), (68849, &[68785]), (68850, &[68786]), + (68976, &[68944]), + (68977, &[68945]), + (68978, &[68946]), + (68979, &[68947]), + (68980, &[68948]), + (68981, &[68949]), + (68982, &[68950]), + (68983, &[68951]), + (68984, &[68952]), + (68985, &[68953]), + (68986, &[68954]), + (68987, &[68955]), + (68988, &[68956]), + (68989, &[68957]), + (68990, &[68958]), + (68991, &[68959]), + (68992, &[68960]), + (68993, &[68961]), + (68994, &[68962]), + (68995, &[68963]), + (68996, &[68964]), + (68997, &[68965]), (71872, &[71840]), (71873, &[71841]), (71874, &[71842]),