diff --git a/libguile/srfi-14.i.c b/libguile/srfi-14.i.c
index 42a1c2cf2..0b08742d2 100644
--- a/libguile/srfi-14.i.c
+++ b/libguile/srfi-14.i.c
@@ -363,7 +363,7 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x03ed, 0x03ed}
   ,
-  {0x03ef, 0x03f2}
+  {0x03ef, 0x03f3}
   ,
   {0x03f5, 0x03f5}
   ,
@@ -563,8 +563,18 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x0527, 0x0527}
   ,
+  {0x0529, 0x0529}
+  ,
+  {0x052b, 0x052b}
+  ,
+  {0x052d, 0x052d}
+  ,
+  {0x052f, 0x052f}
+  ,
   {0x0561, 0x0587}
   ,
+  {0x13f8, 0x13fd}
+  ,
   {0x1930, 0x1938}
   ,
   {0x1d02, 0x1d02}
@@ -593,7 +603,7 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x1de0, 0x1de0}
   ,
-  {0x1de3, 0x1de6}
+  {0x1de3, 0x1df4}
   ,
   {0x1e01, 0x1e01}
   ,
@@ -953,6 +963,10 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0xa697, 0xa697}
   ,
+  {0xa699, 0xa699}
+  ,
+  {0xa69b, 0xa69b}
+  ,
   {0xa723, 0xa723}
   ,
   {0xa725, 0xa725}
@@ -1053,7 +1067,17 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0xa791, 0xa791}
   ,
-  {0xa793, 0xa793}
+  {0xa793, 0xa795}
+  ,
+  {0xa797, 0xa797}
+  ,
+  {0xa799, 0xa799}
+  ,
+  {0xa79b, 0xa79b}
+  ,
+  {0xa79d, 0xa79d}
+  ,
+  {0xa79f, 0xa79f}
   ,
   {0xa7a1, 0xa7a1}
   ,
@@ -1065,8 +1089,20 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0xa7a9, 0xa7a9}
   ,
+  {0xa7b5, 0xa7b5}
+  ,
+  {0xa7b7, 0xa7b7}
+  ,
   {0xa7f9, 0xa7f9}
   ,
+  {0xab30, 0xab45}
+  ,
+  {0xab47, 0xab5a}
+  ,
+  {0xab60, 0xab64}
+  ,
+  {0xab70, 0xabbf}
+  ,
   {0xfb00, 0xfb06}
   ,
   {0xfb13, 0xfb17}
@@ -1075,13 +1111,17 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x10428, 0x1044f}
   ,
+  {0x10cc0, 0x10cf2}
+  ,
+  {0x118c0, 0x118df}
+  ,
   {0x1f521, 0x1f521}
   ,
   {0xe0061, 0xe007a}
 };
 
 scm_t_char_set cs_lower_case = {
-  536,
+  556,
   cs_lower_case_ranges
 };
 
@@ -1380,6 +1420,8 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x0376, 0x0376}
   ,
+  {0x037f, 0x037f}
+  ,
   {0x0386, 0x0386}
   ,
   {0x0388, 0x038a}
@@ -1616,6 +1658,14 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x0526, 0x0526}
   ,
+  {0x0528, 0x0528}
+  ,
+  {0x052a, 0x052a}
+  ,
+  {0x052c, 0x052c}
+  ,
+  {0x052e, 0x052e}
+  ,
   {0x0531, 0x0556}
   ,
   {0x10a0, 0x10c5}
@@ -1624,6 +1674,8 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x10cd, 0x10cd}
   ,
+  {0x13a0, 0x13f5}
+  ,
   {0x1d7b, 0x1d7b}
   ,
   {0x1d7e, 0x1d7e}
@@ -1982,6 +2034,10 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0xa696, 0xa696}
   ,
+  {0xa698, 0xa698}
+  ,
+  {0xa69a, 0xa69a}
+  ,
   {0xa722, 0xa722}
   ,
   {0xa724, 0xa724}
@@ -2080,6 +2136,16 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0xa792, 0xa792}
   ,
+  {0xa796, 0xa796}
+  ,
+  {0xa798, 0xa798}
+  ,
+  {0xa79a, 0xa79a}
+  ,
+  {0xa79c, 0xa79c}
+  ,
+  {0xa79e, 0xa79e}
+  ,
   {0xa7a0, 0xa7a0}
   ,
   {0xa7a2, 0xa7a2}
@@ -2090,12 +2156,20 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0xa7a8, 0xa7a8}
   ,
-  {0xa7aa, 0xa7aa}
+  {0xa7aa, 0xa7ad}
+  ,
+  {0xa7b0, 0xa7b4}
+  ,
+  {0xa7b6, 0xa7b6}
   ,
   {0xff21, 0xff3a}
   ,
   {0x10400, 0x10427}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x118a0, 0x118bf}
+  ,
   {0x1f110, 0x1f12c}
   ,
   {0x1f130, 0x1f149}
@@ -2110,7 +2184,7 @@ scm_t_char_range cs_upper_case_ranges[] = {
 };
 
 scm_t_char_set cs_upper_case = {
-  511,
+  528,
   cs_upper_case_ranges
 };
 
@@ -2172,6 +2246,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x037a, 0x037d}
   ,
+  {0x037f, 0x037f}
+  ,
   {0x0386, 0x0386}
   ,
   {0x0388, 0x038a}
@@ -2184,7 +2260,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x03f7, 0x0481}
   ,
-  {0x048a, 0x0527}
+  {0x048a, 0x052f}
   ,
   {0x0531, 0x0556}
   ,
@@ -2236,9 +2312,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0840, 0x0858}
   ,
-  {0x08a0, 0x08a0}
-  ,
-  {0x08a2, 0x08ac}
+  {0x08a0, 0x08b4}
   ,
   {0x0904, 0x0939}
   ,
@@ -2248,9 +2322,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0958, 0x0961}
   ,
-  {0x0971, 0x0977}
-  ,
-  {0x0979, 0x097f}
+  {0x0971, 0x0980}
   ,
   {0x0985, 0x098c}
   ,
@@ -2312,6 +2384,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0ae0, 0x0ae1}
   ,
+  {0x0af9, 0x0af9}
+  ,
   {0x0b05, 0x0b0c}
   ,
   {0x0b0f, 0x0b10}
@@ -2360,13 +2434,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0c12, 0x0c28}
   ,
-  {0x0c2a, 0x0c33}
-  ,
-  {0x0c35, 0x0c39}
+  {0x0c2a, 0x0c39}
   ,
   {0x0c3d, 0x0c3d}
   ,
-  {0x0c58, 0x0c59}
+  {0x0c58, 0x0c5a}
   ,
   {0x0c60, 0x0c61}
   ,
@@ -2398,7 +2470,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0d4e, 0x0d4e}
   ,
-  {0x0d60, 0x0d61}
+  {0x0d5f, 0x0d61}
   ,
   {0x0d7a, 0x0d7f}
   ,
@@ -2520,7 +2592,9 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1380, 0x138f}
   ,
-  {0x13a0, 0x13f4}
+  {0x13a0, 0x13f5}
+  ,
+  {0x13f8, 0x13fd}
   ,
   {0x1401, 0x166c}
   ,
@@ -2530,6 +2604,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x16a0, 0x16ea}
   ,
+  {0x16f1, 0x16f8}
+  ,
   {0x1700, 0x170c}
   ,
   {0x170e, 0x1711}
@@ -2556,7 +2632,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x18b0, 0x18f5}
   ,
-  {0x1900, 0x191c}
+  {0x1900, 0x191e}
   ,
   {0x1950, 0x196d}
   ,
@@ -2564,7 +2640,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1980, 0x19ab}
   ,
-  {0x19c1, 0x19c7}
+  {0x19b0, 0x19c9}
   ,
   {0x1a00, 0x1a16}
   ,
@@ -2732,7 +2808,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x3400, 0x4db5}
   ,
-  {0x4e00, 0x9fcc}
+  {0x4e00, 0x9fd5}
   ,
   {0xa000, 0xa48c}
   ,
@@ -2746,7 +2822,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa640, 0xa66e}
   ,
-  {0xa67f, 0xa697}
+  {0xa67f, 0xa69d}
   ,
   {0xa6a0, 0xa6e5}
   ,
@@ -2754,13 +2830,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa722, 0xa788}
   ,
-  {0xa78b, 0xa78e}
+  {0xa78b, 0xa7ad}
   ,
-  {0xa790, 0xa793}
+  {0xa7b0, 0xa7b7}
   ,
-  {0xa7a0, 0xa7aa}
-  ,
-  {0xa7f8, 0xa801}
+  {0xa7f7, 0xa801}
   ,
   {0xa803, 0xa805}
   ,
@@ -2776,6 +2850,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa8fb, 0xa8fb}
   ,
+  {0xa8fd, 0xa8fd}
+  ,
   {0xa90a, 0xa925}
   ,
   {0xa930, 0xa946}
@@ -2786,6 +2862,12 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa9cf, 0xa9cf}
   ,
+  {0xa9e0, 0xa9e4}
+  ,
+  {0xa9e6, 0xa9ef}
+  ,
+  {0xa9fa, 0xa9fe}
+  ,
   {0xaa00, 0xaa28}
   ,
   {0xaa40, 0xaa42}
@@ -2796,7 +2878,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xaa7a, 0xaa7a}
   ,
-  {0xaa80, 0xaaaf}
+  {0xaa7e, 0xaaaf}
   ,
   {0xaab1, 0xaab1}
   ,
@@ -2824,7 +2906,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xabc0, 0xabe2}
+  {0xab30, 0xab5a}
+  ,
+  {0xab5c, 0xab65}
+  ,
+  {0xab70, 0xabe2}
   ,
   {0xac00, 0xd7a3}
   ,
@@ -2900,12 +2986,14 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x102a0, 0x102d0}
   ,
-  {0x10300, 0x1031e}
+  {0x10300, 0x1031f}
   ,
   {0x10330, 0x10340}
   ,
   {0x10342, 0x10349}
   ,
+  {0x10350, 0x10375}
+  ,
   {0x10380, 0x1039d}
   ,
   {0x103a0, 0x103c3}
@@ -2914,6 +3002,16 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10400, 0x1049d}
   ,
+  {0x10500, 0x10527}
+  ,
+  {0x10530, 0x10563}
+  ,
+  {0x10600, 0x10736}
+  ,
+  {0x10740, 0x10755}
+  ,
+  {0x10760, 0x10767}
+  ,
   {0x10800, 0x10805}
   ,
   {0x10808, 0x10808}
@@ -2926,6 +3024,14 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1083f, 0x10855}
   ,
+  {0x10860, 0x10876}
+  ,
+  {0x10880, 0x1089e}
+  ,
+  {0x108e0, 0x108f2}
+  ,
+  {0x108f4, 0x108f5}
+  ,
   {0x10900, 0x10915}
   ,
   {0x10920, 0x10939}
@@ -2944,14 +3050,26 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10a60, 0x10a7c}
   ,
+  {0x10a80, 0x10a9c}
+  ,
+  {0x10ac0, 0x10ac7}
+  ,
+  {0x10ac9, 0x10ae4}
+  ,
   {0x10b00, 0x10b35}
   ,
   {0x10b40, 0x10b55}
   ,
   {0x10b60, 0x10b72}
   ,
+  {0x10b80, 0x10b91}
+  ,
   {0x10c00, 0x10c48}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x10cc0, 0x10cf2}
+  ,
   {0x11003, 0x11037}
   ,
   {0x11083, 0x110af}
@@ -2960,18 +3078,98 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x11103, 0x11126}
   ,
+  {0x11150, 0x11172}
+  ,
+  {0x11176, 0x11176}
+  ,
   {0x11183, 0x111b2}
   ,
   {0x111c1, 0x111c4}
   ,
+  {0x111da, 0x111da}
+  ,
+  {0x111dc, 0x111dc}
+  ,
+  {0x11200, 0x11211}
+  ,
+  {0x11213, 0x1122b}
+  ,
+  {0x11280, 0x11286}
+  ,
+  {0x11288, 0x11288}
+  ,
+  {0x1128a, 0x1128d}
+  ,
+  {0x1128f, 0x1129d}
+  ,
+  {0x1129f, 0x112a8}
+  ,
+  {0x112b0, 0x112de}
+  ,
+  {0x11305, 0x1130c}
+  ,
+  {0x1130f, 0x11310}
+  ,
+  {0x11313, 0x11328}
+  ,
+  {0x1132a, 0x11330}
+  ,
+  {0x11332, 0x11333}
+  ,
+  {0x11335, 0x11339}
+  ,
+  {0x1133d, 0x1133d}
+  ,
+  {0x11350, 0x11350}
+  ,
+  {0x1135d, 0x11361}
+  ,
+  {0x11480, 0x114af}
+  ,
+  {0x114c4, 0x114c5}
+  ,
+  {0x114c7, 0x114c7}
+  ,
+  {0x11580, 0x115ae}
+  ,
+  {0x115d8, 0x115db}
+  ,
+  {0x11600, 0x1162f}
+  ,
+  {0x11644, 0x11644}
+  ,
   {0x11680, 0x116aa}
   ,
-  {0x12000, 0x1236e}
+  {0x11700, 0x11719}
+  ,
+  {0x118a0, 0x118df}
+  ,
+  {0x118ff, 0x118ff}
+  ,
+  {0x11ac0, 0x11af8}
+  ,
+  {0x12000, 0x12399}
+  ,
+  {0x12480, 0x12543}
   ,
   {0x13000, 0x1342e}
   ,
+  {0x14400, 0x14646}
+  ,
   {0x16800, 0x16a38}
   ,
+  {0x16a40, 0x16a5e}
+  ,
+  {0x16ad0, 0x16aed}
+  ,
+  {0x16b00, 0x16b2f}
+  ,
+  {0x16b40, 0x16b43}
+  ,
+  {0x16b63, 0x16b77}
+  ,
+  {0x16b7d, 0x16b8f}
+  ,
   {0x16f00, 0x16f44}
   ,
   {0x16f50, 0x16f50}
@@ -2980,6 +3178,14 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1b000, 0x1b001}
   ,
+  {0x1bc00, 0x1bc6a}
+  ,
+  {0x1bc70, 0x1bc7c}
+  ,
+  {0x1bc80, 0x1bc88}
+  ,
+  {0x1bc90, 0x1bc99}
+  ,
   {0x1d400, 0x1d454}
   ,
   {0x1d456, 0x1d49c}
@@ -3040,6 +3246,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1d7c4, 0x1d7cb}
   ,
+  {0x1e800, 0x1e8c4}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -3112,11 +3320,13 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x2b740, 0x2b81d}
   ,
+  {0x2b820, 0x2cea1}
+  ,
   {0x2f800, 0x2fa1d}
 };
 
 scm_t_char_set cs_letter = {
-  486,
+  554,
   cs_letter_ranges
 };
 
@@ -3147,6 +3357,8 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x0d66, 0x0d6f}
   ,
+  {0x0de6, 0x0def}
+  ,
   {0x0e50, 0x0e59}
   ,
   {0x0ed0, 0x0ed9}
@@ -3185,6 +3397,8 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0xa9d0, 0xa9d9}
   ,
+  {0xa9f0, 0xa9f9}
+  ,
   {0xaa50, 0xaa59}
   ,
   {0xabf0, 0xabf9}
@@ -3201,13 +3415,27 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x111d0, 0x111d9}
   ,
+  {0x112f0, 0x112f9}
+  ,
+  {0x114d0, 0x114d9}
+  ,
+  {0x11650, 0x11659}
+  ,
   {0x116c0, 0x116c9}
   ,
+  {0x11730, 0x11739}
+  ,
+  {0x118e0, 0x118e9}
+  ,
+  {0x16a60, 0x16a69}
+  ,
+  {0x16b50, 0x16b59}
+  ,
   {0x1d7ce, 0x1d7ff}
 };
 
 scm_t_char_set cs_digit = {
-  42,
+  51,
   cs_digit_ranges
 };
 
@@ -3257,6 +3485,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x037a, 0x037d}
   ,
+  {0x037f, 0x037f}
+  ,
   {0x0386, 0x0386}
   ,
   {0x0388, 0x038a}
@@ -3269,7 +3499,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x03f7, 0x0481}
   ,
-  {0x048a, 0x0527}
+  {0x048a, 0x052f}
   ,
   {0x0531, 0x0556}
   ,
@@ -3321,9 +3551,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0840, 0x0858}
   ,
-  {0x08a0, 0x08a0}
-  ,
-  {0x08a2, 0x08ac}
+  {0x08a0, 0x08b4}
   ,
   {0x0904, 0x0939}
   ,
@@ -3335,9 +3563,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0966, 0x096f}
   ,
-  {0x0971, 0x0977}
-  ,
-  {0x0979, 0x097f}
+  {0x0971, 0x0980}
   ,
   {0x0985, 0x098c}
   ,
@@ -3403,6 +3629,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0ae6, 0x0aef}
   ,
+  {0x0af9, 0x0af9}
+  ,
   {0x0b05, 0x0b0c}
   ,
   {0x0b0f, 0x0b10}
@@ -3455,13 +3683,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0c12, 0x0c28}
   ,
-  {0x0c2a, 0x0c33}
-  ,
-  {0x0c35, 0x0c39}
+  {0x0c2a, 0x0c39}
   ,
   {0x0c3d, 0x0c3d}
   ,
-  {0x0c58, 0x0c59}
+  {0x0c58, 0x0c5a}
   ,
   {0x0c60, 0x0c61}
   ,
@@ -3497,7 +3723,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0d4e, 0x0d4e}
   ,
-  {0x0d60, 0x0d61}
+  {0x0d5f, 0x0d61}
   ,
   {0x0d66, 0x0d6f}
   ,
@@ -3513,6 +3739,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0dc0, 0x0dc6}
   ,
+  {0x0de6, 0x0def}
+  ,
   {0x0e01, 0x0e30}
   ,
   {0x0e32, 0x0e33}
@@ -3629,7 +3857,9 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1380, 0x138f}
   ,
-  {0x13a0, 0x13f4}
+  {0x13a0, 0x13f5}
+  ,
+  {0x13f8, 0x13fd}
   ,
   {0x1401, 0x166c}
   ,
@@ -3639,6 +3869,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x16a0, 0x16ea}
   ,
+  {0x16f1, 0x16f8}
+  ,
   {0x1700, 0x170c}
   ,
   {0x170e, 0x1711}
@@ -3669,7 +3901,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x18b0, 0x18f5}
   ,
-  {0x1900, 0x191c}
+  {0x1900, 0x191e}
   ,
   {0x1946, 0x196d}
   ,
@@ -3677,7 +3909,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1980, 0x19ab}
   ,
-  {0x19c1, 0x19c7}
+  {0x19b0, 0x19c9}
   ,
   {0x19d0, 0x19d9}
   ,
@@ -3851,7 +4083,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x3400, 0x4db5}
   ,
-  {0x4e00, 0x9fcc}
+  {0x4e00, 0x9fd5}
   ,
   {0xa000, 0xa48c}
   ,
@@ -3863,7 +4095,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa640, 0xa66e}
   ,
-  {0xa67f, 0xa697}
+  {0xa67f, 0xa69d}
   ,
   {0xa6a0, 0xa6e5}
   ,
@@ -3871,13 +4103,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa722, 0xa788}
   ,
-  {0xa78b, 0xa78e}
+  {0xa78b, 0xa7ad}
   ,
-  {0xa790, 0xa793}
+  {0xa7b0, 0xa7b7}
   ,
-  {0xa7a0, 0xa7aa}
-  ,
-  {0xa7f8, 0xa801}
+  {0xa7f7, 0xa801}
   ,
   {0xa803, 0xa805}
   ,
@@ -3895,6 +4125,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa8fb, 0xa8fb}
   ,
+  {0xa8fd, 0xa8fd}
+  ,
   {0xa900, 0xa925}
   ,
   {0xa930, 0xa946}
@@ -3905,6 +4137,10 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa9cf, 0xa9d9}
   ,
+  {0xa9e0, 0xa9e4}
+  ,
+  {0xa9e6, 0xa9fe}
+  ,
   {0xaa00, 0xaa28}
   ,
   {0xaa40, 0xaa42}
@@ -3917,7 +4153,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xaa7a, 0xaa7a}
   ,
-  {0xaa80, 0xaaaf}
+  {0xaa7e, 0xaaaf}
   ,
   {0xaab1, 0xaab1}
   ,
@@ -3945,7 +4181,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xabc0, 0xabe2}
+  {0xab30, 0xab5a}
+  ,
+  {0xab5c, 0xab65}
+  ,
+  {0xab70, 0xabe2}
   ,
   {0xabf0, 0xabf9}
   ,
@@ -4025,12 +4265,14 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x102a0, 0x102d0}
   ,
-  {0x10300, 0x1031e}
+  {0x10300, 0x1031f}
   ,
   {0x10330, 0x10340}
   ,
   {0x10342, 0x10349}
   ,
+  {0x10350, 0x10375}
+  ,
   {0x10380, 0x1039d}
   ,
   {0x103a0, 0x103c3}
@@ -4041,6 +4283,16 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x10500, 0x10527}
+  ,
+  {0x10530, 0x10563}
+  ,
+  {0x10600, 0x10736}
+  ,
+  {0x10740, 0x10755}
+  ,
+  {0x10760, 0x10767}
+  ,
   {0x10800, 0x10805}
   ,
   {0x10808, 0x10808}
@@ -4053,6 +4305,14 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1083f, 0x10855}
   ,
+  {0x10860, 0x10876}
+  ,
+  {0x10880, 0x1089e}
+  ,
+  {0x108e0, 0x108f2}
+  ,
+  {0x108f4, 0x108f5}
+  ,
   {0x10900, 0x10915}
   ,
   {0x10920, 0x10939}
@@ -4071,14 +4331,26 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10a60, 0x10a7c}
   ,
+  {0x10a80, 0x10a9c}
+  ,
+  {0x10ac0, 0x10ac7}
+  ,
+  {0x10ac9, 0x10ae4}
+  ,
   {0x10b00, 0x10b35}
   ,
   {0x10b40, 0x10b55}
   ,
   {0x10b60, 0x10b72}
   ,
+  {0x10b80, 0x10b91}
+  ,
   {0x10c00, 0x10c48}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x10cc0, 0x10cf2}
+  ,
   {0x11003, 0x11037}
   ,
   {0x11066, 0x1106f}
@@ -4093,22 +4365,112 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x11136, 0x1113f}
   ,
+  {0x11150, 0x11172}
+  ,
+  {0x11176, 0x11176}
+  ,
   {0x11183, 0x111b2}
   ,
   {0x111c1, 0x111c4}
   ,
-  {0x111d0, 0x111d9}
+  {0x111d0, 0x111da}
+  ,
+  {0x111dc, 0x111dc}
+  ,
+  {0x11200, 0x11211}
+  ,
+  {0x11213, 0x1122b}
+  ,
+  {0x11280, 0x11286}
+  ,
+  {0x11288, 0x11288}
+  ,
+  {0x1128a, 0x1128d}
+  ,
+  {0x1128f, 0x1129d}
+  ,
+  {0x1129f, 0x112a8}
+  ,
+  {0x112b0, 0x112de}
+  ,
+  {0x112f0, 0x112f9}
+  ,
+  {0x11305, 0x1130c}
+  ,
+  {0x1130f, 0x11310}
+  ,
+  {0x11313, 0x11328}
+  ,
+  {0x1132a, 0x11330}
+  ,
+  {0x11332, 0x11333}
+  ,
+  {0x11335, 0x11339}
+  ,
+  {0x1133d, 0x1133d}
+  ,
+  {0x11350, 0x11350}
+  ,
+  {0x1135d, 0x11361}
+  ,
+  {0x11480, 0x114af}
+  ,
+  {0x114c4, 0x114c5}
+  ,
+  {0x114c7, 0x114c7}
+  ,
+  {0x114d0, 0x114d9}
+  ,
+  {0x11580, 0x115ae}
+  ,
+  {0x115d8, 0x115db}
+  ,
+  {0x11600, 0x1162f}
+  ,
+  {0x11644, 0x11644}
+  ,
+  {0x11650, 0x11659}
   ,
   {0x11680, 0x116aa}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x12000, 0x1236e}
+  {0x11700, 0x11719}
+  ,
+  {0x11730, 0x11739}
+  ,
+  {0x118a0, 0x118e9}
+  ,
+  {0x118ff, 0x118ff}
+  ,
+  {0x11ac0, 0x11af8}
+  ,
+  {0x12000, 0x12399}
+  ,
+  {0x12480, 0x12543}
   ,
   {0x13000, 0x1342e}
   ,
+  {0x14400, 0x14646}
+  ,
   {0x16800, 0x16a38}
   ,
+  {0x16a40, 0x16a5e}
+  ,
+  {0x16a60, 0x16a69}
+  ,
+  {0x16ad0, 0x16aed}
+  ,
+  {0x16b00, 0x16b2f}
+  ,
+  {0x16b40, 0x16b43}
+  ,
+  {0x16b50, 0x16b59}
+  ,
+  {0x16b63, 0x16b77}
+  ,
+  {0x16b7d, 0x16b8f}
+  ,
   {0x16f00, 0x16f44}
   ,
   {0x16f50, 0x16f50}
@@ -4117,6 +4479,14 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1b000, 0x1b001}
   ,
+  {0x1bc00, 0x1bc6a}
+  ,
+  {0x1bc70, 0x1bc7c}
+  ,
+  {0x1bc80, 0x1bc88}
+  ,
+  {0x1bc90, 0x1bc99}
+  ,
   {0x1d400, 0x1d454}
   ,
   {0x1d456, 0x1d49c}
@@ -4179,6 +4549,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1d7ce, 0x1d7ff}
   ,
+  {0x1e800, 0x1e8c4}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -4251,11 +4623,13 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x2b740, 0x2b81d}
   ,
+  {0x2b820, 0x2cea1}
+  ,
   {0x2f800, 0x2fa1d}
 };
 
 scm_t_char_set cs_letter_plus_digit = {
-  514,
+  587,
   cs_letter_plus_digit_ranges
 };
 
@@ -4266,7 +4640,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x00ae, 0x0377}
   ,
-  {0x037a, 0x037e}
+  {0x037a, 0x037f}
   ,
   {0x0384, 0x038a}
   ,
@@ -4274,7 +4648,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0527}
+  {0x03a3, 0x052f}
   ,
   {0x0531, 0x0556}
   ,
@@ -4284,7 +4658,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0589, 0x058a}
   ,
-  {0x058f, 0x058f}
+  {0x058d, 0x058f}
   ,
   {0x0591, 0x05c7}
   ,
@@ -4312,17 +4686,9 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
-  {0x08a0, 0x08a0}
+  {0x08a0, 0x08b4}
   ,
-  {0x08a2, 0x08ac}
-  ,
-  {0x08e4, 0x08fe}
-  ,
-  {0x0900, 0x0977}
-  ,
-  {0x0979, 0x097f}
-  ,
-  {0x0981, 0x0983}
+  {0x08e3, 0x0983}
   ,
   {0x0985, 0x098c}
   ,
@@ -4408,6 +4774,8 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
+  {0x0af9, 0x0af9}
+  ,
   {0x0b01, 0x0b03}
   ,
   {0x0b05, 0x0b0c}
@@ -4468,7 +4836,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c01, 0x0c03}
+  {0x0c00, 0x0c03}
   ,
   {0x0c05, 0x0c0c}
   ,
@@ -4476,9 +4844,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0c12, 0x0c28}
   ,
-  {0x0c2a, 0x0c33}
-  ,
-  {0x0c35, 0x0c39}
+  {0x0c2a, 0x0c39}
   ,
   {0x0c3d, 0x0c44}
   ,
@@ -4488,7 +4854,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0c55, 0x0c56}
   ,
-  {0x0c58, 0x0c59}
+  {0x0c58, 0x0c5a}
   ,
   {0x0c60, 0x0c63}
   ,
@@ -4496,7 +4862,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0c78, 0x0c7f}
   ,
-  {0x0c82, 0x0c83}
+  {0x0c81, 0x0c83}
   ,
   {0x0c85, 0x0c8c}
   ,
@@ -4524,7 +4890,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d02, 0x0d03}
+  {0x0d01, 0x0d03}
   ,
   {0x0d05, 0x0d0c}
   ,
@@ -4540,7 +4906,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0d57, 0x0d57}
   ,
-  {0x0d60, 0x0d63}
+  {0x0d5f, 0x0d63}
   ,
   {0x0d66, 0x0d75}
   ,
@@ -4566,6 +4932,8 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0dd8, 0x0ddf}
   ,
+  {0x0de6, 0x0def}
+  ,
   {0x0df2, 0x0df4}
   ,
   {0x0e01, 0x0e3a}
@@ -4662,13 +5030,15 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1380, 0x1399}
   ,
-  {0x13a0, 0x13f4}
+  {0x13a0, 0x13f5}
+  ,
+  {0x13f8, 0x13fd}
   ,
   {0x1400, 0x167f}
   ,
   {0x1681, 0x169c}
   ,
-  {0x16a0, 0x16f0}
+  {0x16a0, 0x16f8}
   ,
   {0x1700, 0x170c}
   ,
@@ -4700,7 +5070,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x18b0, 0x18f5}
   ,
-  {0x1900, 0x191c}
+  {0x1900, 0x191e}
   ,
   {0x1920, 0x192b}
   ,
@@ -4730,6 +5100,8 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
+  {0x1ab0, 0x1abe}
+  ,
   {0x1b00, 0x1b4b}
   ,
   {0x1b50, 0x1b7c}
@@ -4746,7 +5118,9 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1cd0, 0x1cf6}
   ,
-  {0x1d00, 0x1de6}
+  {0x1cf8, 0x1cf9}
+  ,
+  {0x1d00, 0x1df5}
   ,
   {0x1dfc, 0x1f15}
   ,
@@ -4790,23 +5164,29 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20ba}
+  {0x20a0, 0x20be}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x2189}
+  {0x2100, 0x218b}
   ,
-  {0x2190, 0x23f3}
+  {0x2190, 0x23fa}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x26ff}
+  {0x2460, 0x2b73}
   ,
-  {0x2701, 0x2b4c}
+  {0x2b76, 0x2b95}
   ,
-  {0x2b50, 0x2b59}
+  {0x2b98, 0x2bb9}
+  ,
+  {0x2bbd, 0x2bc8}
+  ,
+  {0x2bca, 0x2bd1}
+  ,
+  {0x2bec, 0x2bef}
   ,
   {0x2c00, 0x2c2e}
   ,
@@ -4842,7 +5222,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e3b}
+  {0x2de0, 0x2e42}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -4872,7 +5252,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fcc}
+  {0x4dc0, 0x9fd5}
   ,
   {0xa000, 0xa48c}
   ,
@@ -4880,17 +5260,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xa4d0, 0xa62b}
   ,
-  {0xa640, 0xa697}
+  {0xa640, 0xa6f7}
   ,
-  {0xa69f, 0xa6f7}
+  {0xa700, 0xa7ad}
   ,
-  {0xa700, 0xa78e}
+  {0xa7b0, 0xa7b7}
   ,
-  {0xa790, 0xa793}
-  ,
-  {0xa7a0, 0xa7aa}
-  ,
-  {0xa7f8, 0xa82b}
+  {0xa7f7, 0xa82b}
   ,
   {0xa830, 0xa839}
   ,
@@ -4900,7 +5276,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fb}
+  {0xa8e0, 0xa8fd}
   ,
   {0xa900, 0xa953}
   ,
@@ -4910,7 +5286,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xa9cf, 0xa9d9}
   ,
-  {0xa9de, 0xa9df}
+  {0xa9de, 0xa9fe}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -4918,9 +5294,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa7b}
-  ,
-  {0xaa80, 0xaac2}
+  {0xaa5c, 0xaac2}
   ,
   {0xaadb, 0xaaf6}
   ,
@@ -4934,7 +5308,9 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xabc0, 0xabed}
+  {0xab30, 0xab65}
+  ,
+  {0xab70, 0xabed}
   ,
   {0xabf0, 0xabf9}
   ,
@@ -4974,9 +5350,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xfe00, 0xfe19}
   ,
-  {0xfe20, 0xfe26}
-  ,
-  {0xfe30, 0xfe52}
+  {0xfe20, 0xfe52}
   ,
   {0xfe54, 0xfe66}
   ,
@@ -5020,22 +5394,26 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018a}
+  {0x10137, 0x1018c}
   ,
   {0x10190, 0x1019b}
   ,
+  {0x101a0, 0x101a0}
+  ,
   {0x101d0, 0x101fd}
   ,
   {0x10280, 0x1029c}
   ,
   {0x102a0, 0x102d0}
   ,
-  {0x10300, 0x1031e}
+  {0x102e0, 0x102fb}
   ,
-  {0x10320, 0x10323}
+  {0x10300, 0x10323}
   ,
   {0x10330, 0x1034a}
   ,
+  {0x10350, 0x1037a}
+  ,
   {0x10380, 0x1039d}
   ,
   {0x1039f, 0x103c3}
@@ -5046,6 +5424,18 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x10500, 0x10527}
+  ,
+  {0x10530, 0x10563}
+  ,
+  {0x1056f, 0x1056f}
+  ,
+  {0x10600, 0x10736}
+  ,
+  {0x10740, 0x10755}
+  ,
+  {0x10760, 0x10767}
+  ,
   {0x10800, 0x10805}
   ,
   {0x10808, 0x10808}
@@ -5058,9 +5448,15 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1083f, 0x10855}
   ,
-  {0x10857, 0x1085f}
+  {0x10857, 0x1089e}
   ,
-  {0x10900, 0x1091b}
+  {0x108a7, 0x108af}
+  ,
+  {0x108e0, 0x108f2}
+  ,
+  {0x108f4, 0x108f5}
+  ,
+  {0x108fb, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -5068,9 +5464,9 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10980, 0x109b7}
   ,
-  {0x109be, 0x109bf}
+  {0x109bc, 0x109cf}
   ,
-  {0x10a00, 0x10a03}
+  {0x109d2, 0x10a03}
   ,
   {0x10a05, 0x10a06}
   ,
@@ -5086,7 +5482,11 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
-  {0x10a60, 0x10a7f}
+  {0x10a60, 0x10a9f}
+  ,
+  {0x10ac0, 0x10ae6}
+  ,
+  {0x10aeb, 0x10af6}
   ,
   {0x10b00, 0x10b35}
   ,
@@ -5094,17 +5494,27 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10b58, 0x10b72}
   ,
-  {0x10b78, 0x10b7f}
+  {0x10b78, 0x10b91}
+  ,
+  {0x10b99, 0x10b9c}
+  ,
+  {0x10ba9, 0x10baf}
   ,
   {0x10c00, 0x10c48}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x10cc0, 0x10cf2}
+  ,
+  {0x10cfa, 0x10cff}
+  ,
   {0x10e60, 0x10e7e}
   ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
   ,
-  {0x11080, 0x110bc}
+  {0x1107f, 0x110bc}
   ,
   {0x110be, 0x110c1}
   ,
@@ -5116,24 +5526,124 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x11136, 0x11143}
   ,
-  {0x11180, 0x111c8}
+  {0x11150, 0x11176}
   ,
-  {0x111d0, 0x111d9}
+  {0x11180, 0x111cd}
+  ,
+  {0x111d0, 0x111df}
+  ,
+  {0x111e1, 0x111f4}
+  ,
+  {0x11200, 0x11211}
+  ,
+  {0x11213, 0x1123d}
+  ,
+  {0x11280, 0x11286}
+  ,
+  {0x11288, 0x11288}
+  ,
+  {0x1128a, 0x1128d}
+  ,
+  {0x1128f, 0x1129d}
+  ,
+  {0x1129f, 0x112a9}
+  ,
+  {0x112b0, 0x112ea}
+  ,
+  {0x112f0, 0x112f9}
+  ,
+  {0x11300, 0x11303}
+  ,
+  {0x11305, 0x1130c}
+  ,
+  {0x1130f, 0x11310}
+  ,
+  {0x11313, 0x11328}
+  ,
+  {0x1132a, 0x11330}
+  ,
+  {0x11332, 0x11333}
+  ,
+  {0x11335, 0x11339}
+  ,
+  {0x1133c, 0x11344}
+  ,
+  {0x11347, 0x11348}
+  ,
+  {0x1134b, 0x1134d}
+  ,
+  {0x11350, 0x11350}
+  ,
+  {0x11357, 0x11357}
+  ,
+  {0x1135d, 0x11363}
+  ,
+  {0x11366, 0x1136c}
+  ,
+  {0x11370, 0x11374}
+  ,
+  {0x11480, 0x114c7}
+  ,
+  {0x114d0, 0x114d9}
+  ,
+  {0x11580, 0x115b5}
+  ,
+  {0x115b8, 0x115dd}
+  ,
+  {0x11600, 0x11644}
+  ,
+  {0x11650, 0x11659}
   ,
   {0x11680, 0x116b7}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x12000, 0x1236e}
+  {0x11700, 0x11719}
   ,
-  {0x12400, 0x12462}
+  {0x1171d, 0x1172b}
   ,
-  {0x12470, 0x12473}
+  {0x11730, 0x1173f}
+  ,
+  {0x118a0, 0x118f2}
+  ,
+  {0x118ff, 0x118ff}
+  ,
+  {0x11ac0, 0x11af8}
+  ,
+  {0x12000, 0x12399}
+  ,
+  {0x12400, 0x1246e}
+  ,
+  {0x12470, 0x12474}
+  ,
+  {0x12480, 0x12543}
   ,
   {0x13000, 0x1342e}
   ,
+  {0x14400, 0x14646}
+  ,
   {0x16800, 0x16a38}
   ,
+  {0x16a40, 0x16a5e}
+  ,
+  {0x16a60, 0x16a69}
+  ,
+  {0x16a6e, 0x16a6f}
+  ,
+  {0x16ad0, 0x16aed}
+  ,
+  {0x16af0, 0x16af5}
+  ,
+  {0x16b00, 0x16b45}
+  ,
+  {0x16b50, 0x16b59}
+  ,
+  {0x16b5b, 0x16b61}
+  ,
+  {0x16b63, 0x16b77}
+  ,
+  {0x16b7d, 0x16b8f}
+  ,
   {0x16f00, 0x16f44}
   ,
   {0x16f50, 0x16f7e}
@@ -5142,13 +5652,23 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1b000, 0x1b001}
   ,
+  {0x1bc00, 0x1bc6a}
+  ,
+  {0x1bc70, 0x1bc7c}
+  ,
+  {0x1bc80, 0x1bc88}
+  ,
+  {0x1bc90, 0x1bc99}
+  ,
+  {0x1bc9c, 0x1bc9f}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
   ,
   {0x1d129, 0x1d172}
   ,
-  {0x1d17b, 0x1d1dd}
+  {0x1d17b, 0x1d1e8}
   ,
   {0x1d200, 0x1d245}
   ,
@@ -5196,7 +5716,15 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1d6a8, 0x1d7cb}
   ,
-  {0x1d7ce, 0x1d7ff}
+  {0x1d7ce, 0x1da8b}
+  ,
+  {0x1da9b, 0x1da9f}
+  ,
+  {0x1daa1, 0x1daaf}
+  ,
+  {0x1e800, 0x1e8c4}
+  ,
+  {0x1e8c7, 0x1e8d6}
   ,
   {0x1ee00, 0x1ee03}
   ,
@@ -5272,13 +5800,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1f0a0, 0x1f0ae}
   ,
-  {0x1f0b1, 0x1f0be}
+  {0x1f0b1, 0x1f0bf}
   ,
   {0x1f0c1, 0x1f0cf}
   ,
-  {0x1f0d1, 0x1f0df}
+  {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10a}
+  {0x1f100, 0x1f10c}
   ,
   {0x1f110, 0x1f12e}
   ,
@@ -5294,55 +5822,51 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f320}
+  {0x1f300, 0x1f579}
   ,
-  {0x1f330, 0x1f335}
+  {0x1f57b, 0x1f5a3}
   ,
-  {0x1f337, 0x1f37c}
+  {0x1f5a5, 0x1f6d0}
   ,
-  {0x1f380, 0x1f393}
+  {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f3a0, 0x1f3c4}
-  ,
-  {0x1f3c6, 0x1f3ca}
-  ,
-  {0x1f3e0, 0x1f3f0}
-  ,
-  {0x1f400, 0x1f43e}
-  ,
-  {0x1f440, 0x1f440}
-  ,
-  {0x1f442, 0x1f4f7}
-  ,
-  {0x1f4f9, 0x1f4fc}
-  ,
-  {0x1f500, 0x1f53d}
-  ,
-  {0x1f540, 0x1f543}
-  ,
-  {0x1f550, 0x1f567}
-  ,
-  {0x1f5fb, 0x1f640}
-  ,
-  {0x1f645, 0x1f64f}
-  ,
-  {0x1f680, 0x1f6c5}
+  {0x1f6f0, 0x1f6f3}
   ,
   {0x1f700, 0x1f773}
   ,
+  {0x1f780, 0x1f7d4}
+  ,
+  {0x1f800, 0x1f80b}
+  ,
+  {0x1f810, 0x1f847}
+  ,
+  {0x1f850, 0x1f859}
+  ,
+  {0x1f860, 0x1f887}
+  ,
+  {0x1f890, 0x1f8ad}
+  ,
+  {0x1f910, 0x1f918}
+  ,
+  {0x1f980, 0x1f984}
+  ,
+  {0x1f9c0, 0x1f9c0}
+  ,
   {0x20000, 0x2a6d6}
   ,
   {0x2a700, 0x2b734}
   ,
   {0x2b740, 0x2b81d}
   ,
+  {0x2b820, 0x2cea1}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_graphic = {
-  540,
+  615,
   cs_graphic_ranges
 };
 
@@ -5355,8 +5879,6 @@ scm_t_char_range cs_whitespace_ranges[] = {
   ,
   {0x1680, 0x1680}
   ,
-  {0x180e, 0x180e}
-  ,
   {0x2000, 0x200a}
   ,
   {0x2028, 0x2029}
@@ -5369,7 +5891,7 @@ scm_t_char_range cs_whitespace_ranges[] = {
 };
 
 scm_t_char_set cs_whitespace = {
-  10,
+  9,
   cs_whitespace_ranges
 };
 
@@ -5382,7 +5904,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x00ae, 0x0377}
   ,
-  {0x037a, 0x037e}
+  {0x037a, 0x037f}
   ,
   {0x0384, 0x038a}
   ,
@@ -5390,7 +5912,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0527}
+  {0x03a3, 0x052f}
   ,
   {0x0531, 0x0556}
   ,
@@ -5400,7 +5922,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0589, 0x058a}
   ,
-  {0x058f, 0x058f}
+  {0x058d, 0x058f}
   ,
   {0x0591, 0x05c7}
   ,
@@ -5428,17 +5950,9 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
-  {0x08a0, 0x08a0}
+  {0x08a0, 0x08b4}
   ,
-  {0x08a2, 0x08ac}
-  ,
-  {0x08e4, 0x08fe}
-  ,
-  {0x0900, 0x0977}
-  ,
-  {0x0979, 0x097f}
-  ,
-  {0x0981, 0x0983}
+  {0x08e3, 0x0983}
   ,
   {0x0985, 0x098c}
   ,
@@ -5524,6 +6038,8 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
+  {0x0af9, 0x0af9}
+  ,
   {0x0b01, 0x0b03}
   ,
   {0x0b05, 0x0b0c}
@@ -5584,7 +6100,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c01, 0x0c03}
+  {0x0c00, 0x0c03}
   ,
   {0x0c05, 0x0c0c}
   ,
@@ -5592,9 +6108,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0c12, 0x0c28}
   ,
-  {0x0c2a, 0x0c33}
-  ,
-  {0x0c35, 0x0c39}
+  {0x0c2a, 0x0c39}
   ,
   {0x0c3d, 0x0c44}
   ,
@@ -5604,7 +6118,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0c55, 0x0c56}
   ,
-  {0x0c58, 0x0c59}
+  {0x0c58, 0x0c5a}
   ,
   {0x0c60, 0x0c63}
   ,
@@ -5612,7 +6126,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0c78, 0x0c7f}
   ,
-  {0x0c82, 0x0c83}
+  {0x0c81, 0x0c83}
   ,
   {0x0c85, 0x0c8c}
   ,
@@ -5640,7 +6154,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d02, 0x0d03}
+  {0x0d01, 0x0d03}
   ,
   {0x0d05, 0x0d0c}
   ,
@@ -5656,7 +6170,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0d57, 0x0d57}
   ,
-  {0x0d60, 0x0d63}
+  {0x0d5f, 0x0d63}
   ,
   {0x0d66, 0x0d75}
   ,
@@ -5682,6 +6196,8 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0dd8, 0x0ddf}
   ,
+  {0x0de6, 0x0def}
+  ,
   {0x0df2, 0x0df4}
   ,
   {0x0e01, 0x0e3a}
@@ -5778,11 +6294,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1380, 0x1399}
   ,
-  {0x13a0, 0x13f4}
+  {0x13a0, 0x13f5}
+  ,
+  {0x13f8, 0x13fd}
   ,
   {0x1400, 0x169c}
   ,
-  {0x16a0, 0x16f0}
+  {0x16a0, 0x16f8}
   ,
   {0x1700, 0x170c}
   ,
@@ -5804,7 +6322,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x17f0, 0x17f9}
   ,
-  {0x1800, 0x180e}
+  {0x1800, 0x180d}
   ,
   {0x1810, 0x1819}
   ,
@@ -5814,7 +6332,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x18b0, 0x18f5}
   ,
-  {0x1900, 0x191c}
+  {0x1900, 0x191e}
   ,
   {0x1920, 0x192b}
   ,
@@ -5844,6 +6362,8 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
+  {0x1ab0, 0x1abe}
+  ,
   {0x1b00, 0x1b4b}
   ,
   {0x1b50, 0x1b7c}
@@ -5860,7 +6380,9 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1cd0, 0x1cf6}
   ,
-  {0x1d00, 0x1de6}
+  {0x1cf8, 0x1cf9}
+  ,
+  {0x1d00, 0x1df5}
   ,
   {0x1dfc, 0x1f15}
   ,
@@ -5906,23 +6428,29 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20ba}
+  {0x20a0, 0x20be}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x2189}
+  {0x2100, 0x218b}
   ,
-  {0x2190, 0x23f3}
+  {0x2190, 0x23fa}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x26ff}
+  {0x2460, 0x2b73}
   ,
-  {0x2701, 0x2b4c}
+  {0x2b76, 0x2b95}
   ,
-  {0x2b50, 0x2b59}
+  {0x2b98, 0x2bb9}
+  ,
+  {0x2bbd, 0x2bc8}
+  ,
+  {0x2bca, 0x2bd1}
+  ,
+  {0x2bec, 0x2bef}
   ,
   {0x2c00, 0x2c2e}
   ,
@@ -5958,7 +6486,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e3b}
+  {0x2de0, 0x2e42}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -5988,7 +6516,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fcc}
+  {0x4dc0, 0x9fd5}
   ,
   {0xa000, 0xa48c}
   ,
@@ -5996,17 +6524,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xa4d0, 0xa62b}
   ,
-  {0xa640, 0xa697}
+  {0xa640, 0xa6f7}
   ,
-  {0xa69f, 0xa6f7}
+  {0xa700, 0xa7ad}
   ,
-  {0xa700, 0xa78e}
+  {0xa7b0, 0xa7b7}
   ,
-  {0xa790, 0xa793}
-  ,
-  {0xa7a0, 0xa7aa}
-  ,
-  {0xa7f8, 0xa82b}
+  {0xa7f7, 0xa82b}
   ,
   {0xa830, 0xa839}
   ,
@@ -6016,7 +6540,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fb}
+  {0xa8e0, 0xa8fd}
   ,
   {0xa900, 0xa953}
   ,
@@ -6026,7 +6550,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xa9cf, 0xa9d9}
   ,
-  {0xa9de, 0xa9df}
+  {0xa9de, 0xa9fe}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -6034,9 +6558,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa7b}
-  ,
-  {0xaa80, 0xaac2}
+  {0xaa5c, 0xaac2}
   ,
   {0xaadb, 0xaaf6}
   ,
@@ -6050,7 +6572,9 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xabc0, 0xabed}
+  {0xab30, 0xab65}
+  ,
+  {0xab70, 0xabed}
   ,
   {0xabf0, 0xabf9}
   ,
@@ -6090,9 +6614,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xfe00, 0xfe19}
   ,
-  {0xfe20, 0xfe26}
-  ,
-  {0xfe30, 0xfe52}
+  {0xfe20, 0xfe52}
   ,
   {0xfe54, 0xfe66}
   ,
@@ -6136,22 +6658,26 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018a}
+  {0x10137, 0x1018c}
   ,
   {0x10190, 0x1019b}
   ,
+  {0x101a0, 0x101a0}
+  ,
   {0x101d0, 0x101fd}
   ,
   {0x10280, 0x1029c}
   ,
   {0x102a0, 0x102d0}
   ,
-  {0x10300, 0x1031e}
+  {0x102e0, 0x102fb}
   ,
-  {0x10320, 0x10323}
+  {0x10300, 0x10323}
   ,
   {0x10330, 0x1034a}
   ,
+  {0x10350, 0x1037a}
+  ,
   {0x10380, 0x1039d}
   ,
   {0x1039f, 0x103c3}
@@ -6162,6 +6688,18 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x10500, 0x10527}
+  ,
+  {0x10530, 0x10563}
+  ,
+  {0x1056f, 0x1056f}
+  ,
+  {0x10600, 0x10736}
+  ,
+  {0x10740, 0x10755}
+  ,
+  {0x10760, 0x10767}
+  ,
   {0x10800, 0x10805}
   ,
   {0x10808, 0x10808}
@@ -6174,9 +6712,15 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1083f, 0x10855}
   ,
-  {0x10857, 0x1085f}
+  {0x10857, 0x1089e}
   ,
-  {0x10900, 0x1091b}
+  {0x108a7, 0x108af}
+  ,
+  {0x108e0, 0x108f2}
+  ,
+  {0x108f4, 0x108f5}
+  ,
+  {0x108fb, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -6184,9 +6728,9 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10980, 0x109b7}
   ,
-  {0x109be, 0x109bf}
+  {0x109bc, 0x109cf}
   ,
-  {0x10a00, 0x10a03}
+  {0x109d2, 0x10a03}
   ,
   {0x10a05, 0x10a06}
   ,
@@ -6202,7 +6746,11 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
-  {0x10a60, 0x10a7f}
+  {0x10a60, 0x10a9f}
+  ,
+  {0x10ac0, 0x10ae6}
+  ,
+  {0x10aeb, 0x10af6}
   ,
   {0x10b00, 0x10b35}
   ,
@@ -6210,17 +6758,27 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10b58, 0x10b72}
   ,
-  {0x10b78, 0x10b7f}
+  {0x10b78, 0x10b91}
+  ,
+  {0x10b99, 0x10b9c}
+  ,
+  {0x10ba9, 0x10baf}
   ,
   {0x10c00, 0x10c48}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x10cc0, 0x10cf2}
+  ,
+  {0x10cfa, 0x10cff}
+  ,
   {0x10e60, 0x10e7e}
   ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
   ,
-  {0x11080, 0x110bc}
+  {0x1107f, 0x110bc}
   ,
   {0x110be, 0x110c1}
   ,
@@ -6232,24 +6790,124 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x11136, 0x11143}
   ,
-  {0x11180, 0x111c8}
+  {0x11150, 0x11176}
   ,
-  {0x111d0, 0x111d9}
+  {0x11180, 0x111cd}
+  ,
+  {0x111d0, 0x111df}
+  ,
+  {0x111e1, 0x111f4}
+  ,
+  {0x11200, 0x11211}
+  ,
+  {0x11213, 0x1123d}
+  ,
+  {0x11280, 0x11286}
+  ,
+  {0x11288, 0x11288}
+  ,
+  {0x1128a, 0x1128d}
+  ,
+  {0x1128f, 0x1129d}
+  ,
+  {0x1129f, 0x112a9}
+  ,
+  {0x112b0, 0x112ea}
+  ,
+  {0x112f0, 0x112f9}
+  ,
+  {0x11300, 0x11303}
+  ,
+  {0x11305, 0x1130c}
+  ,
+  {0x1130f, 0x11310}
+  ,
+  {0x11313, 0x11328}
+  ,
+  {0x1132a, 0x11330}
+  ,
+  {0x11332, 0x11333}
+  ,
+  {0x11335, 0x11339}
+  ,
+  {0x1133c, 0x11344}
+  ,
+  {0x11347, 0x11348}
+  ,
+  {0x1134b, 0x1134d}
+  ,
+  {0x11350, 0x11350}
+  ,
+  {0x11357, 0x11357}
+  ,
+  {0x1135d, 0x11363}
+  ,
+  {0x11366, 0x1136c}
+  ,
+  {0x11370, 0x11374}
+  ,
+  {0x11480, 0x114c7}
+  ,
+  {0x114d0, 0x114d9}
+  ,
+  {0x11580, 0x115b5}
+  ,
+  {0x115b8, 0x115dd}
+  ,
+  {0x11600, 0x11644}
+  ,
+  {0x11650, 0x11659}
   ,
   {0x11680, 0x116b7}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x12000, 0x1236e}
+  {0x11700, 0x11719}
   ,
-  {0x12400, 0x12462}
+  {0x1171d, 0x1172b}
   ,
-  {0x12470, 0x12473}
+  {0x11730, 0x1173f}
+  ,
+  {0x118a0, 0x118f2}
+  ,
+  {0x118ff, 0x118ff}
+  ,
+  {0x11ac0, 0x11af8}
+  ,
+  {0x12000, 0x12399}
+  ,
+  {0x12400, 0x1246e}
+  ,
+  {0x12470, 0x12474}
+  ,
+  {0x12480, 0x12543}
   ,
   {0x13000, 0x1342e}
   ,
+  {0x14400, 0x14646}
+  ,
   {0x16800, 0x16a38}
   ,
+  {0x16a40, 0x16a5e}
+  ,
+  {0x16a60, 0x16a69}
+  ,
+  {0x16a6e, 0x16a6f}
+  ,
+  {0x16ad0, 0x16aed}
+  ,
+  {0x16af0, 0x16af5}
+  ,
+  {0x16b00, 0x16b45}
+  ,
+  {0x16b50, 0x16b59}
+  ,
+  {0x16b5b, 0x16b61}
+  ,
+  {0x16b63, 0x16b77}
+  ,
+  {0x16b7d, 0x16b8f}
+  ,
   {0x16f00, 0x16f44}
   ,
   {0x16f50, 0x16f7e}
@@ -6258,13 +6916,23 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1b000, 0x1b001}
   ,
+  {0x1bc00, 0x1bc6a}
+  ,
+  {0x1bc70, 0x1bc7c}
+  ,
+  {0x1bc80, 0x1bc88}
+  ,
+  {0x1bc90, 0x1bc99}
+  ,
+  {0x1bc9c, 0x1bc9f}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
   ,
   {0x1d129, 0x1d172}
   ,
-  {0x1d17b, 0x1d1dd}
+  {0x1d17b, 0x1d1e8}
   ,
   {0x1d200, 0x1d245}
   ,
@@ -6312,7 +6980,15 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1d6a8, 0x1d7cb}
   ,
-  {0x1d7ce, 0x1d7ff}
+  {0x1d7ce, 0x1da8b}
+  ,
+  {0x1da9b, 0x1da9f}
+  ,
+  {0x1daa1, 0x1daaf}
+  ,
+  {0x1e800, 0x1e8c4}
+  ,
+  {0x1e8c7, 0x1e8d6}
   ,
   {0x1ee00, 0x1ee03}
   ,
@@ -6388,13 +7064,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1f0a0, 0x1f0ae}
   ,
-  {0x1f0b1, 0x1f0be}
+  {0x1f0b1, 0x1f0bf}
   ,
   {0x1f0c1, 0x1f0cf}
   ,
-  {0x1f0d1, 0x1f0df}
+  {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10a}
+  {0x1f100, 0x1f10c}
   ,
   {0x1f110, 0x1f12e}
   ,
@@ -6410,55 +7086,51 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f320}
+  {0x1f300, 0x1f579}
   ,
-  {0x1f330, 0x1f335}
+  {0x1f57b, 0x1f5a3}
   ,
-  {0x1f337, 0x1f37c}
+  {0x1f5a5, 0x1f6d0}
   ,
-  {0x1f380, 0x1f393}
+  {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f3a0, 0x1f3c4}
-  ,
-  {0x1f3c6, 0x1f3ca}
-  ,
-  {0x1f3e0, 0x1f3f0}
-  ,
-  {0x1f400, 0x1f43e}
-  ,
-  {0x1f440, 0x1f440}
-  ,
-  {0x1f442, 0x1f4f7}
-  ,
-  {0x1f4f9, 0x1f4fc}
-  ,
-  {0x1f500, 0x1f53d}
-  ,
-  {0x1f540, 0x1f543}
-  ,
-  {0x1f550, 0x1f567}
-  ,
-  {0x1f5fb, 0x1f640}
-  ,
-  {0x1f645, 0x1f64f}
-  ,
-  {0x1f680, 0x1f6c5}
+  {0x1f6f0, 0x1f6f3}
   ,
   {0x1f700, 0x1f773}
   ,
+  {0x1f780, 0x1f7d4}
+  ,
+  {0x1f800, 0x1f80b}
+  ,
+  {0x1f810, 0x1f847}
+  ,
+  {0x1f850, 0x1f859}
+  ,
+  {0x1f860, 0x1f887}
+  ,
+  {0x1f890, 0x1f8ad}
+  ,
+  {0x1f910, 0x1f918}
+  ,
+  {0x1f980, 0x1f984}
+  ,
+  {0x1f9c0, 0x1f9c0}
+  ,
   {0x20000, 0x2a6d6}
   ,
   {0x2a700, 0x2b734}
   ,
   {0x2b740, 0x2b81d}
   ,
+  {0x2b820, 0x2cea1}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_printing = {
-  541,
+  616,
   cs_printing_ranges
 };
 
@@ -6620,6 +7292,8 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x208d, 0x208e}
   ,
+  {0x2308, 0x230b}
+  ,
   {0x2329, 0x232a}
   ,
   {0x2768, 0x2775}
@@ -6642,7 +7316,7 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x2e00, 0x2e2e}
   ,
-  {0x2e30, 0x2e3b}
+  {0x2e30, 0x2e42}
   ,
   {0x3001, 0x3003}
   ,
@@ -6674,6 +7348,8 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0xa8f8, 0xa8fa}
   ,
+  {0xa8fc, 0xa8fc}
+  ,
   {0xa92e, 0xa92f}
   ,
   {0xa95f, 0xa95f}
@@ -6730,6 +7406,8 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x103d0, 0x103d0}
   ,
+  {0x1056f, 0x1056f}
+  ,
   {0x10857, 0x10857}
   ,
   {0x1091f, 0x1091f}
@@ -6740,8 +7418,12 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x10a7f, 0x10a7f}
   ,
+  {0x10af0, 0x10af6}
+  ,
   {0x10b39, 0x10b3f}
   ,
+  {0x10b99, 0x10b9c}
+  ,
   {0x11047, 0x1104d}
   ,
   {0x110bb, 0x110bc}
@@ -6750,13 +7432,45 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x11140, 0x11143}
   ,
-  {0x111c5, 0x111c8}
+  {0x11174, 0x11175}
   ,
-  {0x12470, 0x12473}
+  {0x111c5, 0x111c9}
+  ,
+  {0x111cd, 0x111cd}
+  ,
+  {0x111db, 0x111db}
+  ,
+  {0x111dd, 0x111df}
+  ,
+  {0x11238, 0x1123d}
+  ,
+  {0x112a9, 0x112a9}
+  ,
+  {0x114c6, 0x114c6}
+  ,
+  {0x115c1, 0x115d7}
+  ,
+  {0x11641, 0x11643}
+  ,
+  {0x1173c, 0x1173e}
+  ,
+  {0x12470, 0x12474}
+  ,
+  {0x16a6e, 0x16a6f}
+  ,
+  {0x16af5, 0x16af5}
+  ,
+  {0x16b37, 0x16b3b}
+  ,
+  {0x16b44, 0x16b44}
+  ,
+  {0x1bc9f, 0x1bc9f}
+  ,
+  {0x1da87, 0x1da8b}
 };
 
 scm_t_char_set cs_punctuation = {
-  140,
+  161,
   cs_punctuation_ranges
 };
 
@@ -6809,7 +7523,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x0482, 0x0482}
   ,
-  {0x058f, 0x058f}
+  {0x058d, 0x058f}
   ,
   {0x0606, 0x0608}
   ,
@@ -6897,7 +7611,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x208a, 0x208c}
   ,
-  {0x20a0, 0x20ba}
+  {0x20a0, 0x20be}
   ,
   {0x2100, 0x2101}
   ,
@@ -6927,9 +7641,13 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x214f, 0x214f}
   ,
-  {0x2190, 0x2328}
+  {0x218a, 0x218b}
   ,
-  {0x232b, 0x23f3}
+  {0x2190, 0x2307}
+  ,
+  {0x230c, 0x2328}
+  ,
+  {0x232b, 0x23fa}
   ,
   {0x2400, 0x2426}
   ,
@@ -6937,9 +7655,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x249c, 0x24e9}
   ,
-  {0x2500, 0x26ff}
-  ,
-  {0x2701, 0x2767}
+  {0x2500, 0x2767}
   ,
   {0x2794, 0x27c4}
   ,
@@ -6951,9 +7667,17 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x29dc, 0x29fb}
   ,
-  {0x29fe, 0x2b4c}
+  {0x29fe, 0x2b73}
   ,
-  {0x2b50, 0x2b59}
+  {0x2b76, 0x2b95}
+  ,
+  {0x2b98, 0x2bb9}
+  ,
+  {0x2bbd, 0x2bc8}
+  ,
+  {0x2bca, 0x2bd1}
+  ,
+  {0x2bec, 0x2bef}
   ,
   {0x2ce5, 0x2cea}
   ,
@@ -7013,6 +7737,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0xaa77, 0xaa79}
   ,
+  {0xab5b, 0xab5b}
+  ,
   {0xfb29, 0xfb29}
   ,
   {0xfbb2, 0xfbc1}
@@ -7049,10 +7775,26 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x10179, 0x10189}
   ,
+  {0x1018c, 0x1018c}
+  ,
   {0x10190, 0x1019b}
   ,
+  {0x101a0, 0x101a0}
+  ,
   {0x101d0, 0x101fc}
   ,
+  {0x10877, 0x10878}
+  ,
+  {0x10ac8, 0x10ac8}
+  ,
+  {0x1173f, 0x1173f}
+  ,
+  {0x16b3c, 0x16b3f}
+  ,
+  {0x16b45, 0x16b45}
+  ,
+  {0x1bc9c, 0x1bc9c}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
@@ -7065,7 +7807,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1d18c, 0x1d1a9}
   ,
-  {0x1d1ae, 0x1d1dd}
+  {0x1d1ae, 0x1d1e8}
   ,
   {0x1d200, 0x1d241}
   ,
@@ -7093,6 +7835,16 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1d7c3, 0x1d7c3}
   ,
+  {0x1d800, 0x1d9ff}
+  ,
+  {0x1da37, 0x1da3a}
+  ,
+  {0x1da6d, 0x1da74}
+  ,
+  {0x1da76, 0x1da83}
+  ,
+  {0x1da85, 0x1da86}
+  ,
   {0x1eef0, 0x1eef1}
   ,
   {0x1f000, 0x1f02b}
@@ -7101,11 +7853,11 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1f0a0, 0x1f0ae}
   ,
-  {0x1f0b1, 0x1f0be}
+  {0x1f0b1, 0x1f0bf}
   ,
   {0x1f0c1, 0x1f0cf}
   ,
-  {0x1f0d1, 0x1f0df}
+  {0x1f0d1, 0x1f0f5}
   ,
   {0x1f110, 0x1f12e}
   ,
@@ -7121,45 +7873,39 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f320}
+  {0x1f300, 0x1f579}
   ,
-  {0x1f330, 0x1f335}
+  {0x1f57b, 0x1f5a3}
   ,
-  {0x1f337, 0x1f37c}
+  {0x1f5a5, 0x1f6d0}
   ,
-  {0x1f380, 0x1f393}
+  {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f3a0, 0x1f3c4}
-  ,
-  {0x1f3c6, 0x1f3ca}
-  ,
-  {0x1f3e0, 0x1f3f0}
-  ,
-  {0x1f400, 0x1f43e}
-  ,
-  {0x1f440, 0x1f440}
-  ,
-  {0x1f442, 0x1f4f7}
-  ,
-  {0x1f4f9, 0x1f4fc}
-  ,
-  {0x1f500, 0x1f53d}
-  ,
-  {0x1f540, 0x1f543}
-  ,
-  {0x1f550, 0x1f567}
-  ,
-  {0x1f5fb, 0x1f640}
-  ,
-  {0x1f645, 0x1f64f}
-  ,
-  {0x1f680, 0x1f6c5}
+  {0x1f6f0, 0x1f6f3}
   ,
   {0x1f700, 0x1f773}
+  ,
+  {0x1f780, 0x1f7d4}
+  ,
+  {0x1f800, 0x1f80b}
+  ,
+  {0x1f810, 0x1f847}
+  ,
+  {0x1f850, 0x1f859}
+  ,
+  {0x1f860, 0x1f887}
+  ,
+  {0x1f890, 0x1f8ad}
+  ,
+  {0x1f910, 0x1f918}
+  ,
+  {0x1f980, 0x1f984}
+  ,
+  {0x1f9c0, 0x1f9c0}
 };
 
 scm_t_char_set cs_symbol = {
-  198,
+  214,
   cs_symbol_ranges
 };
 
@@ -7172,8 +7918,6 @@ scm_t_char_range cs_blank_ranges[] = {
   ,
   {0x1680, 0x1680}
   ,
-  {0x180e, 0x180e}
-  ,
   {0x2000, 0x200a}
   ,
   {0x202f, 0x202f}
@@ -7184,7 +7928,7 @@ scm_t_char_range cs_blank_ranges[] = {
 };
 
 scm_t_char_set cs_blank = {
-  9,
+  8,
   cs_blank_ranges
 };
 
@@ -7208,7 +7952,7 @@ scm_t_char_set cs_empty = {
 scm_t_char_range cs_designated_ranges[] = {
   {0x0000, 0x0377}
   ,
-  {0x037a, 0x037e}
+  {0x037a, 0x037f}
   ,
   {0x0384, 0x038a}
   ,
@@ -7216,7 +7960,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0527}
+  {0x03a3, 0x052f}
   ,
   {0x0531, 0x0556}
   ,
@@ -7226,7 +7970,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0589, 0x058a}
   ,
-  {0x058f, 0x058f}
+  {0x058d, 0x058f}
   ,
   {0x0591, 0x05c7}
   ,
@@ -7234,9 +7978,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x05f0, 0x05f4}
   ,
-  {0x0600, 0x0604}
-  ,
-  {0x0606, 0x061b}
+  {0x0600, 0x061c}
   ,
   {0x061e, 0x070d}
   ,
@@ -7254,17 +7996,9 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
-  {0x08a0, 0x08a0}
+  {0x08a0, 0x08b4}
   ,
-  {0x08a2, 0x08ac}
-  ,
-  {0x08e4, 0x08fe}
-  ,
-  {0x0900, 0x0977}
-  ,
-  {0x0979, 0x097f}
-  ,
-  {0x0981, 0x0983}
+  {0x08e3, 0x0983}
   ,
   {0x0985, 0x098c}
   ,
@@ -7350,6 +8084,8 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
+  {0x0af9, 0x0af9}
+  ,
   {0x0b01, 0x0b03}
   ,
   {0x0b05, 0x0b0c}
@@ -7410,7 +8146,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c01, 0x0c03}
+  {0x0c00, 0x0c03}
   ,
   {0x0c05, 0x0c0c}
   ,
@@ -7418,9 +8154,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0c12, 0x0c28}
   ,
-  {0x0c2a, 0x0c33}
-  ,
-  {0x0c35, 0x0c39}
+  {0x0c2a, 0x0c39}
   ,
   {0x0c3d, 0x0c44}
   ,
@@ -7430,7 +8164,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0c55, 0x0c56}
   ,
-  {0x0c58, 0x0c59}
+  {0x0c58, 0x0c5a}
   ,
   {0x0c60, 0x0c63}
   ,
@@ -7438,7 +8172,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0c78, 0x0c7f}
   ,
-  {0x0c82, 0x0c83}
+  {0x0c81, 0x0c83}
   ,
   {0x0c85, 0x0c8c}
   ,
@@ -7466,7 +8200,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d02, 0x0d03}
+  {0x0d01, 0x0d03}
   ,
   {0x0d05, 0x0d0c}
   ,
@@ -7482,7 +8216,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0d57, 0x0d57}
   ,
-  {0x0d60, 0x0d63}
+  {0x0d5f, 0x0d63}
   ,
   {0x0d66, 0x0d75}
   ,
@@ -7508,6 +8242,8 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0dd8, 0x0ddf}
   ,
+  {0x0de6, 0x0def}
+  ,
   {0x0df2, 0x0df4}
   ,
   {0x0e01, 0x0e3a}
@@ -7604,11 +8340,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1380, 0x1399}
   ,
-  {0x13a0, 0x13f4}
+  {0x13a0, 0x13f5}
+  ,
+  {0x13f8, 0x13fd}
   ,
   {0x1400, 0x169c}
   ,
-  {0x16a0, 0x16f0}
+  {0x16a0, 0x16f8}
   ,
   {0x1700, 0x170c}
   ,
@@ -7640,7 +8378,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x18b0, 0x18f5}
   ,
-  {0x1900, 0x191c}
+  {0x1900, 0x191e}
   ,
   {0x1920, 0x192b}
   ,
@@ -7670,6 +8408,8 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
+  {0x1ab0, 0x1abe}
+  ,
   {0x1b00, 0x1b4b}
   ,
   {0x1b50, 0x1b7c}
@@ -7686,7 +8426,9 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1cd0, 0x1cf6}
   ,
-  {0x1d00, 0x1de6}
+  {0x1cf8, 0x1cf9}
+  ,
+  {0x1d00, 0x1df5}
   ,
   {0x1dfc, 0x1f15}
   ,
@@ -7722,29 +8464,35 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2000, 0x2064}
   ,
-  {0x206a, 0x2071}
+  {0x2066, 0x2071}
   ,
   {0x2074, 0x208e}
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20ba}
+  {0x20a0, 0x20be}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x2189}
+  {0x2100, 0x218b}
   ,
-  {0x2190, 0x23f3}
+  {0x2190, 0x23fa}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x26ff}
+  {0x2460, 0x2b73}
   ,
-  {0x2701, 0x2b4c}
+  {0x2b76, 0x2b95}
   ,
-  {0x2b50, 0x2b59}
+  {0x2b98, 0x2bb9}
+  ,
+  {0x2bbd, 0x2bc8}
+  ,
+  {0x2bca, 0x2bd1}
+  ,
+  {0x2bec, 0x2bef}
   ,
   {0x2c00, 0x2c2e}
   ,
@@ -7780,7 +8528,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e3b}
+  {0x2de0, 0x2e42}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -7810,7 +8558,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fcc}
+  {0x4dc0, 0x9fd5}
   ,
   {0xa000, 0xa48c}
   ,
@@ -7818,17 +8566,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xa4d0, 0xa62b}
   ,
-  {0xa640, 0xa697}
+  {0xa640, 0xa6f7}
   ,
-  {0xa69f, 0xa6f7}
+  {0xa700, 0xa7ad}
   ,
-  {0xa700, 0xa78e}
+  {0xa7b0, 0xa7b7}
   ,
-  {0xa790, 0xa793}
-  ,
-  {0xa7a0, 0xa7aa}
-  ,
-  {0xa7f8, 0xa82b}
+  {0xa7f7, 0xa82b}
   ,
   {0xa830, 0xa839}
   ,
@@ -7838,7 +8582,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fb}
+  {0xa8e0, 0xa8fd}
   ,
   {0xa900, 0xa953}
   ,
@@ -7848,7 +8592,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xa9cf, 0xa9d9}
   ,
-  {0xa9de, 0xa9df}
+  {0xa9de, 0xa9fe}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -7856,9 +8600,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa7b}
-  ,
-  {0xaa80, 0xaac2}
+  {0xaa5c, 0xaac2}
   ,
   {0xaadb, 0xaaf6}
   ,
@@ -7872,7 +8614,9 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xabc0, 0xabed}
+  {0xab30, 0xab65}
+  ,
+  {0xab70, 0xabed}
   ,
   {0xabf0, 0xabf9}
   ,
@@ -7912,9 +8656,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xfe00, 0xfe19}
   ,
-  {0xfe20, 0xfe26}
-  ,
-  {0xfe30, 0xfe52}
+  {0xfe20, 0xfe52}
   ,
   {0xfe54, 0xfe66}
   ,
@@ -7960,22 +8702,26 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018a}
+  {0x10137, 0x1018c}
   ,
   {0x10190, 0x1019b}
   ,
+  {0x101a0, 0x101a0}
+  ,
   {0x101d0, 0x101fd}
   ,
   {0x10280, 0x1029c}
   ,
   {0x102a0, 0x102d0}
   ,
-  {0x10300, 0x1031e}
+  {0x102e0, 0x102fb}
   ,
-  {0x10320, 0x10323}
+  {0x10300, 0x10323}
   ,
   {0x10330, 0x1034a}
   ,
+  {0x10350, 0x1037a}
+  ,
   {0x10380, 0x1039d}
   ,
   {0x1039f, 0x103c3}
@@ -7986,6 +8732,18 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x10500, 0x10527}
+  ,
+  {0x10530, 0x10563}
+  ,
+  {0x1056f, 0x1056f}
+  ,
+  {0x10600, 0x10736}
+  ,
+  {0x10740, 0x10755}
+  ,
+  {0x10760, 0x10767}
+  ,
   {0x10800, 0x10805}
   ,
   {0x10808, 0x10808}
@@ -7998,9 +8756,15 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1083f, 0x10855}
   ,
-  {0x10857, 0x1085f}
+  {0x10857, 0x1089e}
   ,
-  {0x10900, 0x1091b}
+  {0x108a7, 0x108af}
+  ,
+  {0x108e0, 0x108f2}
+  ,
+  {0x108f4, 0x108f5}
+  ,
+  {0x108fb, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -8008,9 +8772,9 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10980, 0x109b7}
   ,
-  {0x109be, 0x109bf}
+  {0x109bc, 0x109cf}
   ,
-  {0x10a00, 0x10a03}
+  {0x109d2, 0x10a03}
   ,
   {0x10a05, 0x10a06}
   ,
@@ -8026,7 +8790,11 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
-  {0x10a60, 0x10a7f}
+  {0x10a60, 0x10a9f}
+  ,
+  {0x10ac0, 0x10ae6}
+  ,
+  {0x10aeb, 0x10af6}
   ,
   {0x10b00, 0x10b35}
   ,
@@ -8034,17 +8802,27 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10b58, 0x10b72}
   ,
-  {0x10b78, 0x10b7f}
+  {0x10b78, 0x10b91}
+  ,
+  {0x10b99, 0x10b9c}
+  ,
+  {0x10ba9, 0x10baf}
   ,
   {0x10c00, 0x10c48}
   ,
+  {0x10c80, 0x10cb2}
+  ,
+  {0x10cc0, 0x10cf2}
+  ,
+  {0x10cfa, 0x10cff}
+  ,
   {0x10e60, 0x10e7e}
   ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
   ,
-  {0x11080, 0x110c1}
+  {0x1107f, 0x110c1}
   ,
   {0x110d0, 0x110e8}
   ,
@@ -8054,24 +8832,124 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x11136, 0x11143}
   ,
-  {0x11180, 0x111c8}
+  {0x11150, 0x11176}
   ,
-  {0x111d0, 0x111d9}
+  {0x11180, 0x111cd}
+  ,
+  {0x111d0, 0x111df}
+  ,
+  {0x111e1, 0x111f4}
+  ,
+  {0x11200, 0x11211}
+  ,
+  {0x11213, 0x1123d}
+  ,
+  {0x11280, 0x11286}
+  ,
+  {0x11288, 0x11288}
+  ,
+  {0x1128a, 0x1128d}
+  ,
+  {0x1128f, 0x1129d}
+  ,
+  {0x1129f, 0x112a9}
+  ,
+  {0x112b0, 0x112ea}
+  ,
+  {0x112f0, 0x112f9}
+  ,
+  {0x11300, 0x11303}
+  ,
+  {0x11305, 0x1130c}
+  ,
+  {0x1130f, 0x11310}
+  ,
+  {0x11313, 0x11328}
+  ,
+  {0x1132a, 0x11330}
+  ,
+  {0x11332, 0x11333}
+  ,
+  {0x11335, 0x11339}
+  ,
+  {0x1133c, 0x11344}
+  ,
+  {0x11347, 0x11348}
+  ,
+  {0x1134b, 0x1134d}
+  ,
+  {0x11350, 0x11350}
+  ,
+  {0x11357, 0x11357}
+  ,
+  {0x1135d, 0x11363}
+  ,
+  {0x11366, 0x1136c}
+  ,
+  {0x11370, 0x11374}
+  ,
+  {0x11480, 0x114c7}
+  ,
+  {0x114d0, 0x114d9}
+  ,
+  {0x11580, 0x115b5}
+  ,
+  {0x115b8, 0x115dd}
+  ,
+  {0x11600, 0x11644}
+  ,
+  {0x11650, 0x11659}
   ,
   {0x11680, 0x116b7}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x12000, 0x1236e}
+  {0x11700, 0x11719}
   ,
-  {0x12400, 0x12462}
+  {0x1171d, 0x1172b}
   ,
-  {0x12470, 0x12473}
+  {0x11730, 0x1173f}
+  ,
+  {0x118a0, 0x118f2}
+  ,
+  {0x118ff, 0x118ff}
+  ,
+  {0x11ac0, 0x11af8}
+  ,
+  {0x12000, 0x12399}
+  ,
+  {0x12400, 0x1246e}
+  ,
+  {0x12470, 0x12474}
+  ,
+  {0x12480, 0x12543}
   ,
   {0x13000, 0x1342e}
   ,
+  {0x14400, 0x14646}
+  ,
   {0x16800, 0x16a38}
   ,
+  {0x16a40, 0x16a5e}
+  ,
+  {0x16a60, 0x16a69}
+  ,
+  {0x16a6e, 0x16a6f}
+  ,
+  {0x16ad0, 0x16aed}
+  ,
+  {0x16af0, 0x16af5}
+  ,
+  {0x16b00, 0x16b45}
+  ,
+  {0x16b50, 0x16b59}
+  ,
+  {0x16b5b, 0x16b61}
+  ,
+  {0x16b63, 0x16b77}
+  ,
+  {0x16b7d, 0x16b8f}
+  ,
   {0x16f00, 0x16f44}
   ,
   {0x16f50, 0x16f7e}
@@ -8080,11 +8958,21 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1b000, 0x1b001}
   ,
+  {0x1bc00, 0x1bc6a}
+  ,
+  {0x1bc70, 0x1bc7c}
+  ,
+  {0x1bc80, 0x1bc88}
+  ,
+  {0x1bc90, 0x1bc99}
+  ,
+  {0x1bc9c, 0x1bca3}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
   ,
-  {0x1d129, 0x1d1dd}
+  {0x1d129, 0x1d1e8}
   ,
   {0x1d200, 0x1d245}
   ,
@@ -8132,7 +9020,15 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1d6a8, 0x1d7cb}
   ,
-  {0x1d7ce, 0x1d7ff}
+  {0x1d7ce, 0x1da8b}
+  ,
+  {0x1da9b, 0x1da9f}
+  ,
+  {0x1daa1, 0x1daaf}
+  ,
+  {0x1e800, 0x1e8c4}
+  ,
+  {0x1e8c7, 0x1e8d6}
   ,
   {0x1ee00, 0x1ee03}
   ,
@@ -8208,13 +9104,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1f0a0, 0x1f0ae}
   ,
-  {0x1f0b1, 0x1f0be}
+  {0x1f0b1, 0x1f0bf}
   ,
   {0x1f0c1, 0x1f0cf}
   ,
-  {0x1f0d1, 0x1f0df}
+  {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10a}
+  {0x1f100, 0x1f10c}
   ,
   {0x1f110, 0x1f12e}
   ,
@@ -8230,48 +9126,44 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f320}
+  {0x1f300, 0x1f579}
   ,
-  {0x1f330, 0x1f335}
+  {0x1f57b, 0x1f5a3}
   ,
-  {0x1f337, 0x1f37c}
+  {0x1f5a5, 0x1f6d0}
   ,
-  {0x1f380, 0x1f393}
+  {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f3a0, 0x1f3c4}
-  ,
-  {0x1f3c6, 0x1f3ca}
-  ,
-  {0x1f3e0, 0x1f3f0}
-  ,
-  {0x1f400, 0x1f43e}
-  ,
-  {0x1f440, 0x1f440}
-  ,
-  {0x1f442, 0x1f4f7}
-  ,
-  {0x1f4f9, 0x1f4fc}
-  ,
-  {0x1f500, 0x1f53d}
-  ,
-  {0x1f540, 0x1f543}
-  ,
-  {0x1f550, 0x1f567}
-  ,
-  {0x1f5fb, 0x1f640}
-  ,
-  {0x1f645, 0x1f64f}
-  ,
-  {0x1f680, 0x1f6c5}
+  {0x1f6f0, 0x1f6f3}
   ,
   {0x1f700, 0x1f773}
   ,
+  {0x1f780, 0x1f7d4}
+  ,
+  {0x1f800, 0x1f80b}
+  ,
+  {0x1f810, 0x1f847}
+  ,
+  {0x1f850, 0x1f859}
+  ,
+  {0x1f860, 0x1f887}
+  ,
+  {0x1f890, 0x1f8ad}
+  ,
+  {0x1f910, 0x1f918}
+  ,
+  {0x1f980, 0x1f984}
+  ,
+  {0x1f9c0, 0x1f9c0}
+  ,
   {0x20000, 0x2a6d6}
   ,
   {0x2a700, 0x2b734}
   ,
   {0x2b740, 0x2b81d}
   ,
+  {0x2b820, 0x2cea1}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0001, 0xe0001}
@@ -8286,6 +9178,6 @@ scm_t_char_range cs_designated_ranges[] = {
 };
 
 scm_t_char_set cs_designated = {
-  539,
+  613,
   cs_designated_ranges
 };