diff --git a/README.md b/README.md index 35e24df..ac88d1a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ unicode-general-category Version - Unicode Version + Unicode Version License @@ -19,7 +19,7 @@ unicode-general-category
Fast lookup of the Unicode General Category property for `char` in Rust using -Unicode 14.0 data. This crate is no-std compatible. +Unicode 15.0 data. This crate is no-std compatible. Usage ----- diff --git a/src/lib.rs b/src/lib.rs index c2e829a..1ce3918 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,7 +17,7 @@ pub use tables::GeneralCategory; /// The version of [Unicode](http://www.unicode.org/) /// that this version of unicode-general-category was generated from. -pub const UNICODE_VERSION: (u64, u64, u64) = (14, 0, 0); +pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0); #[cfg(test)] mod test { diff --git a/src/tables.rs b/src/tables.rs index e570799..218d88e 100644 --- a/src/tables.rs +++ b/src/tables.rs @@ -1,11 +1,10 @@ // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY: // -// yeslogic-ucd-generate general-category --rust-enum /home/wmoore/Downloads/ucd-14.0 +// yeslogic-ucd-generate general-category --rust-enum ../ucd-generate/ucd-15.0.0 // -// Unicode version: 14.0.0. +// Unicode version: 15.0.0. // -// yeslogic-ucd-generate is available on GitHub: -// https://github.com/yeslogic/ucd-generate/tree/3b21e76 +// yeslogic-ucd-generate 0.6.0 is available on crates.io. #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)] pub enum GeneralCategory { @@ -1071,7 +1070,8 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (3302, 3311, GeneralCategory::DecimalNumber), (3312, 3312, GeneralCategory::Unassigned), (3313, 3314, GeneralCategory::OtherLetter), - (3315, 3327, GeneralCategory::Unassigned), + (3315, 3315, GeneralCategory::SpacingMark), + (3316, 3327, GeneralCategory::Unassigned), (3328, 3329, GeneralCategory::NonspacingMark), (3330, 3331, GeneralCategory::SpacingMark), (3332, 3340, GeneralCategory::OtherLetter), @@ -1162,8 +1162,8 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (3781, 3781, GeneralCategory::Unassigned), (3782, 3782, GeneralCategory::ModifierLetter), (3783, 3783, GeneralCategory::Unassigned), - (3784, 3789, GeneralCategory::NonspacingMark), - (3790, 3791, GeneralCategory::Unassigned), + (3784, 3790, GeneralCategory::NonspacingMark), + (3791, 3791, GeneralCategory::Unassigned), (3792, 3801, GeneralCategory::DecimalNumber), (3802, 3803, GeneralCategory::Unassigned), (3804, 3807, GeneralCategory::OtherLetter), @@ -3145,7 +3145,8 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (69293, 69293, GeneralCategory::DashPunctuation), (69294, 69295, GeneralCategory::Unassigned), (69296, 69297, GeneralCategory::OtherLetter), - (69298, 69375, GeneralCategory::Unassigned), + (69298, 69372, GeneralCategory::Unassigned), + (69373, 69375, GeneralCategory::NonspacingMark), (69376, 69404, GeneralCategory::OtherLetter), (69405, 69414, GeneralCategory::OtherNumber), (69415, 69415, GeneralCategory::OtherLetter), @@ -3244,7 +3245,9 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (70198, 70199, GeneralCategory::NonspacingMark), (70200, 70205, GeneralCategory::OtherPunctuation), (70206, 70206, GeneralCategory::NonspacingMark), - (70207, 70271, GeneralCategory::Unassigned), + (70207, 70208, GeneralCategory::OtherLetter), + (70209, 70209, GeneralCategory::NonspacingMark), + (70210, 70271, GeneralCategory::Unassigned), (70272, 70278, GeneralCategory::OtherLetter), (70279, 70279, GeneralCategory::Unassigned), (70280, 70280, GeneralCategory::OtherLetter), @@ -3457,7 +3460,9 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (72350, 72354, GeneralCategory::OtherPunctuation), (72355, 72367, GeneralCategory::Unassigned), (72368, 72440, GeneralCategory::OtherLetter), - (72441, 72703, GeneralCategory::Unassigned), + (72441, 72447, GeneralCategory::Unassigned), + (72448, 72457, GeneralCategory::OtherPunctuation), + (72458, 72703, GeneralCategory::Unassigned), (72704, 72712, GeneralCategory::OtherLetter), (72713, 72713, GeneralCategory::Unassigned), (72714, 72750, GeneralCategory::OtherLetter), @@ -3523,7 +3528,23 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (73459, 73460, GeneralCategory::NonspacingMark), (73461, 73462, GeneralCategory::SpacingMark), (73463, 73464, GeneralCategory::OtherPunctuation), - (73465, 73647, GeneralCategory::Unassigned), + (73465, 73471, GeneralCategory::Unassigned), + (73472, 73473, GeneralCategory::NonspacingMark), + (73474, 73474, GeneralCategory::OtherLetter), + (73475, 73475, GeneralCategory::SpacingMark), + (73476, 73488, GeneralCategory::OtherLetter), + (73489, 73489, GeneralCategory::Unassigned), + (73490, 73523, GeneralCategory::OtherLetter), + (73524, 73525, GeneralCategory::SpacingMark), + (73526, 73530, GeneralCategory::NonspacingMark), + (73531, 73533, GeneralCategory::Unassigned), + (73534, 73535, GeneralCategory::SpacingMark), + (73536, 73536, GeneralCategory::NonspacingMark), + (73537, 73537, GeneralCategory::SpacingMark), + (73538, 73538, GeneralCategory::NonspacingMark), + (73539, 73551, GeneralCategory::OtherPunctuation), + (73552, 73561, GeneralCategory::DecimalNumber), + (73562, 73647, GeneralCategory::Unassigned), (73648, 73648, GeneralCategory::OtherLetter), (73649, 73663, GeneralCategory::Unassigned), (73664, 73684, GeneralCategory::OtherNumber), @@ -3543,10 +3564,12 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (77712, 77808, GeneralCategory::OtherLetter), (77809, 77810, GeneralCategory::OtherPunctuation), (77811, 77823, GeneralCategory::Unassigned), - (77824, 78894, GeneralCategory::OtherLetter), - (78895, 78895, GeneralCategory::Unassigned), - (78896, 78904, GeneralCategory::Format), - (78905, 82943, GeneralCategory::Unassigned), + (77824, 78895, GeneralCategory::OtherLetter), + (78896, 78911, GeneralCategory::Format), + (78912, 78912, GeneralCategory::NonspacingMark), + (78913, 78918, GeneralCategory::OtherLetter), + (78919, 78933, GeneralCategory::NonspacingMark), + (78934, 82943, GeneralCategory::Unassigned), (82944, 83526, GeneralCategory::OtherLetter), (83527, 92159, GeneralCategory::Unassigned), (92160, 92728, GeneralCategory::OtherLetter), @@ -3615,9 +3638,13 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (110589, 110590, GeneralCategory::ModifierLetter), (110591, 110591, GeneralCategory::Unassigned), (110592, 110882, GeneralCategory::OtherLetter), - (110883, 110927, GeneralCategory::Unassigned), + (110883, 110897, GeneralCategory::Unassigned), + (110898, 110898, GeneralCategory::OtherLetter), + (110899, 110927, GeneralCategory::Unassigned), (110928, 110930, GeneralCategory::OtherLetter), - (110931, 110947, GeneralCategory::Unassigned), + (110931, 110932, GeneralCategory::Unassigned), + (110933, 110933, GeneralCategory::OtherLetter), + (110934, 110947, GeneralCategory::Unassigned), (110948, 110951, GeneralCategory::OtherLetter), (110952, 110959, GeneralCategory::Unassigned), (110960, 111355, GeneralCategory::OtherLetter), @@ -3661,7 +3688,9 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (119296, 119361, GeneralCategory::OtherSymbol), (119362, 119364, GeneralCategory::NonspacingMark), (119365, 119365, GeneralCategory::OtherSymbol), - (119366, 119519, GeneralCategory::Unassigned), + (119366, 119487, GeneralCategory::Unassigned), + (119488, 119507, GeneralCategory::OtherNumber), + (119508, 119519, GeneralCategory::Unassigned), (119520, 119539, GeneralCategory::OtherNumber), (119540, 119551, GeneralCategory::Unassigned), (119552, 119638, GeneralCategory::OtherSymbol), @@ -3776,7 +3805,9 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (122624, 122633, GeneralCategory::LowercaseLetter), (122634, 122634, GeneralCategory::OtherLetter), (122635, 122654, GeneralCategory::LowercaseLetter), - (122655, 122879, GeneralCategory::Unassigned), + (122655, 122660, GeneralCategory::Unassigned), + (122661, 122666, GeneralCategory::LowercaseLetter), + (122667, 122879, GeneralCategory::Unassigned), (122880, 122886, GeneralCategory::NonspacingMark), (122887, 122887, GeneralCategory::Unassigned), (122888, 122904, GeneralCategory::NonspacingMark), @@ -3786,7 +3817,11 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (122915, 122916, GeneralCategory::NonspacingMark), (122917, 122917, GeneralCategory::Unassigned), (122918, 122922, GeneralCategory::NonspacingMark), - (122923, 123135, GeneralCategory::Unassigned), + (122923, 122927, GeneralCategory::Unassigned), + (122928, 122989, GeneralCategory::ModifierLetter), + (122990, 123022, GeneralCategory::Unassigned), + (123023, 123023, GeneralCategory::NonspacingMark), + (123024, 123135, GeneralCategory::Unassigned), (123136, 123180, GeneralCategory::OtherLetter), (123181, 123183, GeneralCategory::Unassigned), (123184, 123190, GeneralCategory::NonspacingMark), @@ -3805,7 +3840,12 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (123632, 123641, GeneralCategory::DecimalNumber), (123642, 123646, GeneralCategory::Unassigned), (123647, 123647, GeneralCategory::CurrencySymbol), - (123648, 124895, GeneralCategory::Unassigned), + (123648, 124111, GeneralCategory::Unassigned), + (124112, 124138, GeneralCategory::OtherLetter), + (124139, 124139, GeneralCategory::ModifierLetter), + (124140, 124143, GeneralCategory::NonspacingMark), + (124144, 124153, GeneralCategory::DecimalNumber), + (124154, 124895, GeneralCategory::Unassigned), (124896, 124902, GeneralCategory::OtherLetter), (124903, 124903, GeneralCategory::Unassigned), (124904, 124907, GeneralCategory::OtherLetter), @@ -3934,15 +3974,15 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (127744, 127994, GeneralCategory::OtherSymbol), (127995, 127999, GeneralCategory::ModifierSymbol), (128000, 128727, GeneralCategory::OtherSymbol), - (128728, 128732, GeneralCategory::Unassigned), - (128733, 128748, GeneralCategory::OtherSymbol), + (128728, 128731, GeneralCategory::Unassigned), + (128732, 128748, GeneralCategory::OtherSymbol), (128749, 128751, GeneralCategory::Unassigned), (128752, 128764, GeneralCategory::OtherSymbol), (128765, 128767, GeneralCategory::Unassigned), - (128768, 128883, GeneralCategory::OtherSymbol), - (128884, 128895, GeneralCategory::Unassigned), - (128896, 128984, GeneralCategory::OtherSymbol), - (128985, 128991, GeneralCategory::Unassigned), + (128768, 128886, GeneralCategory::OtherSymbol), + (128887, 128890, GeneralCategory::Unassigned), + (128891, 128985, GeneralCategory::OtherSymbol), + (128986, 128991, GeneralCategory::Unassigned), (128992, 129003, GeneralCategory::OtherSymbol), (129004, 129007, GeneralCategory::Unassigned), (129008, 129008, GeneralCategory::OtherSymbol), @@ -3963,24 +4003,20 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (129620, 129631, GeneralCategory::Unassigned), (129632, 129645, GeneralCategory::OtherSymbol), (129646, 129647, GeneralCategory::Unassigned), - (129648, 129652, GeneralCategory::OtherSymbol), - (129653, 129655, GeneralCategory::Unassigned), - (129656, 129660, GeneralCategory::OtherSymbol), + (129648, 129660, GeneralCategory::OtherSymbol), (129661, 129663, GeneralCategory::Unassigned), - (129664, 129670, GeneralCategory::OtherSymbol), - (129671, 129679, GeneralCategory::Unassigned), - (129680, 129708, GeneralCategory::OtherSymbol), - (129709, 129711, GeneralCategory::Unassigned), - (129712, 129722, GeneralCategory::OtherSymbol), - (129723, 129727, GeneralCategory::Unassigned), - (129728, 129733, GeneralCategory::OtherSymbol), - (129734, 129743, GeneralCategory::Unassigned), - (129744, 129753, GeneralCategory::OtherSymbol), - (129754, 129759, GeneralCategory::Unassigned), - (129760, 129767, GeneralCategory::OtherSymbol), - (129768, 129775, GeneralCategory::Unassigned), - (129776, 129782, GeneralCategory::OtherSymbol), - (129783, 129791, GeneralCategory::Unassigned), + (129664, 129672, GeneralCategory::OtherSymbol), + (129673, 129679, GeneralCategory::Unassigned), + (129680, 129725, GeneralCategory::OtherSymbol), + (129726, 129726, GeneralCategory::Unassigned), + (129727, 129733, GeneralCategory::OtherSymbol), + (129734, 129741, GeneralCategory::Unassigned), + (129742, 129755, GeneralCategory::OtherSymbol), + (129756, 129759, GeneralCategory::Unassigned), + (129760, 129768, GeneralCategory::OtherSymbol), + (129769, 129775, GeneralCategory::Unassigned), + (129776, 129784, GeneralCategory::OtherSymbol), + (129785, 129791, GeneralCategory::Unassigned), (129792, 129938, GeneralCategory::OtherSymbol), (129939, 129939, GeneralCategory::Unassigned), (129940, 129994, GeneralCategory::OtherSymbol), @@ -3989,8 +4025,8 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (130042, 131071, GeneralCategory::Unassigned), (131072, 173791, GeneralCategory::OtherLetter), (173792, 173823, GeneralCategory::Unassigned), - (173824, 177976, GeneralCategory::OtherLetter), - (177977, 177983, GeneralCategory::Unassigned), + (173824, 177977, GeneralCategory::OtherLetter), + (177978, 177983, GeneralCategory::Unassigned), (177984, 178205, GeneralCategory::OtherLetter), (178206, 178207, GeneralCategory::Unassigned), (178208, 183969, GeneralCategory::OtherLetter), @@ -4000,7 +4036,9 @@ pub const GENERAL_CATEGORY: &'static [(u32, u32, GeneralCategory)] = &[ (194560, 195101, GeneralCategory::OtherLetter), (195102, 196607, GeneralCategory::Unassigned), (196608, 201546, GeneralCategory::OtherLetter), - (201547, 917504, GeneralCategory::Unassigned), + (201547, 201551, GeneralCategory::Unassigned), + (201552, 205743, GeneralCategory::OtherLetter), + (205744, 917504, GeneralCategory::Unassigned), (917505, 917505, GeneralCategory::Format), (917506, 917535, GeneralCategory::Unassigned), (917536, 917631, GeneralCategory::Format),