diff --git a/crates/ucd-trie/.android-checksum.json b/crates/ucd-trie/.android-checksum.json
new file mode 100644
index 0000000..06d8137
--- /dev/null
+++ b/crates/ucd-trie/.android-checksum.json
@@ -0,0 +1 @@
+{"package":null,"files":{"LICENSE-MIT":"e477ec620ffb08af8bae12ebe7771ec557bdf198ffd6015add93d41b75b64850","benches/bench.rs":"7e3d91717ca67b740fa5c4127e9278410bda3e74e8a7a4706f8ee40f6bb160c1","Android.bp":"ce38247603a7348823dcb5e8835f268a7ff251ca95e3b426d7155f51a546ffe9","README.md":"a03b211f35702a4f45bc06935506626e71fae856f8ed5d48e44ac24ba8965ed2","src/owned.rs":"c64307c18c8bd3791b19b18d35d6b60d14d5508ebe5cff674cc5dabb1117c9e9","src/general_category.rs":"c772f77d7a5d694aa9ce1dda96a2e9d78ccd586eee70e3434c1cb2ff644ec298","src/lib.rs":"797f2840e1d8d5ae9f9f1490ce457e6ca9a70701097638bcb4c6bb01b9516351","Cargo.toml":"02f691aeb1e1a835452c200c8dde3bf03baa500d74d6e0d99c439d7a7b53cb44",".cargo-checksum.json":"11075ec80d03968d63911e16cf8a115517f796651d274765b4885e89e2d59059","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","METADATA":"683a448207250bd7f0889d4fc559753f4b13c4eb6f433243652f3e18338f96db","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","cargo_embargo.json":"ad0819b9d6f6999319dec49128e2d7faa980bf09168c1b229fd010605ca5b8a9"}}
\ No newline at end of file
diff --git a/crates/ucd-trie/.cargo-checksum.json b/crates/ucd-trie/.cargo-checksum.json
index 697b264..1cd5334 100644
--- a/crates/ucd-trie/.cargo-checksum.json
+++ b/crates/ucd-trie/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d9da2663b8cbd9a49456a610e15a50d3e6e52768edbf72862c9daeb3c6330306","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"6687ddcfa8075f52ea4326b3caa756165236ff6f75e3379e55ea9f6841821324","benches/bench.rs":"9b74139d17cfcccb502f2abe80b8a4c15a17037a681f27ec914d51e83ea7e55f","src/general_category.rs":"a28d7d49cffda077e505cabe03ea6d5c6fb328a25912a07da08497bfaa992a86","src/lib.rs":"99bedb2b655b39ac3a2cc7b4b79a381f7d1e086a20558eec52968f556a638ec4","src/owned.rs":"b897f815685f597f3a98613d5f8196153a207a741e61bbb19f48f90c2bf594ae"},"package":"ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"}
\ No newline at end of file
+{"files":{"Cargo.toml":"0d8c74a0a809e12a6ee3e3f89bb0016b978a5951e3605f8a6eb81d60ce3b1bca","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"6687ddcfa8075f52ea4326b3caa756165236ff6f75e3379e55ea9f6841821324","benches/bench.rs":"9b74139d17cfcccb502f2abe80b8a4c15a17037a681f27ec914d51e83ea7e55f","src/general_category.rs":"42cbf05dc036e46256621f008f557821f8d3597607c3b8ab62532cdf51b97f6d","src/lib.rs":"99bedb2b655b39ac3a2cc7b4b79a381f7d1e086a20558eec52968f556a638ec4","src/owned.rs":"b897f815685f597f3a98613d5f8196153a207a741e61bbb19f48f90c2bf594ae"},"package":"2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"}
\ No newline at end of file
diff --git a/crates/ucd-trie/Android.bp b/crates/ucd-trie/Android.bp
index 10e2cf9..d71ff3f 100644
--- a/crates/ucd-trie/Android.bp
+++ b/crates/ucd-trie/Android.bp
@@ -17,7 +17,7 @@
     name: "libucd_trie",
     crate_name: "ucd_trie",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.1.6",
+    cargo_pkg_version: "0.1.7",
     crate_root: "src/lib.rs",
     edition: "2021",
     features: [
diff --git a/crates/ucd-trie/Cargo.toml b/crates/ucd-trie/Cargo.toml
index 7ac0b52..d8f941e 100644
--- a/crates/ucd-trie/Cargo.toml
+++ b/crates/ucd-trie/Cargo.toml
@@ -12,8 +12,13 @@
 [package]
 edition = "2021"
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = """
 A trie for storing Unicode codepoint sets and maps.
 """
@@ -30,6 +35,14 @@
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/BurntSushi/ucd-generate"
 
+[lib]
+name = "ucd_trie"
+path = "src/lib.rs"
+
+[[bench]]
+name = "bench"
+path = "benches/bench.rs"
+
 [dev-dependencies.once_cell]
 version = "1"
 
diff --git a/crates/ucd-trie/METADATA b/crates/ucd-trie/METADATA
index ddcac03..5b22566 100644
--- a/crates/ucd-trie/METADATA
+++ b/crates/ucd-trie/METADATA
@@ -1,17 +1,17 @@
 name: "ucd-trie"
 description: "A trie for storing Unicode codepoint sets and maps."
 third_party {
-  version: "0.1.6"
+  version: "0.1.7"
   license_type: NOTICE
   last_upgrade_date {
     year: 2024
-    month: 2
-    day: 8
+    month: 12
+    day: 20
   }
   homepage: "https://crates.io/crates/ucd-trie"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.6.crate"
-    version: "0.1.6"
+    value: "https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.7.crate"
+    version: "0.1.7"
   }
 }
diff --git a/crates/ucd-trie/src/general_category.rs b/crates/ucd-trie/src/general_category.rs
index dbaff3a..c9b4788 100644
--- a/crates/ucd-trie/src/general_category.rs
+++ b/crates/ucd-trie/src/general_category.rs
@@ -1,8 +1,8 @@
 // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
 //
-//   ucd-generate general-category ucd-15.0.0
+//   ucd-generate general-category ucd-16.0.0
 //
-// Unicode version: 15.0.0.
+// Unicode version: 16.0.0.
 //
 // ucd-generate 0.2.15 is available on crates.io.
 
@@ -77,7 +77,7 @@
     (4349, 4351),
     (5024, 5109),
     (5112, 5117),
-    (7296, 7304),
+    (7296, 7306),
     (7312, 7354),
     (7357, 7359),
     (7424, 7467),
@@ -129,10 +129,10 @@
     (42786, 42863),
     (42865, 42887),
     (42891, 42894),
-    (42896, 42954),
+    (42896, 42957),
     (42960, 42961),
     (42963, 42963),
-    (42965, 42969),
+    (42965, 42972),
     (42997, 42998),
     (43002, 43002),
     (43824, 43866),
@@ -155,6 +155,8 @@
     (67003, 67004),
     (68736, 68786),
     (68800, 68850),
+    (68944, 68965),
+    (68976, 68997),
     (71840, 71903),
     (93760, 93823),
     (119808, 119892),
@@ -326,6 +328,7 @@
     (65112, 65112),
     (65123, 65123),
     (65293, 65293),
+    (68974, 68974),
     (69293, 69293),
 ];
 
@@ -369,6 +372,7 @@
     (65296, 65305),
     (66720, 66729),
     (68912, 68921),
+    (68928, 68937),
     (69734, 69743),
     (69872, 69881),
     (69942, 69951),
@@ -378,20 +382,26 @@
     (70864, 70873),
     (71248, 71257),
     (71360, 71369),
+    (71376, 71395),
     (71472, 71481),
     (71904, 71913),
     (72016, 72025),
+    (72688, 72697),
     (72784, 72793),
     (73040, 73049),
     (73120, 73129),
     (73552, 73561),
+    (90416, 90425),
     (92768, 92777),
     (92864, 92873),
     (93008, 93017),
+    (93552, 93561),
+    (118000, 118009),
     (120782, 120831),
     (123200, 123209),
     (123632, 123641),
     (124144, 124153),
+    (124401, 124410),
     (125264, 125273),
     (130032, 130041),
 ];
@@ -676,7 +686,7 @@
     (7168, 7203),
     (7245, 7247),
     (7258, 7293),
-    (7296, 7304),
+    (7296, 7306),
     (7312, 7354),
     (7357, 7359),
     (7401, 7404),
@@ -760,10 +770,10 @@
     (42656, 42725),
     (42775, 42783),
     (42786, 42888),
-    (42891, 42954),
+    (42891, 42957),
     (42960, 42961),
     (42963, 42963),
-    (42965, 42969),
+    (42965, 42972),
     (42994, 43009),
     (43011, 43013),
     (43015, 43018),
@@ -860,6 +870,7 @@
     (66979, 66993),
     (66995, 67001),
     (67003, 67004),
+    (67008, 67059),
     (67072, 67382),
     (67392, 67413),
     (67424, 67431),
@@ -896,8 +907,11 @@
     (68736, 68786),
     (68800, 68850),
     (68864, 68899),
+    (68938, 68965),
+    (68975, 68997),
     (69248, 69289),
     (69296, 69297),
+    (69314, 69316),
     (69376, 69404),
     (69415, 69415),
     (69424, 69445),
@@ -936,6 +950,13 @@
     (70461, 70461),
     (70480, 70480),
     (70493, 70497),
+    (70528, 70537),
+    (70539, 70539),
+    (70542, 70542),
+    (70544, 70581),
+    (70583, 70583),
+    (70609, 70609),
+    (70611, 70611),
     (70656, 70708),
     (70727, 70730),
     (70751, 70753),
@@ -970,6 +991,7 @@
     (72284, 72329),
     (72349, 72349),
     (72368, 72440),
+    (72640, 72672),
     (72704, 72712),
     (72714, 72750),
     (72768, 72768),
@@ -992,7 +1014,9 @@
     (77712, 77808),
     (77824, 78895),
     (78913, 78918),
+    (78944, 82938),
     (82944, 83526),
+    (90368, 90397),
     (92160, 92728),
     (92736, 92766),
     (92784, 92862),
@@ -1001,6 +1025,7 @@
     (92992, 92995),
     (93027, 93047),
     (93053, 93071),
+    (93504, 93548),
     (93760, 93823),
     (93952, 94026),
     (94032, 94032),
@@ -1009,7 +1034,7 @@
     (94179, 94179),
     (94208, 100343),
     (100352, 101589),
-    (101632, 101640),
+    (101631, 101640),
     (110576, 110579),
     (110581, 110587),
     (110589, 110590),
@@ -1062,6 +1087,8 @@
     (123536, 123565),
     (123584, 123627),
     (124112, 124139),
+    (124368, 124397),
+    (124400, 124400),
     (124896, 124902),
     (124904, 124907),
     (124909, 124910),
@@ -1107,6 +1134,7 @@
     (177984, 178205),
     (178208, 183969),
     (183984, 191456),
+    (191472, 192093),
     (194560, 195101),
     (196608, 201546),
     (201552, 205743),
@@ -1404,6 +1432,7 @@
     (4349, 4351),
     (5112, 5117),
     (7296, 7304),
+    (7306, 7306),
     (7424, 7467),
     (7531, 7543),
     (7545, 7578),
@@ -1734,11 +1763,13 @@
     (42947, 42947),
     (42952, 42952),
     (42954, 42954),
+    (42957, 42957),
     (42961, 42961),
     (42963, 42963),
     (42965, 42965),
     (42967, 42967),
     (42969, 42969),
+    (42971, 42971),
     (42998, 42998),
     (43002, 43002),
     (43824, 43866),
@@ -1754,6 +1785,7 @@
     (66995, 67001),
     (67003, 67004),
     (68800, 68850),
+    (68976, 68997),
     (71872, 71903),
     (93792, 93823),
     (119834, 119859),
@@ -1815,7 +1847,7 @@
     (2085, 2087),
     (2089, 2093),
     (2137, 2139),
-    (2200, 2207),
+    (2199, 2207),
     (2250, 2273),
     (2275, 2307),
     (2362, 2364),
@@ -1991,8 +2023,9 @@
     (68159, 68159),
     (68325, 68326),
     (68900, 68903),
+    (68969, 68973),
     (69291, 69292),
-    (69373, 69375),
+    (69372, 69375),
     (69446, 69456),
     (69506, 69509),
     (69632, 69634),
@@ -2023,6 +2056,13 @@
     (70498, 70499),
     (70502, 70508),
     (70512, 70516),
+    (70584, 70592),
+    (70594, 70594),
+    (70597, 70597),
+    (70599, 70602),
+    (70604, 70608),
+    (70610, 70610),
+    (70625, 70626),
     (70709, 70726),
     (70750, 70750),
     (70832, 70851),
@@ -2064,8 +2104,10 @@
     (73475, 73475),
     (73524, 73530),
     (73534, 73538),
+    (73562, 73562),
     (78912, 78912),
     (78919, 78933),
+    (90398, 90415),
     (92912, 92916),
     (92976, 92982),
     (94031, 94031),
@@ -2098,6 +2140,7 @@
     (123566, 123566),
     (123628, 123631),
     (124140, 124143),
+    (124398, 124399),
     (125136, 125142),
     (125252, 125258),
     (917760, 917999),
@@ -2157,6 +2200,7 @@
     (65374, 65374),
     (65506, 65506),
     (65513, 65516),
+    (69006, 69007),
     (120513, 120513),
     (120539, 120539),
     (120571, 120571),
@@ -2231,7 +2275,11 @@
     (67456, 67461),
     (67463, 67504),
     (67506, 67514),
+    (68942, 68942),
+    (68975, 68975),
     (92992, 92995),
+    (93504, 93506),
+    (93547, 93548),
     (94099, 94111),
     (94176, 94177),
     (94179, 94179),
@@ -2303,7 +2351,7 @@
     (2085, 2087),
     (2089, 2093),
     (2137, 2139),
-    (2200, 2207),
+    (2199, 2207),
     (2250, 2273),
     (2275, 2306),
     (2362, 2362),
@@ -2501,8 +2549,9 @@
     (68159, 68159),
     (68325, 68326),
     (68900, 68903),
+    (68969, 68973),
     (69291, 69292),
-    (69373, 69375),
+    (69372, 69375),
     (69446, 69456),
     (69506, 69509),
     (69633, 69633),
@@ -2533,6 +2582,11 @@
     (70464, 70464),
     (70502, 70508),
     (70512, 70516),
+    (70587, 70592),
+    (70606, 70606),
+    (70608, 70608),
+    (70610, 70610),
+    (70625, 70626),
     (70712, 70719),
     (70722, 70724),
     (70726, 70726),
@@ -2552,7 +2606,8 @@
     (71341, 71341),
     (71344, 71349),
     (71351, 71351),
-    (71453, 71455),
+    (71453, 71453),
+    (71455, 71455),
     (71458, 71461),
     (71463, 71467),
     (71727, 71735),
@@ -2591,8 +2646,11 @@
     (73526, 73530),
     (73536, 73536),
     (73538, 73538),
+    (73562, 73562),
     (78912, 78912),
     (78919, 78933),
+    (90398, 90409),
+    (90413, 90415),
     (92912, 92916),
     (92976, 92982),
     (94031, 94031),
@@ -2622,6 +2680,7 @@
     (123566, 123566),
     (123628, 123631),
     (124140, 124143),
+    (124398, 124399),
     (125136, 125142),
     (125252, 125258),
     (917760, 917999),
@@ -2721,6 +2780,7 @@
     (68521, 68527),
     (68858, 68863),
     (68912, 68921),
+    (68928, 68937),
     (69216, 69246),
     (69405, 69414),
     (69457, 69460),
@@ -2735,20 +2795,25 @@
     (70864, 70873),
     (71248, 71257),
     (71360, 71369),
+    (71376, 71395),
     (71472, 71483),
     (71904, 71922),
     (72016, 72025),
+    (72688, 72697),
     (72784, 72812),
     (73040, 73049),
     (73120, 73129),
     (73552, 73561),
     (73664, 73684),
     (74752, 74862),
+    (90416, 90425),
     (92768, 92777),
     (92864, 92873),
     (93008, 93017),
     (93019, 93025),
+    (93552, 93561),
     (93824, 93846),
+    (118000, 118009),
     (119488, 119507),
     (119520, 119539),
     (119648, 119672),
@@ -2756,6 +2821,7 @@
     (123200, 123209),
     (123632, 123641),
     (124144, 124153),
+    (124401, 124410),
     (125127, 125135),
     (125264, 125273),
     (126065, 126123),
@@ -2876,7 +2942,7 @@
     (2140, 2141),
     (2143, 2143),
     (2155, 2159),
-    (2191, 2199),
+    (2191, 2198),
     (2274, 2274),
     (2436, 2436),
     (2445, 2446),
@@ -3070,12 +3136,11 @@
     (6810, 6815),
     (6830, 6831),
     (6863, 6911),
-    (6989, 6991),
-    (7039, 7039),
+    (6989, 6989),
     (7156, 7163),
     (7224, 7226),
     (7242, 7244),
-    (7305, 7311),
+    (7307, 7311),
     (7355, 7356),
     (7368, 7375),
     (7419, 7423),
@@ -3104,7 +3169,7 @@
     (8385, 8399),
     (8433, 8447),
     (8588, 8591),
-    (9255, 9279),
+    (9258, 9279),
     (9291, 9311),
     (11124, 11125),
     (11158, 11158),
@@ -3127,22 +3192,21 @@
     (11930, 11930),
     (12020, 12031),
     (12246, 12271),
-    (12284, 12287),
     (12352, 12352),
     (12439, 12440),
     (12544, 12548),
     (12592, 12592),
     (12687, 12687),
-    (12772, 12783),
+    (12774, 12782),
     (12831, 12831),
     (42125, 42127),
     (42183, 42191),
     (42540, 42559),
     (42744, 42751),
-    (42955, 42959),
+    (42958, 42959),
     (42962, 42962),
     (42964, 42964),
-    (42970, 42993),
+    (42973, 42993),
     (43053, 43055),
     (43066, 43071),
     (43128, 43135),
@@ -3231,7 +3295,8 @@
     (66978, 66978),
     (66994, 66994),
     (67002, 67002),
-    (67005, 67071),
+    (67005, 67007),
+    (67060, 67071),
     (67383, 67391),
     (67414, 67423),
     (67432, 67455),
@@ -3274,11 +3339,15 @@
     (68787, 68799),
     (68851, 68857),
     (68904, 68911),
-    (68922, 69215),
+    (68922, 68927),
+    (68966, 68968),
+    (68998, 69005),
+    (69008, 69215),
     (69247, 69247),
     (69290, 69290),
     (69294, 69295),
-    (69298, 69372),
+    (69298, 69313),
+    (69317, 69371),
     (69416, 69423),
     (69466, 69487),
     (69514, 69551),
@@ -3318,7 +3387,18 @@
     (70488, 70492),
     (70500, 70501),
     (70509, 70511),
-    (70517, 70655),
+    (70517, 70527),
+    (70538, 70538),
+    (70540, 70541),
+    (70543, 70543),
+    (70582, 70582),
+    (70593, 70593),
+    (70595, 70596),
+    (70598, 70598),
+    (70603, 70603),
+    (70614, 70614),
+    (70617, 70624),
+    (70627, 70655),
     (70748, 70748),
     (70754, 70783),
     (70856, 70863),
@@ -3329,7 +3409,8 @@
     (71258, 71263),
     (71277, 71295),
     (71354, 71359),
-    (71370, 71423),
+    (71370, 71375),
+    (71396, 71423),
     (71451, 71452),
     (71468, 71471),
     (71495, 71679),
@@ -3349,7 +3430,9 @@
     (72264, 72271),
     (72355, 72367),
     (72441, 72447),
-    (72458, 72703),
+    (72458, 72639),
+    (72674, 72687),
+    (72698, 72703),
     (72713, 72713),
     (72759, 72759),
     (72774, 72783),
@@ -3373,7 +3456,7 @@
     (73465, 73471),
     (73489, 73489),
     (73531, 73533),
-    (73562, 73647),
+    (73563, 73647),
     (73649, 73663),
     (73714, 73726),
     (74650, 74751),
@@ -3382,8 +3465,10 @@
     (75076, 77711),
     (77811, 77823),
     (78896, 78911),
-    (78934, 82943),
-    (83527, 92159),
+    (78934, 78943),
+    (82939, 82943),
+    (83527, 90367),
+    (90426, 92159),
     (92729, 92735),
     (92767, 92767),
     (92778, 92781),
@@ -3395,7 +3480,8 @@
     (93018, 93018),
     (93026, 93026),
     (93048, 93052),
-    (93072, 93759),
+    (93072, 93503),
+    (93562, 93759),
     (93851, 93951),
     (94027, 94030),
     (94088, 94094),
@@ -3403,7 +3489,7 @@
     (94181, 94191),
     (94194, 94207),
     (100344, 100351),
-    (101590, 101631),
+    (101590, 101630),
     (101641, 110575),
     (110580, 110580),
     (110588, 110588),
@@ -3418,7 +3504,9 @@
     (113789, 113791),
     (113801, 113807),
     (113818, 113819),
-    (113824, 118527),
+    (113824, 117759),
+    (118010, 118015),
+    (118452, 118527),
     (118574, 118575),
     (118599, 118607),
     (118724, 118783),
@@ -3470,7 +3558,9 @@
     (123567, 123583),
     (123642, 123646),
     (123648, 124111),
-    (124154, 124895),
+    (124154, 124367),
+    (124411, 124414),
+    (124416, 124895),
     (124903, 124903),
     (124908, 124908),
     (124911, 124911),
@@ -3540,24 +3630,24 @@
     (129114, 129119),
     (129160, 129167),
     (129198, 129199),
-    (129202, 129279),
+    (129212, 129215),
+    (129218, 129279),
     (129620, 129631),
     (129646, 129647),
     (129661, 129663),
-    (129673, 129679),
-    (129726, 129726),
-    (129734, 129741),
-    (129756, 129759),
-    (129769, 129775),
+    (129674, 129678),
+    (129735, 129741),
+    (129757, 129758),
+    (129770, 129775),
     (129785, 129791),
     (129939, 129939),
-    (129995, 130031),
     (130042, 131071),
     (173792, 173823),
     (177978, 177983),
     (178206, 178207),
     (183970, 183983),
-    (191457, 194559),
+    (191457, 191471),
+    (192094, 194559),
     (195102, 196607),
     (201547, 201551),
     (205744, 917759),
@@ -3874,6 +3964,7 @@
     (66640, 66717),
     (66816, 66855),
     (66864, 66915),
+    (67008, 67059),
     (67072, 67382),
     (67392, 67413),
     (67424, 67431),
@@ -3905,8 +3996,11 @@
     (68480, 68497),
     (68608, 68680),
     (68864, 68899),
+    (68938, 68941),
+    (68943, 68943),
     (69248, 69289),
     (69296, 69297),
+    (69314, 69316),
     (69376, 69404),
     (69415, 69415),
     (69424, 69445),
@@ -3945,6 +4039,13 @@
     (70461, 70461),
     (70480, 70480),
     (70493, 70497),
+    (70528, 70537),
+    (70539, 70539),
+    (70542, 70542),
+    (70544, 70581),
+    (70583, 70583),
+    (70609, 70609),
+    (70611, 70611),
     (70656, 70708),
     (70727, 70730),
     (70751, 70753),
@@ -3978,6 +4079,7 @@
     (72284, 72329),
     (72349, 72349),
     (72368, 72440),
+    (72640, 72672),
     (72704, 72712),
     (72714, 72750),
     (72768, 72768),
@@ -4000,7 +4102,9 @@
     (77712, 77808),
     (77824, 78895),
     (78913, 78918),
+    (78944, 82938),
     (82944, 83526),
+    (90368, 90397),
     (92160, 92728),
     (92736, 92766),
     (92784, 92862),
@@ -4008,11 +4112,12 @@
     (92928, 92975),
     (93027, 93047),
     (93053, 93071),
+    (93507, 93546),
     (93952, 94026),
     (94032, 94032),
     (94208, 100343),
     (100352, 101589),
-    (101632, 101640),
+    (101631, 101640),
     (110592, 110882),
     (110898, 110898),
     (110928, 110930),
@@ -4029,6 +4134,8 @@
     (123536, 123565),
     (123584, 123627),
     (124112, 124138),
+    (124368, 124397),
+    (124400, 124400),
     (124896, 124902),
     (124904, 124907),
     (124909, 124910),
@@ -4072,6 +4179,7 @@
     (177984, 178205),
     (178208, 183969),
     (183984, 191456),
+    (191472, 192093),
     (194560, 195101),
     (196608, 201546),
     (201552, 205743),
@@ -4212,8 +4320,9 @@
     (6686, 6687),
     (6816, 6822),
     (6824, 6829),
+    (6990, 6991),
     (7002, 7008),
-    (7037, 7038),
+    (7037, 7039),
     (7164, 7167),
     (7227, 7231),
     (7294, 7295),
@@ -4308,6 +4417,8 @@
     (70109, 70111),
     (70200, 70205),
     (70313, 70313),
+    (70612, 70613),
+    (70615, 70616),
     (70731, 70735),
     (70746, 70747),
     (70749, 70749),
@@ -4324,6 +4435,7 @@
     (72346, 72348),
     (72350, 72354),
     (72448, 72457),
+    (72673, 72673),
     (72769, 72773),
     (72816, 72817),
     (73463, 73464),
@@ -4335,10 +4447,12 @@
     (92917, 92917),
     (92983, 92987),
     (92996, 92996),
+    (93549, 93551),
     (93847, 93850),
     (94178, 94178),
     (113823, 113823),
     (121479, 121483),
+    (124415, 124415),
     (125278, 125279),
 ];
 
@@ -4409,7 +4523,7 @@
     (9003, 9083),
     (9085, 9114),
     (9140, 9179),
-    (9186, 9254),
+    (9186, 9257),
     (9280, 9290),
     (9372, 9449),
     (9472, 9654),
@@ -4429,7 +4543,7 @@
     (11904, 11929),
     (11931, 12019),
     (12032, 12245),
-    (12272, 12283),
+    (12272, 12287),
     (12292, 12292),
     (12306, 12307),
     (12320, 12320),
@@ -4437,7 +4551,8 @@
     (12350, 12351),
     (12688, 12689),
     (12694, 12703),
-    (12736, 12771),
+    (12736, 12773),
+    (12783, 12783),
     (12800, 12830),
     (12842, 12871),
     (12880, 12880),
@@ -4471,6 +4586,8 @@
     (92988, 92991),
     (92997, 92997),
     (113820, 113820),
+    (117760, 117999),
+    (118016, 118451),
     (118608, 118723),
     (118784, 119029),
     (119040, 119078),
@@ -4515,18 +4632,18 @@
     (129104, 129113),
     (129120, 129159),
     (129168, 129197),
-    (129200, 129201),
+    (129200, 129211),
+    (129216, 129217),
     (129280, 129619),
     (129632, 129645),
     (129648, 129660),
-    (129664, 129672),
-    (129680, 129725),
-    (129727, 129733),
-    (129742, 129755),
-    (129760, 129768),
+    (129664, 129673),
+    (129679, 129734),
+    (129742, 129756),
+    (129759, 129769),
     (129776, 129784),
     (129792, 129938),
-    (129940, 129994),
+    (129940, 130031),
 ];
 
 pub const PARAGRAPH_SEPARATOR: &'static [(u32, u32)] = &[(8233, 8233)];
@@ -4600,8 +4717,9 @@
     (6686, 6687),
     (6816, 6822),
     (6824, 6829),
+    (6990, 6991),
     (7002, 7008),
-    (7037, 7038),
+    (7037, 7039),
     (7164, 7167),
     (7227, 7231),
     (7294, 7295),
@@ -4680,6 +4798,7 @@
     (68336, 68342),
     (68409, 68415),
     (68505, 68508),
+    (68974, 68974),
     (69293, 69293),
     (69461, 69465),
     (69510, 69513),
@@ -4694,6 +4813,8 @@
     (70109, 70111),
     (70200, 70205),
     (70313, 70313),
+    (70612, 70613),
+    (70615, 70616),
     (70731, 70735),
     (70746, 70747),
     (70749, 70749),
@@ -4710,6 +4831,7 @@
     (72346, 72348),
     (72350, 72354),
     (72448, 72457),
+    (72673, 72673),
     (72769, 72773),
     (72816, 72817),
     (73463, 73464),
@@ -4721,10 +4843,12 @@
     (92917, 92917),
     (92983, 92987),
     (92996, 92996),
+    (93549, 93551),
     (93847, 93850),
     (94178, 94178),
     (113823, 113823),
     (121479, 121483),
+    (124415, 124415),
     (125278, 125279),
 ];
 
@@ -4884,6 +5008,12 @@
     (70475, 70477),
     (70487, 70487),
     (70498, 70499),
+    (70584, 70586),
+    (70594, 70594),
+    (70597, 70597),
+    (70599, 70602),
+    (70604, 70605),
+    (70607, 70607),
     (70709, 70711),
     (70720, 70721),
     (70725, 70725),
@@ -4900,6 +5030,7 @@
     (71340, 71340),
     (71342, 71343),
     (71350, 71350),
+    (71454, 71454),
     (71456, 71457),
     (71462, 71462),
     (71724, 71726),
@@ -4928,6 +5059,7 @@
     (73524, 73525),
     (73534, 73535),
     (73537, 73537),
+    (90410, 90412),
     (94033, 94087),
     (94192, 94193),
     (119141, 119142),
@@ -5027,7 +5159,7 @@
     (8586, 8587),
     (8592, 8967),
     (8972, 9000),
-    (9003, 9254),
+    (9003, 9257),
     (9280, 9290),
     (9372, 9449),
     (9472, 10087),
@@ -5044,7 +5176,7 @@
     (11904, 11929),
     (11931, 12019),
     (12032, 12245),
-    (12272, 12283),
+    (12272, 12287),
     (12292, 12292),
     (12306, 12307),
     (12320, 12320),
@@ -5053,7 +5185,8 @@
     (12443, 12444),
     (12688, 12689),
     (12694, 12703),
-    (12736, 12771),
+    (12736, 12773),
+    (12783, 12783),
     (12800, 12830),
     (12842, 12871),
     (12880, 12880),
@@ -5096,11 +5229,14 @@
     (66000, 66044),
     (67703, 67704),
     (68296, 68296),
+    (69006, 69007),
     (71487, 71487),
     (73685, 73713),
     (92988, 92991),
     (92997, 92997),
     (113820, 113820),
+    (117760, 117999),
+    (118016, 118451),
     (118608, 118723),
     (118784, 119029),
     (119040, 119078),
@@ -5157,18 +5293,18 @@
     (129104, 129113),
     (129120, 129159),
     (129168, 129197),
-    (129200, 129201),
+    (129200, 129211),
+    (129216, 129217),
     (129280, 129619),
     (129632, 129645),
     (129648, 129660),
-    (129664, 129672),
-    (129680, 129725),
-    (129727, 129733),
-    (129742, 129755),
-    (129760, 129768),
+    (129664, 129673),
+    (129679, 129734),
+    (129742, 129756),
+    (129759, 129769),
     (129776, 129784),
     (129792, 129938),
-    (129940, 129994),
+    (129940, 130031),
 ];
 
 pub const TITLECASE_LETTER: &'static [(u32, u32)] = &[
@@ -5207,7 +5343,7 @@
     (2143, 2143),
     (2155, 2159),
     (2191, 2191),
-    (2194, 2199),
+    (2194, 2198),
     (2436, 2436),
     (2445, 2446),
     (2449, 2450),
@@ -5399,12 +5535,11 @@
     (6810, 6815),
     (6830, 6831),
     (6863, 6911),
-    (6989, 6991),
-    (7039, 7039),
+    (6989, 6989),
     (7156, 7163),
     (7224, 7226),
     (7242, 7244),
-    (7305, 7311),
+    (7307, 7311),
     (7355, 7356),
     (7368, 7375),
     (7419, 7423),
@@ -5431,7 +5566,7 @@
     (8385, 8399),
     (8433, 8447),
     (8588, 8591),
-    (9255, 9279),
+    (9258, 9279),
     (9291, 9311),
     (11124, 11125),
     (11158, 11158),
@@ -5454,22 +5589,21 @@
     (11930, 11930),
     (12020, 12031),
     (12246, 12271),
-    (12284, 12287),
     (12352, 12352),
     (12439, 12440),
     (12544, 12548),
     (12592, 12592),
     (12687, 12687),
-    (12772, 12783),
+    (12774, 12782),
     (12831, 12831),
     (42125, 42127),
     (42183, 42191),
     (42540, 42559),
     (42744, 42751),
-    (42955, 42959),
+    (42958, 42959),
     (42962, 42962),
     (42964, 42964),
-    (42970, 42993),
+    (42973, 42993),
     (43053, 43055),
     (43066, 43071),
     (43128, 43135),
@@ -5559,7 +5693,8 @@
     (66978, 66978),
     (66994, 66994),
     (67002, 67002),
-    (67005, 67071),
+    (67005, 67007),
+    (67060, 67071),
     (67383, 67391),
     (67414, 67423),
     (67432, 67455),
@@ -5602,11 +5737,15 @@
     (68787, 68799),
     (68851, 68857),
     (68904, 68911),
-    (68922, 69215),
+    (68922, 68927),
+    (68966, 68968),
+    (68998, 69005),
+    (69008, 69215),
     (69247, 69247),
     (69290, 69290),
     (69294, 69295),
-    (69298, 69372),
+    (69298, 69313),
+    (69317, 69371),
     (69416, 69423),
     (69466, 69487),
     (69514, 69551),
@@ -5646,7 +5785,18 @@
     (70488, 70492),
     (70500, 70501),
     (70509, 70511),
-    (70517, 70655),
+    (70517, 70527),
+    (70538, 70538),
+    (70540, 70541),
+    (70543, 70543),
+    (70582, 70582),
+    (70593, 70593),
+    (70595, 70596),
+    (70598, 70598),
+    (70603, 70603),
+    (70614, 70614),
+    (70617, 70624),
+    (70627, 70655),
     (70748, 70748),
     (70754, 70783),
     (70856, 70863),
@@ -5657,7 +5807,8 @@
     (71258, 71263),
     (71277, 71295),
     (71354, 71359),
-    (71370, 71423),
+    (71370, 71375),
+    (71396, 71423),
     (71451, 71452),
     (71468, 71471),
     (71495, 71679),
@@ -5677,7 +5828,9 @@
     (72264, 72271),
     (72355, 72367),
     (72441, 72447),
-    (72458, 72703),
+    (72458, 72639),
+    (72674, 72687),
+    (72698, 72703),
     (72713, 72713),
     (72759, 72759),
     (72774, 72783),
@@ -5701,7 +5854,7 @@
     (73465, 73471),
     (73489, 73489),
     (73531, 73533),
-    (73562, 73647),
+    (73563, 73647),
     (73649, 73663),
     (73714, 73726),
     (74650, 74751),
@@ -5709,8 +5862,10 @@
     (74869, 74879),
     (75076, 77711),
     (77811, 77823),
-    (78934, 82943),
-    (83527, 92159),
+    (78934, 78943),
+    (82939, 82943),
+    (83527, 90367),
+    (90426, 92159),
     (92729, 92735),
     (92767, 92767),
     (92778, 92781),
@@ -5722,7 +5877,8 @@
     (93018, 93018),
     (93026, 93026),
     (93048, 93052),
-    (93072, 93759),
+    (93072, 93503),
+    (93562, 93759),
     (93851, 93951),
     (94027, 94030),
     (94088, 94094),
@@ -5730,7 +5886,7 @@
     (94181, 94191),
     (94194, 94207),
     (100344, 100351),
-    (101590, 101631),
+    (101590, 101630),
     (101641, 110575),
     (110580, 110580),
     (110588, 110588),
@@ -5745,7 +5901,9 @@
     (113789, 113791),
     (113801, 113807),
     (113818, 113819),
-    (113828, 118527),
+    (113828, 117759),
+    (118010, 118015),
+    (118452, 118527),
     (118574, 118575),
     (118599, 118607),
     (118724, 118783),
@@ -5796,7 +5954,9 @@
     (123567, 123583),
     (123642, 123646),
     (123648, 124111),
-    (124154, 124895),
+    (124154, 124367),
+    (124411, 124414),
+    (124416, 124895),
     (124903, 124903),
     (124908, 124908),
     (124911, 124911),
@@ -5866,24 +6026,24 @@
     (129114, 129119),
     (129160, 129167),
     (129198, 129199),
-    (129202, 129279),
+    (129212, 129215),
+    (129218, 129279),
     (129620, 129631),
     (129646, 129647),
     (129661, 129663),
-    (129673, 129679),
-    (129726, 129726),
-    (129734, 129741),
-    (129756, 129759),
-    (129769, 129775),
+    (129674, 129678),
+    (129735, 129741),
+    (129757, 129758),
+    (129770, 129775),
     (129785, 129791),
     (129939, 129939),
-    (129995, 130031),
     (130042, 131071),
     (173792, 173823),
     (177978, 177983),
     (178206, 178207),
     (183970, 183983),
-    (191457, 194559),
+    (191457, 191471),
+    (192094, 194559),
     (195102, 196607),
     (201547, 201551),
     (205744, 917504),
@@ -6171,6 +6331,7 @@
     (4295, 4295),
     (4301, 4301),
     (5024, 5109),
+    (7305, 7305),
     (7312, 7354),
     (7357, 7359),
     (7680, 7680),
@@ -6495,9 +6656,12 @@
     (42946, 42946),
     (42948, 42951),
     (42953, 42953),
+    (42955, 42956),
     (42960, 42960),
     (42966, 42966),
     (42968, 42968),
+    (42970, 42970),
+    (42972, 42972),
     (42997, 42997),
     (65313, 65338),
     (66560, 66599),
@@ -6507,6 +6671,7 @@
     (66956, 66962),
     (66964, 66965),
     (68736, 68786),
+    (68944, 68965),
     (71840, 71871),
     (93760, 93791),
     (119808, 119833),
diff --git a/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index 8b5def0..e2f3f07 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -5534,9 +5534,9 @@
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "ucs2"
diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 6484aad..66489c5 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -349,7 +349,7 @@
 try-lock = "=0.2.5"
 tungstenite = "=0.21.0"
 twox-hash = "=1.6.3"
-ucd-trie = "=0.1.6"
+ucd-trie = "=0.1.7"
 ucs2 = "=0.3.3"
 uefi = "=0.33.0"
 uefi-macros = "=0.17.0"