From 187bfdc3e13e6af6fb887f2786d57b81a5b38822 Mon Sep 17 00:00:00 2001
From: Mike Gran <spk121@yahoo.com>
Date: Thu, 26 Mar 2020 07:14:14 -0700
Subject: [PATCH] Update SRFI-14 tables to Unicode 13.0.0

* libguile/srfi-14.i.c (cs_lower_case_ranges, cs_upper_case_ranges)
  (cs_letter_ranges, cs_digit_ranges, cs_letter_plus_digit_ranges)
  (cs_graphic_ranges, cs_printing_ranges, cs_punctuation_ranges)
  (cs_symbol_ranges, cs_designated_ranges): updated to Unicode 13
---
 libguile/srfi-14.i.c | 1838 ++++++++++++++++++++++++++++++------------
 1 file changed, 1333 insertions(+), 505 deletions(-)

diff --git a/libguile/srfi-14.i.c b/libguile/srfi-14.i.c
index 0b08742d2..6e5aec899 100644
--- a/libguile/srfi-14.i.c
+++ b/libguile/srfi-14.i.c
@@ -299,9 +299,7 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x024f, 0x0261}
   ,
-  {0x0263, 0x0269}
-  ,
-  {0x026b, 0x0273}
+  {0x0263, 0x0273}
   ,
   {0x0275, 0x0275}
   ,
@@ -571,12 +569,20 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x052f, 0x052f}
   ,
-  {0x0561, 0x0587}
+  {0x0560, 0x0588}
+  ,
+  {0x10d0, 0x10fa}
+  ,
+  {0x10fd, 0x10ff}
   ,
   {0x13f8, 0x13fd}
   ,
   {0x1930, 0x1938}
   ,
+  {0x1abf, 0x1ac0}
+  ,
+  {0x1c80, 0x1c88}
+  ,
   {0x1d02, 0x1d02}
   ,
   {0x1d08, 0x1d09}
@@ -1093,6 +1099,22 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0xa7b7, 0xa7b7}
   ,
+  {0xa7b9, 0xa7b9}
+  ,
+  {0xa7bb, 0xa7bb}
+  ,
+  {0xa7bd, 0xa7bd}
+  ,
+  {0xa7bf, 0xa7bf}
+  ,
+  {0xa7c3, 0xa7c3}
+  ,
+  {0xa7c8, 0xa7c8}
+  ,
+  {0xa7ca, 0xa7ca}
+  ,
+  {0xa7f6, 0xa7f6}
+  ,
   {0xa7f9, 0xa7f9}
   ,
   {0xab30, 0xab45}
@@ -1101,6 +1123,8 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0xab60, 0xab64}
   ,
+  {0xab66, 0xab68}
+  ,
   {0xab70, 0xabbf}
   ,
   {0xfb00, 0xfb06}
@@ -1111,17 +1135,25 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x10428, 0x1044f}
   ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10cc0, 0x10cf2}
   ,
   {0x118c0, 0x118df}
   ,
+  {0x16e60, 0x16e7f}
+  ,
+  {0x1e922, 0x1e943}
+  ,
+  {0x1f1a5, 0x1f1a5}
+  ,
   {0x1f521, 0x1f521}
   ,
   {0xe0061, 0xe007a}
 };
 
 scm_t_char_set cs_lower_case = {
-  556,
+  572,
   cs_lower_case_ranges
 };
 
@@ -1676,6 +1708,10 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x13a0, 0x13f5}
   ,
+  {0x1c90, 0x1cba}
+  ,
+  {0x1cbd, 0x1cbf}
+  ,
   {0x1d7b, 0x1d7b}
   ,
   {0x1d7e, 0x1d7e}
@@ -2156,20 +2192,42 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0xa7a8, 0xa7a8}
   ,
-  {0xa7aa, 0xa7ad}
+  {0xa7aa, 0xa7ae}
   ,
   {0xa7b0, 0xa7b4}
   ,
   {0xa7b6, 0xa7b6}
   ,
+  {0xa7b8, 0xa7b8}
+  ,
+  {0xa7ba, 0xa7ba}
+  ,
+  {0xa7bc, 0xa7bc}
+  ,
+  {0xa7be, 0xa7be}
+  ,
+  {0xa7c2, 0xa7c2}
+  ,
+  {0xa7c4, 0xa7c7}
+  ,
+  {0xa7c9, 0xa7c9}
+  ,
+  {0xa7f5, 0xa7f5}
+  ,
   {0xff21, 0xff3a}
   ,
   {0x10400, 0x10427}
   ,
+  {0x104b0, 0x104d3}
+  ,
   {0x10c80, 0x10cb2}
   ,
   {0x118a0, 0x118bf}
   ,
+  {0x16e40, 0x16e5f}
+  ,
+  {0x1e900, 0x1e921}
+  ,
   {0x1f110, 0x1f12c}
   ,
   {0x1f130, 0x1f149}
@@ -2184,7 +2242,7 @@ scm_t_char_range cs_upper_case_ranges[] = {
 };
 
 scm_t_char_set cs_upper_case = {
-  528,
+  541,
   cs_upper_case_ranges
 };
 
@@ -2266,11 +2324,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0559, 0x0559}
   ,
-  {0x0561, 0x0587}
+  {0x0560, 0x0588}
   ,
   {0x05d0, 0x05ea}
   ,
-  {0x05f0, 0x05f2}
+  {0x05ef, 0x05f2}
   ,
   {0x0620, 0x064a}
   ,
@@ -2312,8 +2370,12 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0840, 0x0858}
   ,
+  {0x0860, 0x086a}
+  ,
   {0x08a0, 0x08b4}
   ,
+  {0x08b6, 0x08c7}
+  ,
   {0x0904, 0x0939}
   ,
   {0x093d, 0x093d}
@@ -2346,6 +2408,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x09f0, 0x09f1}
   ,
+  {0x09fc, 0x09fc}
+  ,
   {0x0a05, 0x0a0a}
   ,
   {0x0a0f, 0x0a10}
@@ -2442,6 +2506,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0c60, 0x0c61}
   ,
+  {0x0c80, 0x0c80}
+  ,
   {0x0c85, 0x0c8c}
   ,
   {0x0c8e, 0x0c90}
@@ -2460,7 +2526,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d05, 0x0d0c}
+  {0x0d04, 0x0d0c}
   ,
   {0x0d0e, 0x0d10}
   ,
@@ -2470,6 +2536,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0d4e, 0x0d4e}
   ,
+  {0x0d54, 0x0d56}
+  ,
   {0x0d5f, 0x0d61}
   ,
   {0x0d7a, 0x0d7f}
@@ -2494,25 +2562,13 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0e84, 0x0e84}
   ,
-  {0x0e87, 0x0e88}
+  {0x0e86, 0x0e8a}
   ,
-  {0x0e8a, 0x0e8a}
-  ,
-  {0x0e8d, 0x0e8d}
-  ,
-  {0x0e94, 0x0e97}
-  ,
-  {0x0e99, 0x0e9f}
-  ,
-  {0x0ea1, 0x0ea3}
+  {0x0e8c, 0x0ea3}
   ,
   {0x0ea5, 0x0ea5}
   ,
-  {0x0ea7, 0x0ea7}
-  ,
-  {0x0eaa, 0x0eab}
-  ,
-  {0x0ead, 0x0eb0}
+  {0x0ea7, 0x0eb0}
   ,
   {0x0eb2, 0x0eb3}
   ,
@@ -2624,9 +2680,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x17dc, 0x17dc}
   ,
-  {0x1820, 0x1877}
+  {0x1820, 0x1878}
   ,
-  {0x1880, 0x18a8}
+  {0x1880, 0x1884}
+  ,
+  {0x1887, 0x18a8}
   ,
   {0x18aa, 0x18aa}
   ,
@@ -2664,12 +2722,20 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1c5a, 0x1c7d}
   ,
+  {0x1c80, 0x1c88}
+  ,
+  {0x1c90, 0x1cba}
+  ,
+  {0x1cbd, 0x1cbf}
+  ,
   {0x1ce9, 0x1cec}
   ,
-  {0x1cee, 0x1cf1}
+  {0x1cee, 0x1cf3}
   ,
   {0x1cf5, 0x1cf6}
   ,
+  {0x1cfa, 0x1cfa}
+  ,
   {0x1d00, 0x1dbf}
   ,
   {0x1e00, 0x1f15}
@@ -2798,17 +2864,17 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x30fc, 0x30ff}
   ,
-  {0x3105, 0x312d}
+  {0x3105, 0x312f}
   ,
   {0x3131, 0x318e}
   ,
-  {0x31a0, 0x31ba}
+  {0x31a0, 0x31bf}
   ,
   {0x31f0, 0x31ff}
   ,
-  {0x3400, 0x4db5}
+  {0x3400, 0x4dbf}
   ,
-  {0x4e00, 0x9fd5}
+  {0x4e00, 0x9ffc}
   ,
   {0xa000, 0xa48c}
   ,
@@ -2830,11 +2896,11 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa722, 0xa788}
   ,
-  {0xa78b, 0xa7ad}
+  {0xa78b, 0xa7bf}
   ,
-  {0xa7b0, 0xa7b7}
+  {0xa7c2, 0xa7ca}
   ,
-  {0xa7f7, 0xa801}
+  {0xa7f5, 0xa801}
   ,
   {0xa803, 0xa805}
   ,
@@ -2850,7 +2916,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa8fb, 0xa8fb}
   ,
-  {0xa8fd, 0xa8fd}
+  {0xa8fd, 0xa8fe}
   ,
   {0xa90a, 0xa925}
   ,
@@ -2908,7 +2974,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xab30, 0xab5a}
   ,
-  {0xab5c, 0xab65}
+  {0xab5c, 0xab69}
   ,
   {0xab70, 0xabe2}
   ,
@@ -2988,7 +3054,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10300, 0x1031f}
   ,
-  {0x10330, 0x10340}
+  {0x1032d, 0x10340}
   ,
   {0x10342, 0x10349}
   ,
@@ -3002,6 +3068,10 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10400, 0x1049d}
   ,
+  {0x104b0, 0x104d3}
+  ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10500, 0x10527}
   ,
   {0x10530, 0x10563}
@@ -3046,7 +3116,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10a15, 0x10a17}
   ,
-  {0x10a19, 0x10a33}
+  {0x10a19, 0x10a35}
   ,
   {0x10a60, 0x10a7c}
   ,
@@ -3070,6 +3140,22 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10cc0, 0x10cf2}
   ,
+  {0x10d00, 0x10d23}
+  ,
+  {0x10e80, 0x10ea9}
+  ,
+  {0x10eb0, 0x10eb1}
+  ,
+  {0x10f00, 0x10f1c}
+  ,
+  {0x10f27, 0x10f27}
+  ,
+  {0x10f30, 0x10f45}
+  ,
+  {0x10fb0, 0x10fc4}
+  ,
+  {0x10fe0, 0x10ff6}
+  ,
   {0x11003, 0x11037}
   ,
   {0x11083, 0x110af}
@@ -3078,6 +3164,10 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x11103, 0x11126}
   ,
+  {0x11144, 0x11144}
+  ,
+  {0x11147, 0x11147}
+  ,
   {0x11150, 0x11172}
   ,
   {0x11176, 0x11176}
@@ -3124,6 +3214,12 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1135d, 0x11361}
   ,
+  {0x11400, 0x11434}
+  ,
+  {0x11447, 0x1144a}
+  ,
+  {0x1145f, 0x11461}
+  ,
   {0x11480, 0x114af}
   ,
   {0x114c4, 0x114c5}
@@ -3140,14 +3236,78 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x11680, 0x116aa}
   ,
-  {0x11700, 0x11719}
+  {0x116b8, 0x116b8}
+  ,
+  {0x11700, 0x1171a}
+  ,
+  {0x11800, 0x1182b}
   ,
   {0x118a0, 0x118df}
   ,
-  {0x118ff, 0x118ff}
+  {0x118ff, 0x11906}
+  ,
+  {0x11909, 0x11909}
+  ,
+  {0x1190c, 0x11913}
+  ,
+  {0x11915, 0x11916}
+  ,
+  {0x11918, 0x1192f}
+  ,
+  {0x1193f, 0x1193f}
+  ,
+  {0x11941, 0x11941}
+  ,
+  {0x119a0, 0x119a7}
+  ,
+  {0x119aa, 0x119d0}
+  ,
+  {0x119e1, 0x119e1}
+  ,
+  {0x119e3, 0x119e3}
+  ,
+  {0x11a00, 0x11a00}
+  ,
+  {0x11a0b, 0x11a32}
+  ,
+  {0x11a3a, 0x11a3a}
+  ,
+  {0x11a50, 0x11a50}
+  ,
+  {0x11a5c, 0x11a89}
+  ,
+  {0x11a9d, 0x11a9d}
   ,
   {0x11ac0, 0x11af8}
   ,
+  {0x11c00, 0x11c08}
+  ,
+  {0x11c0a, 0x11c2e}
+  ,
+  {0x11c40, 0x11c40}
+  ,
+  {0x11c72, 0x11c8f}
+  ,
+  {0x11d00, 0x11d06}
+  ,
+  {0x11d08, 0x11d09}
+  ,
+  {0x11d0b, 0x11d30}
+  ,
+  {0x11d46, 0x11d46}
+  ,
+  {0x11d60, 0x11d65}
+  ,
+  {0x11d67, 0x11d68}
+  ,
+  {0x11d6a, 0x11d89}
+  ,
+  {0x11d98, 0x11d98}
+  ,
+  {0x11ee0, 0x11ef2}
+  ,
+  {0x11fb0, 0x11fb0}
+  ,
   {0x12000, 0x12399}
   ,
   {0x12480, 0x12543}
@@ -3170,13 +3330,31 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x16b7d, 0x16b8f}
   ,
-  {0x16f00, 0x16f44}
+  {0x16e40, 0x16e7f}
+  ,
+  {0x16f00, 0x16f4a}
   ,
   {0x16f50, 0x16f50}
   ,
   {0x16f93, 0x16f9f}
   ,
-  {0x1b000, 0x1b001}
+  {0x16fe0, 0x16fe1}
+  ,
+  {0x16fe3, 0x16fe3}
+  ,
+  {0x17000, 0x187f7}
+  ,
+  {0x18800, 0x18cd5}
+  ,
+  {0x18d00, 0x18d08}
+  ,
+  {0x1b000, 0x1b11e}
+  ,
+  {0x1b150, 0x1b152}
+  ,
+  {0x1b164, 0x1b167}
+  ,
+  {0x1b170, 0x1b2fb}
   ,
   {0x1bc00, 0x1bc6a}
   ,
@@ -3246,8 +3424,20 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1d7c4, 0x1d7cb}
   ,
+  {0x1e100, 0x1e12c}
+  ,
+  {0x1e137, 0x1e13d}
+  ,
+  {0x1e14e, 0x1e14e}
+  ,
+  {0x1e2c0, 0x1e2eb}
+  ,
   {0x1e800, 0x1e8c4}
   ,
+  {0x1e900, 0x1e943}
+  ,
+  {0x1e94b, 0x1e94b}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -3314,7 +3504,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1eeab, 0x1eebb}
   ,
-  {0x20000, 0x2a6d6}
+  {0x20000, 0x2a6dd}
   ,
   {0x2a700, 0x2b734}
   ,
@@ -3322,11 +3512,15 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x2b820, 0x2cea1}
   ,
+  {0x2ceb0, 0x2ebe0}
+  ,
   {0x2f800, 0x2fa1d}
+  ,
+  {0x30000, 0x3134a}
 };
 
 scm_t_char_set cs_letter = {
-  554,
+  622,
   cs_letter_ranges
 };
 
@@ -3407,6 +3601,8 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x10d30, 0x10d39}
+  ,
   {0x11066, 0x1106f}
   ,
   {0x110f0, 0x110f9}
@@ -3417,6 +3613,8 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x112f0, 0x112f9}
   ,
+  {0x11450, 0x11459}
+  ,
   {0x114d0, 0x114d9}
   ,
   {0x11650, 0x11659}
@@ -3427,15 +3625,31 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x118e0, 0x118e9}
   ,
+  {0x11950, 0x11959}
+  ,
+  {0x11c50, 0x11c59}
+  ,
+  {0x11d50, 0x11d59}
+  ,
+  {0x11da0, 0x11da9}
+  ,
   {0x16a60, 0x16a69}
   ,
   {0x16b50, 0x16b59}
   ,
   {0x1d7ce, 0x1d7ff}
+  ,
+  {0x1e140, 0x1e149}
+  ,
+  {0x1e2f0, 0x1e2f9}
+  ,
+  {0x1e950, 0x1e959}
+  ,
+  {0x1fbf0, 0x1fbf9}
 };
 
 scm_t_char_set cs_digit = {
-  51,
+  61,
   cs_digit_ranges
 };
 
@@ -3505,11 +3719,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0559, 0x0559}
   ,
-  {0x0561, 0x0587}
+  {0x0560, 0x0588}
   ,
   {0x05d0, 0x05ea}
   ,
-  {0x05f0, 0x05f2}
+  {0x05ef, 0x05f2}
   ,
   {0x0620, 0x064a}
   ,
@@ -3551,8 +3765,12 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0840, 0x0858}
   ,
+  {0x0860, 0x086a}
+  ,
   {0x08a0, 0x08b4}
   ,
+  {0x08b6, 0x08c7}
+  ,
   {0x0904, 0x0939}
   ,
   {0x093d, 0x093d}
@@ -3587,6 +3805,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x09e6, 0x09f1}
   ,
+  {0x09fc, 0x09fc}
+  ,
   {0x0a05, 0x0a0a}
   ,
   {0x0a0f, 0x0a10}
@@ -3693,6 +3913,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0c66, 0x0c6f}
   ,
+  {0x0c80, 0x0c80}
+  ,
   {0x0c85, 0x0c8c}
   ,
   {0x0c8e, 0x0c90}
@@ -3713,7 +3935,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d05, 0x0d0c}
+  {0x0d04, 0x0d0c}
   ,
   {0x0d0e, 0x0d10}
   ,
@@ -3723,6 +3945,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0d4e, 0x0d4e}
   ,
+  {0x0d54, 0x0d56}
+  ,
   {0x0d5f, 0x0d61}
   ,
   {0x0d66, 0x0d6f}
@@ -3753,25 +3977,13 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0e84, 0x0e84}
   ,
-  {0x0e87, 0x0e88}
+  {0x0e86, 0x0e8a}
   ,
-  {0x0e8a, 0x0e8a}
-  ,
-  {0x0e8d, 0x0e8d}
-  ,
-  {0x0e94, 0x0e97}
-  ,
-  {0x0e99, 0x0e9f}
-  ,
-  {0x0ea1, 0x0ea3}
+  {0x0e8c, 0x0ea3}
   ,
   {0x0ea5, 0x0ea5}
   ,
-  {0x0ea7, 0x0ea7}
-  ,
-  {0x0eaa, 0x0eab}
-  ,
-  {0x0ead, 0x0eb0}
+  {0x0ea7, 0x0eb0}
   ,
   {0x0eb2, 0x0eb3}
   ,
@@ -3893,9 +4105,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1810, 0x1819}
   ,
-  {0x1820, 0x1877}
+  {0x1820, 0x1878}
   ,
-  {0x1880, 0x18a8}
+  {0x1880, 0x1884}
+  ,
+  {0x1887, 0x18a8}
   ,
   {0x18aa, 0x18aa}
   ,
@@ -3939,12 +4153,20 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1c4d, 0x1c7d}
   ,
+  {0x1c80, 0x1c88}
+  ,
+  {0x1c90, 0x1cba}
+  ,
+  {0x1cbd, 0x1cbf}
+  ,
   {0x1ce9, 0x1cec}
   ,
-  {0x1cee, 0x1cf1}
+  {0x1cee, 0x1cf3}
   ,
   {0x1cf5, 0x1cf6}
   ,
+  {0x1cfa, 0x1cfa}
+  ,
   {0x1d00, 0x1dbf}
   ,
   {0x1e00, 0x1f15}
@@ -4073,17 +4295,17 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x30fc, 0x30ff}
   ,
-  {0x3105, 0x312d}
+  {0x3105, 0x312f}
   ,
   {0x3131, 0x318e}
   ,
-  {0x31a0, 0x31ba}
+  {0x31a0, 0x31bf}
   ,
   {0x31f0, 0x31ff}
   ,
-  {0x3400, 0x4db5}
+  {0x3400, 0x4dbf}
   ,
-  {0x4e00, 0x9fd5}
+  {0x4e00, 0x9ffc}
   ,
   {0xa000, 0xa48c}
   ,
@@ -4103,11 +4325,11 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa722, 0xa788}
   ,
-  {0xa78b, 0xa7ad}
+  {0xa78b, 0xa7bf}
   ,
-  {0xa7b0, 0xa7b7}
+  {0xa7c2, 0xa7ca}
   ,
-  {0xa7f7, 0xa801}
+  {0xa7f5, 0xa801}
   ,
   {0xa803, 0xa805}
   ,
@@ -4125,7 +4347,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa8fb, 0xa8fb}
   ,
-  {0xa8fd, 0xa8fd}
+  {0xa8fd, 0xa8fe}
   ,
   {0xa900, 0xa925}
   ,
@@ -4183,7 +4405,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xab30, 0xab5a}
   ,
-  {0xab5c, 0xab65}
+  {0xab5c, 0xab69}
   ,
   {0xab70, 0xabe2}
   ,
@@ -4267,7 +4489,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10300, 0x1031f}
   ,
-  {0x10330, 0x10340}
+  {0x1032d, 0x10340}
   ,
   {0x10342, 0x10349}
   ,
@@ -4283,6 +4505,10 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x104b0, 0x104d3}
+  ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10500, 0x10527}
   ,
   {0x10530, 0x10563}
@@ -4327,7 +4553,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10a15, 0x10a17}
   ,
-  {0x10a19, 0x10a33}
+  {0x10a19, 0x10a35}
   ,
   {0x10a60, 0x10a7c}
   ,
@@ -4351,6 +4577,24 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10cc0, 0x10cf2}
   ,
+  {0x10d00, 0x10d23}
+  ,
+  {0x10d30, 0x10d39}
+  ,
+  {0x10e80, 0x10ea9}
+  ,
+  {0x10eb0, 0x10eb1}
+  ,
+  {0x10f00, 0x10f1c}
+  ,
+  {0x10f27, 0x10f27}
+  ,
+  {0x10f30, 0x10f45}
+  ,
+  {0x10fb0, 0x10fc4}
+  ,
+  {0x10fe0, 0x10ff6}
+  ,
   {0x11003, 0x11037}
   ,
   {0x11066, 0x1106f}
@@ -4365,6 +4609,10 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x11136, 0x1113f}
   ,
+  {0x11144, 0x11144}
+  ,
+  {0x11147, 0x11147}
+  ,
   {0x11150, 0x11172}
   ,
   {0x11176, 0x11176}
@@ -4413,6 +4661,14 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1135d, 0x11361}
   ,
+  {0x11400, 0x11434}
+  ,
+  {0x11447, 0x1144a}
+  ,
+  {0x11450, 0x11459}
+  ,
+  {0x1145f, 0x11461}
+  ,
   {0x11480, 0x114af}
   ,
   {0x114c4, 0x114c5}
@@ -4433,18 +4689,90 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x11680, 0x116aa}
   ,
+  {0x116b8, 0x116b8}
+  ,
   {0x116c0, 0x116c9}
   ,
-  {0x11700, 0x11719}
+  {0x11700, 0x1171a}
   ,
   {0x11730, 0x11739}
   ,
+  {0x11800, 0x1182b}
+  ,
   {0x118a0, 0x118e9}
   ,
-  {0x118ff, 0x118ff}
+  {0x118ff, 0x11906}
+  ,
+  {0x11909, 0x11909}
+  ,
+  {0x1190c, 0x11913}
+  ,
+  {0x11915, 0x11916}
+  ,
+  {0x11918, 0x1192f}
+  ,
+  {0x1193f, 0x1193f}
+  ,
+  {0x11941, 0x11941}
+  ,
+  {0x11950, 0x11959}
+  ,
+  {0x119a0, 0x119a7}
+  ,
+  {0x119aa, 0x119d0}
+  ,
+  {0x119e1, 0x119e1}
+  ,
+  {0x119e3, 0x119e3}
+  ,
+  {0x11a00, 0x11a00}
+  ,
+  {0x11a0b, 0x11a32}
+  ,
+  {0x11a3a, 0x11a3a}
+  ,
+  {0x11a50, 0x11a50}
+  ,
+  {0x11a5c, 0x11a89}
+  ,
+  {0x11a9d, 0x11a9d}
   ,
   {0x11ac0, 0x11af8}
   ,
+  {0x11c00, 0x11c08}
+  ,
+  {0x11c0a, 0x11c2e}
+  ,
+  {0x11c40, 0x11c40}
+  ,
+  {0x11c50, 0x11c59}
+  ,
+  {0x11c72, 0x11c8f}
+  ,
+  {0x11d00, 0x11d06}
+  ,
+  {0x11d08, 0x11d09}
+  ,
+  {0x11d0b, 0x11d30}
+  ,
+  {0x11d46, 0x11d46}
+  ,
+  {0x11d50, 0x11d59}
+  ,
+  {0x11d60, 0x11d65}
+  ,
+  {0x11d67, 0x11d68}
+  ,
+  {0x11d6a, 0x11d89}
+  ,
+  {0x11d98, 0x11d98}
+  ,
+  {0x11da0, 0x11da9}
+  ,
+  {0x11ee0, 0x11ef2}
+  ,
+  {0x11fb0, 0x11fb0}
+  ,
   {0x12000, 0x12399}
   ,
   {0x12480, 0x12543}
@@ -4471,13 +4799,31 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x16b7d, 0x16b8f}
   ,
-  {0x16f00, 0x16f44}
+  {0x16e40, 0x16e7f}
+  ,
+  {0x16f00, 0x16f4a}
   ,
   {0x16f50, 0x16f50}
   ,
   {0x16f93, 0x16f9f}
   ,
-  {0x1b000, 0x1b001}
+  {0x16fe0, 0x16fe1}
+  ,
+  {0x16fe3, 0x16fe3}
+  ,
+  {0x17000, 0x187f7}
+  ,
+  {0x18800, 0x18cd5}
+  ,
+  {0x18d00, 0x18d08}
+  ,
+  {0x1b000, 0x1b11e}
+  ,
+  {0x1b150, 0x1b152}
+  ,
+  {0x1b164, 0x1b167}
+  ,
+  {0x1b170, 0x1b2fb}
   ,
   {0x1bc00, 0x1bc6a}
   ,
@@ -4549,8 +4895,26 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1d7ce, 0x1d7ff}
   ,
+  {0x1e100, 0x1e12c}
+  ,
+  {0x1e137, 0x1e13d}
+  ,
+  {0x1e140, 0x1e149}
+  ,
+  {0x1e14e, 0x1e14e}
+  ,
+  {0x1e2c0, 0x1e2eb}
+  ,
+  {0x1e2f0, 0x1e2f9}
+  ,
   {0x1e800, 0x1e8c4}
   ,
+  {0x1e900, 0x1e943}
+  ,
+  {0x1e94b, 0x1e94b}
+  ,
+  {0x1e950, 0x1e959}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -4617,7 +4981,9 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1eeab, 0x1eebb}
   ,
-  {0x20000, 0x2a6d6}
+  {0x1fbf0, 0x1fbf9}
+  ,
+  {0x20000, 0x2a6dd}
   ,
   {0x2a700, 0x2b734}
   ,
@@ -4625,11 +4991,15 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x2b820, 0x2cea1}
   ,
+  {0x2ceb0, 0x2ebe0}
+  ,
   {0x2f800, 0x2fa1d}
+  ,
+  {0x30000, 0x3134a}
 };
 
 scm_t_char_set cs_letter_plus_digit = {
-  587,
+  665,
   cs_letter_plus_digit_ranges
 };
 
@@ -4652,11 +5022,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0531, 0x0556}
   ,
-  {0x0559, 0x055f}
-  ,
-  {0x0561, 0x0587}
-  ,
-  {0x0589, 0x058a}
+  {0x0559, 0x058a}
   ,
   {0x058d, 0x058f}
   ,
@@ -4664,7 +5030,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x05d0, 0x05ea}
   ,
-  {0x05f0, 0x05f4}
+  {0x05ef, 0x05f4}
   ,
   {0x0606, 0x061b}
   ,
@@ -4678,7 +5044,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0800, 0x082d}
+  {0x07fd, 0x082d}
   ,
   {0x0830, 0x083e}
   ,
@@ -4686,8 +5052,14 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
+  {0x0860, 0x086a}
+  ,
   {0x08a0, 0x08b4}
   ,
+  {0x08b6, 0x08c7}
+  ,
+  {0x08d3, 0x08e1}
+  ,
   {0x08e3, 0x0983}
   ,
   {0x0985, 0x098c}
@@ -4714,7 +5086,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fb}
+  {0x09e6, 0x09fe}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -4746,7 +5118,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0a5e, 0x0a5e}
   ,
-  {0x0a66, 0x0a75}
+  {0x0a66, 0x0a76}
   ,
   {0x0a81, 0x0a83}
   ,
@@ -4774,7 +5146,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
-  {0x0af9, 0x0af9}
+  {0x0af9, 0x0aff}
   ,
   {0x0b01, 0x0b03}
   ,
@@ -4796,7 +5168,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0b4b, 0x0b4d}
   ,
-  {0x0b56, 0x0b57}
+  {0x0b55, 0x0b57}
   ,
   {0x0b5c, 0x0b5d}
   ,
@@ -4836,9 +5208,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c00, 0x0c03}
-  ,
-  {0x0c05, 0x0c0c}
+  {0x0c00, 0x0c0c}
   ,
   {0x0c0e, 0x0c10}
   ,
@@ -4860,11 +5230,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0c66, 0x0c6f}
   ,
-  {0x0c78, 0x0c7f}
-  ,
-  {0x0c81, 0x0c83}
-  ,
-  {0x0c85, 0x0c8c}
+  {0x0c77, 0x0c8c}
   ,
   {0x0c8e, 0x0c90}
   ,
@@ -4890,29 +5256,21 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d01, 0x0d03}
-  ,
-  {0x0d05, 0x0d0c}
+  {0x0d00, 0x0d0c}
   ,
   {0x0d0e, 0x0d10}
   ,
-  {0x0d12, 0x0d3a}
-  ,
-  {0x0d3d, 0x0d44}
+  {0x0d12, 0x0d44}
   ,
   {0x0d46, 0x0d48}
   ,
-  {0x0d4a, 0x0d4e}
+  {0x0d4a, 0x0d4f}
   ,
-  {0x0d57, 0x0d57}
+  {0x0d54, 0x0d63}
   ,
-  {0x0d5f, 0x0d63}
+  {0x0d66, 0x0d7f}
   ,
-  {0x0d66, 0x0d75}
-  ,
-  {0x0d79, 0x0d7f}
-  ,
-  {0x0d82, 0x0d83}
+  {0x0d81, 0x0d83}
   ,
   {0x0d85, 0x0d96}
   ,
@@ -4944,27 +5302,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0e84, 0x0e84}
   ,
-  {0x0e87, 0x0e88}
+  {0x0e86, 0x0e8a}
   ,
-  {0x0e8a, 0x0e8a}
-  ,
-  {0x0e8d, 0x0e8d}
-  ,
-  {0x0e94, 0x0e97}
-  ,
-  {0x0e99, 0x0e9f}
-  ,
-  {0x0ea1, 0x0ea3}
+  {0x0e8c, 0x0ea3}
   ,
   {0x0ea5, 0x0ea5}
   ,
-  {0x0ea7, 0x0ea7}
-  ,
-  {0x0eaa, 0x0eab}
-  ,
-  {0x0ead, 0x0eb9}
-  ,
-  {0x0ebb, 0x0ebd}
+  {0x0ea7, 0x0ebd}
   ,
   {0x0ec0, 0x0ec4}
   ,
@@ -5064,7 +5408,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1810, 0x1819}
   ,
-  {0x1820, 0x1877}
+  {0x1820, 0x1878}
   ,
   {0x1880, 0x18aa}
   ,
@@ -5100,7 +5444,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
-  {0x1ab0, 0x1abe}
+  {0x1ab0, 0x1ac0}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -5112,17 +5456,17 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1c3b, 0x1c49}
   ,
-  {0x1c4d, 0x1c7f}
+  {0x1c4d, 0x1c88}
   ,
-  {0x1cc0, 0x1cc7}
+  {0x1c90, 0x1cba}
   ,
-  {0x1cd0, 0x1cf6}
+  {0x1cbd, 0x1cc7}
   ,
-  {0x1cf8, 0x1cf9}
+  {0x1cd0, 0x1cfa}
   ,
-  {0x1d00, 0x1df5}
+  {0x1d00, 0x1df9}
   ,
-  {0x1dfc, 0x1f15}
+  {0x1dfb, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -5164,15 +5508,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20be}
+  {0x20a0, 0x20bf}
   ,
   {0x20d0, 0x20f0}
   ,
   {0x2100, 0x218b}
   ,
-  {0x2190, 0x23fa}
-  ,
-  {0x2400, 0x2426}
+  {0x2190, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
@@ -5180,15 +5522,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2b76, 0x2b95}
   ,
-  {0x2b98, 0x2bb9}
-  ,
-  {0x2bbd, 0x2bc8}
-  ,
-  {0x2bca, 0x2bd1}
-  ,
-  {0x2bec, 0x2bef}
-  ,
-  {0x2c00, 0x2c2e}
+  {0x2b97, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
@@ -5222,7 +5556,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e42}
+  {0x2de0, 0x2e52}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -5238,21 +5572,15 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x3099, 0x30ff}
   ,
-  {0x3105, 0x312d}
+  {0x3105, 0x312f}
   ,
   {0x3131, 0x318e}
   ,
-  {0x3190, 0x31ba}
-  ,
-  {0x31c0, 0x31e3}
+  {0x3190, 0x31e3}
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x32fe}
-  ,
-  {0x3300, 0x4db5}
-  ,
-  {0x4dc0, 0x9fd5}
+  {0x3220, 0x9ffc}
   ,
   {0xa000, 0xa48c}
   ,
@@ -5262,23 +5590,21 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xa640, 0xa6f7}
   ,
-  {0xa700, 0xa7ad}
+  {0xa700, 0xa7bf}
   ,
-  {0xa7b0, 0xa7b7}
+  {0xa7c2, 0xa7ca}
   ,
-  {0xa7f7, 0xa82b}
+  {0xa7f5, 0xa82c}
   ,
   {0xa830, 0xa839}
   ,
   {0xa840, 0xa877}
   ,
-  {0xa880, 0xa8c4}
+  {0xa880, 0xa8c5}
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fd}
-  ,
-  {0xa900, 0xa953}
+  {0xa8e0, 0xa953}
   ,
   {0xa95f, 0xa97c}
   ,
@@ -5308,7 +5634,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xab30, 0xab65}
+  {0xab30, 0xab6b}
   ,
   {0xab70, 0xabed}
   ,
@@ -5394,9 +5720,9 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018c}
+  {0x10137, 0x1018e}
   ,
-  {0x10190, 0x1019b}
+  {0x10190, 0x1019c}
   ,
   {0x101a0, 0x101a0}
   ,
@@ -5410,7 +5736,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10300, 0x10323}
   ,
-  {0x10330, 0x1034a}
+  {0x1032d, 0x1034a}
   ,
   {0x10350, 0x1037a}
   ,
@@ -5424,6 +5750,10 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x104b0, 0x104d3}
+  ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10500, 0x10527}
   ,
   {0x10530, 0x10563}
@@ -5474,11 +5804,11 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10a15, 0x10a17}
   ,
-  {0x10a19, 0x10a33}
+  {0x10a19, 0x10a35}
   ,
   {0x10a38, 0x10a3a}
   ,
-  {0x10a3f, 0x10a47}
+  {0x10a3f, 0x10a48}
   ,
   {0x10a50, 0x10a58}
   ,
@@ -5506,10 +5836,26 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10cc0, 0x10cf2}
   ,
-  {0x10cfa, 0x10cff}
+  {0x10cfa, 0x10d27}
+  ,
+  {0x10d30, 0x10d39}
   ,
   {0x10e60, 0x10e7e}
   ,
+  {0x10e80, 0x10ea9}
+  ,
+  {0x10eab, 0x10ead}
+  ,
+  {0x10eb0, 0x10eb1}
+  ,
+  {0x10f00, 0x10f27}
+  ,
+  {0x10f30, 0x10f59}
+  ,
+  {0x10fb0, 0x10fcb}
+  ,
+  {0x10fe0, 0x10ff6}
+  ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
@@ -5524,19 +5870,17 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x11100, 0x11134}
   ,
-  {0x11136, 0x11143}
+  {0x11136, 0x11147}
   ,
   {0x11150, 0x11176}
   ,
-  {0x11180, 0x111cd}
-  ,
-  {0x111d0, 0x111df}
+  {0x11180, 0x111df}
   ,
   {0x111e1, 0x111f4}
   ,
   {0x11200, 0x11211}
   ,
-  {0x11213, 0x1123d}
+  {0x11213, 0x1123e}
   ,
   {0x11280, 0x11286}
   ,
@@ -5566,7 +5910,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x11335, 0x11339}
   ,
-  {0x1133c, 0x11344}
+  {0x1133b, 0x11344}
   ,
   {0x11347, 0x11348}
   ,
@@ -5582,6 +5926,10 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x11370, 0x11374}
   ,
+  {0x11400, 0x1145b}
+  ,
+  {0x1145d, 0x11461}
+  ,
   {0x11480, 0x114c7}
   ,
   {0x114d0, 0x114d9}
@@ -5594,23 +5942,97 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x11650, 0x11659}
   ,
-  {0x11680, 0x116b7}
+  {0x11660, 0x1166c}
+  ,
+  {0x11680, 0x116b8}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x11700, 0x11719}
+  {0x11700, 0x1171a}
   ,
   {0x1171d, 0x1172b}
   ,
   {0x11730, 0x1173f}
   ,
+  {0x11800, 0x1183b}
+  ,
   {0x118a0, 0x118f2}
   ,
-  {0x118ff, 0x118ff}
+  {0x118ff, 0x11906}
+  ,
+  {0x11909, 0x11909}
+  ,
+  {0x1190c, 0x11913}
+  ,
+  {0x11915, 0x11916}
+  ,
+  {0x11918, 0x11935}
+  ,
+  {0x11937, 0x11938}
+  ,
+  {0x1193b, 0x11946}
+  ,
+  {0x11950, 0x11959}
+  ,
+  {0x119a0, 0x119a7}
+  ,
+  {0x119aa, 0x119d7}
+  ,
+  {0x119da, 0x119e4}
+  ,
+  {0x11a00, 0x11a47}
+  ,
+  {0x11a50, 0x11aa2}
   ,
   {0x11ac0, 0x11af8}
   ,
-  {0x12000, 0x12399}
+  {0x11c00, 0x11c08}
+  ,
+  {0x11c0a, 0x11c36}
+  ,
+  {0x11c38, 0x11c45}
+  ,
+  {0x11c50, 0x11c6c}
+  ,
+  {0x11c70, 0x11c8f}
+  ,
+  {0x11c92, 0x11ca7}
+  ,
+  {0x11ca9, 0x11cb6}
+  ,
+  {0x11d00, 0x11d06}
+  ,
+  {0x11d08, 0x11d09}
+  ,
+  {0x11d0b, 0x11d36}
+  ,
+  {0x11d3a, 0x11d3a}
+  ,
+  {0x11d3c, 0x11d3d}
+  ,
+  {0x11d3f, 0x11d47}
+  ,
+  {0x11d50, 0x11d59}
+  ,
+  {0x11d60, 0x11d65}
+  ,
+  {0x11d67, 0x11d68}
+  ,
+  {0x11d6a, 0x11d8e}
+  ,
+  {0x11d90, 0x11d91}
+  ,
+  {0x11d93, 0x11d98}
+  ,
+  {0x11da0, 0x11da9}
+  ,
+  {0x11ee0, 0x11ef8}
+  ,
+  {0x11fb0, 0x11fb0}
+  ,
+  {0x11fc0, 0x11ff1}
+  ,
+  {0x11fff, 0x12399}
   ,
   {0x12400, 0x1246e}
   ,
@@ -5644,13 +6066,31 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x16b7d, 0x16b8f}
   ,
-  {0x16f00, 0x16f44}
+  {0x16e40, 0x16e9a}
   ,
-  {0x16f50, 0x16f7e}
+  {0x16f00, 0x16f4a}
+  ,
+  {0x16f4f, 0x16f87}
   ,
   {0x16f8f, 0x16f9f}
   ,
-  {0x1b000, 0x1b001}
+  {0x16fe0, 0x16fe4}
+  ,
+  {0x16ff0, 0x16ff1}
+  ,
+  {0x17000, 0x187f7}
+  ,
+  {0x18800, 0x18cd5}
+  ,
+  {0x18d00, 0x18d08}
+  ,
+  {0x1b000, 0x1b11e}
+  ,
+  {0x1b150, 0x1b152}
+  ,
+  {0x1b164, 0x1b167}
+  ,
+  {0x1b170, 0x1b2fb}
   ,
   {0x1bc00, 0x1bc6a}
   ,
@@ -5672,9 +6112,11 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1d200, 0x1d245}
   ,
+  {0x1d2e0, 0x1d2f3}
+  ,
   {0x1d300, 0x1d356}
   ,
-  {0x1d360, 0x1d371}
+  {0x1d360, 0x1d378}
   ,
   {0x1d400, 0x1d454}
   ,
@@ -5722,10 +6164,42 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1daa1, 0x1daaf}
   ,
+  {0x1e000, 0x1e006}
+  ,
+  {0x1e008, 0x1e018}
+  ,
+  {0x1e01b, 0x1e021}
+  ,
+  {0x1e023, 0x1e024}
+  ,
+  {0x1e026, 0x1e02a}
+  ,
+  {0x1e100, 0x1e12c}
+  ,
+  {0x1e130, 0x1e13d}
+  ,
+  {0x1e140, 0x1e149}
+  ,
+  {0x1e14e, 0x1e14f}
+  ,
+  {0x1e2c0, 0x1e2f9}
+  ,
+  {0x1e2ff, 0x1e2ff}
+  ,
   {0x1e800, 0x1e8c4}
   ,
   {0x1e8c7, 0x1e8d6}
   ,
+  {0x1e900, 0x1e94b}
+  ,
+  {0x1e950, 0x1e959}
+  ,
+  {0x1e95e, 0x1e95f}
+  ,
+  {0x1ec71, 0x1ecb4}
+  ,
+  {0x1ed01, 0x1ed3d}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -5806,35 +6280,29 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10c}
-  ,
-  {0x1f110, 0x1f12e}
-  ,
-  {0x1f130, 0x1f16b}
-  ,
-  {0x1f170, 0x1f19a}
+  {0x1f100, 0x1f1ad}
   ,
   {0x1f1e6, 0x1f202}
   ,
-  {0x1f210, 0x1f23a}
+  {0x1f210, 0x1f23b}
   ,
   {0x1f240, 0x1f248}
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f579}
+  {0x1f260, 0x1f265}
   ,
-  {0x1f57b, 0x1f5a3}
-  ,
-  {0x1f5a5, 0x1f6d0}
+  {0x1f300, 0x1f6d7}
   ,
   {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f6f0, 0x1f6f3}
+  {0x1f6f0, 0x1f6fc}
   ,
   {0x1f700, 0x1f773}
   ,
-  {0x1f780, 0x1f7d4}
+  {0x1f780, 0x1f7d8}
+  ,
+  {0x1f7e0, 0x1f7eb}
   ,
   {0x1f800, 0x1f80b}
   ,
@@ -5846,13 +6314,37 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1f890, 0x1f8ad}
   ,
-  {0x1f910, 0x1f918}
+  {0x1f8b0, 0x1f8b1}
   ,
-  {0x1f980, 0x1f984}
+  {0x1f900, 0x1f978}
   ,
-  {0x1f9c0, 0x1f9c0}
+  {0x1f97a, 0x1f9cb}
   ,
-  {0x20000, 0x2a6d6}
+  {0x1f9cd, 0x1fa53}
+  ,
+  {0x1fa60, 0x1fa6d}
+  ,
+  {0x1fa70, 0x1fa74}
+  ,
+  {0x1fa78, 0x1fa7a}
+  ,
+  {0x1fa80, 0x1fa86}
+  ,
+  {0x1fa90, 0x1faa8}
+  ,
+  {0x1fab0, 0x1fab6}
+  ,
+  {0x1fac0, 0x1fac2}
+  ,
+  {0x1fad0, 0x1fad6}
+  ,
+  {0x1fb00, 0x1fb92}
+  ,
+  {0x1fb94, 0x1fbca}
+  ,
+  {0x1fbf0, 0x1fbf9}
+  ,
+  {0x20000, 0x2a6dd}
   ,
   {0x2a700, 0x2b734}
   ,
@@ -5860,13 +6352,17 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2b820, 0x2cea1}
   ,
+  {0x2ceb0, 0x2ebe0}
+  ,
   {0x2f800, 0x2fa1d}
   ,
+  {0x30000, 0x3134a}
+  ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_graphic = {
-  615,
+  678,
   cs_graphic_ranges
 };
 
@@ -5916,11 +6412,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0531, 0x0556}
   ,
-  {0x0559, 0x055f}
-  ,
-  {0x0561, 0x0587}
-  ,
-  {0x0589, 0x058a}
+  {0x0559, 0x058a}
   ,
   {0x058d, 0x058f}
   ,
@@ -5928,7 +6420,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x05d0, 0x05ea}
   ,
-  {0x05f0, 0x05f4}
+  {0x05ef, 0x05f4}
   ,
   {0x0606, 0x061b}
   ,
@@ -5942,7 +6434,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0800, 0x082d}
+  {0x07fd, 0x082d}
   ,
   {0x0830, 0x083e}
   ,
@@ -5950,8 +6442,14 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
+  {0x0860, 0x086a}
+  ,
   {0x08a0, 0x08b4}
   ,
+  {0x08b6, 0x08c7}
+  ,
+  {0x08d3, 0x08e1}
+  ,
   {0x08e3, 0x0983}
   ,
   {0x0985, 0x098c}
@@ -5978,7 +6476,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fb}
+  {0x09e6, 0x09fe}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -6010,7 +6508,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0a5e, 0x0a5e}
   ,
-  {0x0a66, 0x0a75}
+  {0x0a66, 0x0a76}
   ,
   {0x0a81, 0x0a83}
   ,
@@ -6038,7 +6536,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
-  {0x0af9, 0x0af9}
+  {0x0af9, 0x0aff}
   ,
   {0x0b01, 0x0b03}
   ,
@@ -6060,7 +6558,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0b4b, 0x0b4d}
   ,
-  {0x0b56, 0x0b57}
+  {0x0b55, 0x0b57}
   ,
   {0x0b5c, 0x0b5d}
   ,
@@ -6100,9 +6598,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c00, 0x0c03}
-  ,
-  {0x0c05, 0x0c0c}
+  {0x0c00, 0x0c0c}
   ,
   {0x0c0e, 0x0c10}
   ,
@@ -6124,11 +6620,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0c66, 0x0c6f}
   ,
-  {0x0c78, 0x0c7f}
-  ,
-  {0x0c81, 0x0c83}
-  ,
-  {0x0c85, 0x0c8c}
+  {0x0c77, 0x0c8c}
   ,
   {0x0c8e, 0x0c90}
   ,
@@ -6154,29 +6646,21 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d01, 0x0d03}
-  ,
-  {0x0d05, 0x0d0c}
+  {0x0d00, 0x0d0c}
   ,
   {0x0d0e, 0x0d10}
   ,
-  {0x0d12, 0x0d3a}
-  ,
-  {0x0d3d, 0x0d44}
+  {0x0d12, 0x0d44}
   ,
   {0x0d46, 0x0d48}
   ,
-  {0x0d4a, 0x0d4e}
+  {0x0d4a, 0x0d4f}
   ,
-  {0x0d57, 0x0d57}
+  {0x0d54, 0x0d63}
   ,
-  {0x0d5f, 0x0d63}
+  {0x0d66, 0x0d7f}
   ,
-  {0x0d66, 0x0d75}
-  ,
-  {0x0d79, 0x0d7f}
-  ,
-  {0x0d82, 0x0d83}
+  {0x0d81, 0x0d83}
   ,
   {0x0d85, 0x0d96}
   ,
@@ -6208,27 +6692,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0e84, 0x0e84}
   ,
-  {0x0e87, 0x0e88}
+  {0x0e86, 0x0e8a}
   ,
-  {0x0e8a, 0x0e8a}
-  ,
-  {0x0e8d, 0x0e8d}
-  ,
-  {0x0e94, 0x0e97}
-  ,
-  {0x0e99, 0x0e9f}
-  ,
-  {0x0ea1, 0x0ea3}
+  {0x0e8c, 0x0ea3}
   ,
   {0x0ea5, 0x0ea5}
   ,
-  {0x0ea7, 0x0ea7}
-  ,
-  {0x0eaa, 0x0eab}
-  ,
-  {0x0ead, 0x0eb9}
-  ,
-  {0x0ebb, 0x0ebd}
+  {0x0ea7, 0x0ebd}
   ,
   {0x0ec0, 0x0ec4}
   ,
@@ -6326,7 +6796,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1810, 0x1819}
   ,
-  {0x1820, 0x1877}
+  {0x1820, 0x1878}
   ,
   {0x1880, 0x18aa}
   ,
@@ -6362,7 +6832,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
-  {0x1ab0, 0x1abe}
+  {0x1ab0, 0x1ac0}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -6374,17 +6844,17 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1c3b, 0x1c49}
   ,
-  {0x1c4d, 0x1c7f}
+  {0x1c4d, 0x1c88}
   ,
-  {0x1cc0, 0x1cc7}
+  {0x1c90, 0x1cba}
   ,
-  {0x1cd0, 0x1cf6}
+  {0x1cbd, 0x1cc7}
   ,
-  {0x1cf8, 0x1cf9}
+  {0x1cd0, 0x1cfa}
   ,
-  {0x1d00, 0x1df5}
+  {0x1d00, 0x1df9}
   ,
-  {0x1dfc, 0x1f15}
+  {0x1dfb, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -6428,15 +6898,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20be}
+  {0x20a0, 0x20bf}
   ,
   {0x20d0, 0x20f0}
   ,
   {0x2100, 0x218b}
   ,
-  {0x2190, 0x23fa}
-  ,
-  {0x2400, 0x2426}
+  {0x2190, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
@@ -6444,15 +6912,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2b76, 0x2b95}
   ,
-  {0x2b98, 0x2bb9}
-  ,
-  {0x2bbd, 0x2bc8}
-  ,
-  {0x2bca, 0x2bd1}
-  ,
-  {0x2bec, 0x2bef}
-  ,
-  {0x2c00, 0x2c2e}
+  {0x2b97, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
@@ -6486,7 +6946,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e42}
+  {0x2de0, 0x2e52}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -6502,21 +6962,15 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x3099, 0x30ff}
   ,
-  {0x3105, 0x312d}
+  {0x3105, 0x312f}
   ,
   {0x3131, 0x318e}
   ,
-  {0x3190, 0x31ba}
-  ,
-  {0x31c0, 0x31e3}
+  {0x3190, 0x31e3}
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x32fe}
-  ,
-  {0x3300, 0x4db5}
-  ,
-  {0x4dc0, 0x9fd5}
+  {0x3220, 0x9ffc}
   ,
   {0xa000, 0xa48c}
   ,
@@ -6526,23 +6980,21 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xa640, 0xa6f7}
   ,
-  {0xa700, 0xa7ad}
+  {0xa700, 0xa7bf}
   ,
-  {0xa7b0, 0xa7b7}
+  {0xa7c2, 0xa7ca}
   ,
-  {0xa7f7, 0xa82b}
+  {0xa7f5, 0xa82c}
   ,
   {0xa830, 0xa839}
   ,
   {0xa840, 0xa877}
   ,
-  {0xa880, 0xa8c4}
+  {0xa880, 0xa8c5}
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fd}
-  ,
-  {0xa900, 0xa953}
+  {0xa8e0, 0xa953}
   ,
   {0xa95f, 0xa97c}
   ,
@@ -6572,7 +7024,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xab30, 0xab65}
+  {0xab30, 0xab6b}
   ,
   {0xab70, 0xabed}
   ,
@@ -6658,9 +7110,9 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018c}
+  {0x10137, 0x1018e}
   ,
-  {0x10190, 0x1019b}
+  {0x10190, 0x1019c}
   ,
   {0x101a0, 0x101a0}
   ,
@@ -6674,7 +7126,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10300, 0x10323}
   ,
-  {0x10330, 0x1034a}
+  {0x1032d, 0x1034a}
   ,
   {0x10350, 0x1037a}
   ,
@@ -6688,6 +7140,10 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x104b0, 0x104d3}
+  ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10500, 0x10527}
   ,
   {0x10530, 0x10563}
@@ -6738,11 +7194,11 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10a15, 0x10a17}
   ,
-  {0x10a19, 0x10a33}
+  {0x10a19, 0x10a35}
   ,
   {0x10a38, 0x10a3a}
   ,
-  {0x10a3f, 0x10a47}
+  {0x10a3f, 0x10a48}
   ,
   {0x10a50, 0x10a58}
   ,
@@ -6770,10 +7226,26 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10cc0, 0x10cf2}
   ,
-  {0x10cfa, 0x10cff}
+  {0x10cfa, 0x10d27}
+  ,
+  {0x10d30, 0x10d39}
   ,
   {0x10e60, 0x10e7e}
   ,
+  {0x10e80, 0x10ea9}
+  ,
+  {0x10eab, 0x10ead}
+  ,
+  {0x10eb0, 0x10eb1}
+  ,
+  {0x10f00, 0x10f27}
+  ,
+  {0x10f30, 0x10f59}
+  ,
+  {0x10fb0, 0x10fcb}
+  ,
+  {0x10fe0, 0x10ff6}
+  ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
@@ -6788,19 +7260,17 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x11100, 0x11134}
   ,
-  {0x11136, 0x11143}
+  {0x11136, 0x11147}
   ,
   {0x11150, 0x11176}
   ,
-  {0x11180, 0x111cd}
-  ,
-  {0x111d0, 0x111df}
+  {0x11180, 0x111df}
   ,
   {0x111e1, 0x111f4}
   ,
   {0x11200, 0x11211}
   ,
-  {0x11213, 0x1123d}
+  {0x11213, 0x1123e}
   ,
   {0x11280, 0x11286}
   ,
@@ -6830,7 +7300,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x11335, 0x11339}
   ,
-  {0x1133c, 0x11344}
+  {0x1133b, 0x11344}
   ,
   {0x11347, 0x11348}
   ,
@@ -6846,6 +7316,10 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x11370, 0x11374}
   ,
+  {0x11400, 0x1145b}
+  ,
+  {0x1145d, 0x11461}
+  ,
   {0x11480, 0x114c7}
   ,
   {0x114d0, 0x114d9}
@@ -6858,23 +7332,97 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x11650, 0x11659}
   ,
-  {0x11680, 0x116b7}
+  {0x11660, 0x1166c}
+  ,
+  {0x11680, 0x116b8}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x11700, 0x11719}
+  {0x11700, 0x1171a}
   ,
   {0x1171d, 0x1172b}
   ,
   {0x11730, 0x1173f}
   ,
+  {0x11800, 0x1183b}
+  ,
   {0x118a0, 0x118f2}
   ,
-  {0x118ff, 0x118ff}
+  {0x118ff, 0x11906}
+  ,
+  {0x11909, 0x11909}
+  ,
+  {0x1190c, 0x11913}
+  ,
+  {0x11915, 0x11916}
+  ,
+  {0x11918, 0x11935}
+  ,
+  {0x11937, 0x11938}
+  ,
+  {0x1193b, 0x11946}
+  ,
+  {0x11950, 0x11959}
+  ,
+  {0x119a0, 0x119a7}
+  ,
+  {0x119aa, 0x119d7}
+  ,
+  {0x119da, 0x119e4}
+  ,
+  {0x11a00, 0x11a47}
+  ,
+  {0x11a50, 0x11aa2}
   ,
   {0x11ac0, 0x11af8}
   ,
-  {0x12000, 0x12399}
+  {0x11c00, 0x11c08}
+  ,
+  {0x11c0a, 0x11c36}
+  ,
+  {0x11c38, 0x11c45}
+  ,
+  {0x11c50, 0x11c6c}
+  ,
+  {0x11c70, 0x11c8f}
+  ,
+  {0x11c92, 0x11ca7}
+  ,
+  {0x11ca9, 0x11cb6}
+  ,
+  {0x11d00, 0x11d06}
+  ,
+  {0x11d08, 0x11d09}
+  ,
+  {0x11d0b, 0x11d36}
+  ,
+  {0x11d3a, 0x11d3a}
+  ,
+  {0x11d3c, 0x11d3d}
+  ,
+  {0x11d3f, 0x11d47}
+  ,
+  {0x11d50, 0x11d59}
+  ,
+  {0x11d60, 0x11d65}
+  ,
+  {0x11d67, 0x11d68}
+  ,
+  {0x11d6a, 0x11d8e}
+  ,
+  {0x11d90, 0x11d91}
+  ,
+  {0x11d93, 0x11d98}
+  ,
+  {0x11da0, 0x11da9}
+  ,
+  {0x11ee0, 0x11ef8}
+  ,
+  {0x11fb0, 0x11fb0}
+  ,
+  {0x11fc0, 0x11ff1}
+  ,
+  {0x11fff, 0x12399}
   ,
   {0x12400, 0x1246e}
   ,
@@ -6908,13 +7456,31 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x16b7d, 0x16b8f}
   ,
-  {0x16f00, 0x16f44}
+  {0x16e40, 0x16e9a}
   ,
-  {0x16f50, 0x16f7e}
+  {0x16f00, 0x16f4a}
+  ,
+  {0x16f4f, 0x16f87}
   ,
   {0x16f8f, 0x16f9f}
   ,
-  {0x1b000, 0x1b001}
+  {0x16fe0, 0x16fe4}
+  ,
+  {0x16ff0, 0x16ff1}
+  ,
+  {0x17000, 0x187f7}
+  ,
+  {0x18800, 0x18cd5}
+  ,
+  {0x18d00, 0x18d08}
+  ,
+  {0x1b000, 0x1b11e}
+  ,
+  {0x1b150, 0x1b152}
+  ,
+  {0x1b164, 0x1b167}
+  ,
+  {0x1b170, 0x1b2fb}
   ,
   {0x1bc00, 0x1bc6a}
   ,
@@ -6936,9 +7502,11 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1d200, 0x1d245}
   ,
+  {0x1d2e0, 0x1d2f3}
+  ,
   {0x1d300, 0x1d356}
   ,
-  {0x1d360, 0x1d371}
+  {0x1d360, 0x1d378}
   ,
   {0x1d400, 0x1d454}
   ,
@@ -6986,10 +7554,42 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1daa1, 0x1daaf}
   ,
+  {0x1e000, 0x1e006}
+  ,
+  {0x1e008, 0x1e018}
+  ,
+  {0x1e01b, 0x1e021}
+  ,
+  {0x1e023, 0x1e024}
+  ,
+  {0x1e026, 0x1e02a}
+  ,
+  {0x1e100, 0x1e12c}
+  ,
+  {0x1e130, 0x1e13d}
+  ,
+  {0x1e140, 0x1e149}
+  ,
+  {0x1e14e, 0x1e14f}
+  ,
+  {0x1e2c0, 0x1e2f9}
+  ,
+  {0x1e2ff, 0x1e2ff}
+  ,
   {0x1e800, 0x1e8c4}
   ,
   {0x1e8c7, 0x1e8d6}
   ,
+  {0x1e900, 0x1e94b}
+  ,
+  {0x1e950, 0x1e959}
+  ,
+  {0x1e95e, 0x1e95f}
+  ,
+  {0x1ec71, 0x1ecb4}
+  ,
+  {0x1ed01, 0x1ed3d}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -7070,35 +7670,29 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10c}
-  ,
-  {0x1f110, 0x1f12e}
-  ,
-  {0x1f130, 0x1f16b}
-  ,
-  {0x1f170, 0x1f19a}
+  {0x1f100, 0x1f1ad}
   ,
   {0x1f1e6, 0x1f202}
   ,
-  {0x1f210, 0x1f23a}
+  {0x1f210, 0x1f23b}
   ,
   {0x1f240, 0x1f248}
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f579}
+  {0x1f260, 0x1f265}
   ,
-  {0x1f57b, 0x1f5a3}
-  ,
-  {0x1f5a5, 0x1f6d0}
+  {0x1f300, 0x1f6d7}
   ,
   {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f6f0, 0x1f6f3}
+  {0x1f6f0, 0x1f6fc}
   ,
   {0x1f700, 0x1f773}
   ,
-  {0x1f780, 0x1f7d4}
+  {0x1f780, 0x1f7d8}
+  ,
+  {0x1f7e0, 0x1f7eb}
   ,
   {0x1f800, 0x1f80b}
   ,
@@ -7110,13 +7704,37 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1f890, 0x1f8ad}
   ,
-  {0x1f910, 0x1f918}
+  {0x1f8b0, 0x1f8b1}
   ,
-  {0x1f980, 0x1f984}
+  {0x1f900, 0x1f978}
   ,
-  {0x1f9c0, 0x1f9c0}
+  {0x1f97a, 0x1f9cb}
   ,
-  {0x20000, 0x2a6d6}
+  {0x1f9cd, 0x1fa53}
+  ,
+  {0x1fa60, 0x1fa6d}
+  ,
+  {0x1fa70, 0x1fa74}
+  ,
+  {0x1fa78, 0x1fa7a}
+  ,
+  {0x1fa80, 0x1fa86}
+  ,
+  {0x1fa90, 0x1faa8}
+  ,
+  {0x1fab0, 0x1fab6}
+  ,
+  {0x1fac0, 0x1fac2}
+  ,
+  {0x1fad0, 0x1fad6}
+  ,
+  {0x1fb00, 0x1fb92}
+  ,
+  {0x1fb94, 0x1fbca}
+  ,
+  {0x1fbf0, 0x1fbf9}
+  ,
+  {0x20000, 0x2a6dd}
   ,
   {0x2a700, 0x2b734}
   ,
@@ -7124,13 +7742,17 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2b820, 0x2cea1}
   ,
+  {0x2ceb0, 0x2ebe0}
+  ,
   {0x2f800, 0x2fa1d}
   ,
+  {0x30000, 0x3134a}
+  ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_printing = {
-  616,
+  679,
   cs_printing_ranges
 };
 
@@ -7218,8 +7840,16 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x0970, 0x0970}
   ,
+  {0x09fd, 0x09fd}
+  ,
+  {0x0a76, 0x0a76}
+  ,
   {0x0af0, 0x0af0}
   ,
+  {0x0c77, 0x0c77}
+  ,
+  {0x0c84, 0x0c84}
+  ,
   {0x0df4, 0x0df4}
   ,
   {0x0e4f, 0x0e4f}
@@ -7246,7 +7876,7 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x1400, 0x1400}
   ,
-  {0x166d, 0x166e}
+  {0x166e, 0x166e}
   ,
   {0x169b, 0x169c}
   ,
@@ -7316,7 +7946,9 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x2e00, 0x2e2e}
   ,
-  {0x2e30, 0x2e42}
+  {0x2e30, 0x2e4f}
+  ,
+  {0x2e52, 0x2e52}
   ,
   {0x3001, 0x3003}
   ,
@@ -7424,6 +8056,10 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x10b99, 0x10b9c}
   ,
+  {0x10ead, 0x10ead}
+  ,
+  {0x10f55, 0x10f59}
+  ,
   {0x11047, 0x1104d}
   ,
   {0x110bb, 0x110bc}
@@ -7434,7 +8070,7 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x11174, 0x11175}
   ,
-  {0x111c5, 0x111c9}
+  {0x111c5, 0x111c8}
   ,
   {0x111cd, 0x111cd}
   ,
@@ -7446,14 +8082,42 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x112a9, 0x112a9}
   ,
+  {0x1144b, 0x1144f}
+  ,
+  {0x1145a, 0x1145b}
+  ,
+  {0x1145d, 0x1145d}
+  ,
   {0x114c6, 0x114c6}
   ,
   {0x115c1, 0x115d7}
   ,
   {0x11641, 0x11643}
   ,
+  {0x11660, 0x1166c}
+  ,
   {0x1173c, 0x1173e}
   ,
+  {0x1183b, 0x1183b}
+  ,
+  {0x11944, 0x11946}
+  ,
+  {0x119e2, 0x119e2}
+  ,
+  {0x11a3f, 0x11a46}
+  ,
+  {0x11a9a, 0x11a9c}
+  ,
+  {0x11a9e, 0x11aa2}
+  ,
+  {0x11c41, 0x11c45}
+  ,
+  {0x11c70, 0x11c71}
+  ,
+  {0x11ef7, 0x11ef8}
+  ,
+  {0x11fff, 0x11fff}
+  ,
   {0x12470, 0x12474}
   ,
   {0x16a6e, 0x16a6f}
@@ -7464,13 +8128,19 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x16b44, 0x16b44}
   ,
+  {0x16e97, 0x16e9a}
+  ,
+  {0x16fe2, 0x16fe2}
+  ,
   {0x1bc9f, 0x1bc9f}
   ,
   {0x1da87, 0x1da8b}
+  ,
+  {0x1e95e, 0x1e95f}
 };
 
 scm_t_char_set cs_punctuation = {
-  161,
+  185,
   cs_punctuation_ranges
 };
 
@@ -7539,6 +8209,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x07f6, 0x07f6}
   ,
+  {0x07fe, 0x07ff}
+  ,
   {0x09f2, 0x09f3}
   ,
   {0x09fa, 0x09fb}
@@ -7551,6 +8223,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x0c7f, 0x0c7f}
   ,
+  {0x0d4f, 0x0d4f}
+  ,
   {0x0d79, 0x0d79}
   ,
   {0x0e3f, 0x0e3f}
@@ -7581,6 +8255,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1390, 0x1399}
   ,
+  {0x166d, 0x166d}
+  ,
   {0x17db, 0x17db}
   ,
   {0x1940, 0x1940}
@@ -7611,7 +8287,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x208a, 0x208c}
   ,
-  {0x20a0, 0x20be}
+  {0x20a0, 0x20bf}
   ,
   {0x2100, 0x2101}
   ,
@@ -7647,9 +8323,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x230c, 0x2328}
   ,
-  {0x232b, 0x23fa}
-  ,
-  {0x2400, 0x2426}
+  {0x232b, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
@@ -7671,16 +8345,12 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x2b76, 0x2b95}
   ,
-  {0x2b98, 0x2bb9}
-  ,
-  {0x2bbd, 0x2bc8}
-  ,
-  {0x2bca, 0x2bd1}
-  ,
-  {0x2bec, 0x2bef}
+  {0x2b97, 0x2bff}
   ,
   {0x2ce5, 0x2cea}
   ,
+  {0x2e50, 0x2e51}
+  ,
   {0x2e80, 0x2e99}
   ,
   {0x2e9b, 0x2ef3}
@@ -7717,9 +8387,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x328a, 0x32b0}
   ,
-  {0x32c0, 0x32fe}
-  ,
-  {0x3300, 0x33ff}
+  {0x32c0, 0x33ff}
   ,
   {0x4dc0, 0x4dff}
   ,
@@ -7739,6 +8407,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0xab5b, 0xab5b}
   ,
+  {0xab6a, 0xab6b}
+  ,
   {0xfb29, 0xfb29}
   ,
   {0xfbb2, 0xfbc1}
@@ -7775,9 +8445,9 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x10179, 0x10189}
   ,
-  {0x1018c, 0x1018c}
+  {0x1018c, 0x1018e}
   ,
-  {0x10190, 0x1019b}
+  {0x10190, 0x1019c}
   ,
   {0x101a0, 0x101a0}
   ,
@@ -7789,6 +8459,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1173f, 0x1173f}
   ,
+  {0x11fd5, 0x11ff1}
+  ,
   {0x16b3c, 0x16b3f}
   ,
   {0x16b45, 0x16b45}
@@ -7845,6 +8517,16 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1da85, 0x1da86}
   ,
+  {0x1e14f, 0x1e14f}
+  ,
+  {0x1e2ff, 0x1e2ff}
+  ,
+  {0x1ecac, 0x1ecac}
+  ,
+  {0x1ecb0, 0x1ecb0}
+  ,
+  {0x1ed2e, 0x1ed2e}
+  ,
   {0x1eef0, 0x1eef1}
   ,
   {0x1f000, 0x1f02b}
@@ -7859,33 +8541,29 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f110, 0x1f12e}
-  ,
-  {0x1f130, 0x1f16b}
-  ,
-  {0x1f170, 0x1f19a}
+  {0x1f10d, 0x1f1ad}
   ,
   {0x1f1e6, 0x1f202}
   ,
-  {0x1f210, 0x1f23a}
+  {0x1f210, 0x1f23b}
   ,
   {0x1f240, 0x1f248}
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f579}
+  {0x1f260, 0x1f265}
   ,
-  {0x1f57b, 0x1f5a3}
-  ,
-  {0x1f5a5, 0x1f6d0}
+  {0x1f300, 0x1f6d7}
   ,
   {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f6f0, 0x1f6f3}
+  {0x1f6f0, 0x1f6fc}
   ,
   {0x1f700, 0x1f773}
   ,
-  {0x1f780, 0x1f7d4}
+  {0x1f780, 0x1f7d8}
+  ,
+  {0x1f7e0, 0x1f7eb}
   ,
   {0x1f800, 0x1f80b}
   ,
@@ -7897,15 +8575,37 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x1f890, 0x1f8ad}
   ,
-  {0x1f910, 0x1f918}
+  {0x1f8b0, 0x1f8b1}
   ,
-  {0x1f980, 0x1f984}
+  {0x1f900, 0x1f978}
   ,
-  {0x1f9c0, 0x1f9c0}
+  {0x1f97a, 0x1f9cb}
+  ,
+  {0x1f9cd, 0x1fa53}
+  ,
+  {0x1fa60, 0x1fa6d}
+  ,
+  {0x1fa70, 0x1fa74}
+  ,
+  {0x1fa78, 0x1fa7a}
+  ,
+  {0x1fa80, 0x1fa86}
+  ,
+  {0x1fa90, 0x1faa8}
+  ,
+  {0x1fab0, 0x1fab6}
+  ,
+  {0x1fac0, 0x1fac2}
+  ,
+  {0x1fad0, 0x1fad6}
+  ,
+  {0x1fb00, 0x1fb92}
+  ,
+  {0x1fb94, 0x1fbca}
 };
 
 scm_t_char_set cs_symbol = {
-  214,
+  229,
   cs_symbol_ranges
 };
 
@@ -7964,11 +8664,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0531, 0x0556}
   ,
-  {0x0559, 0x055f}
-  ,
-  {0x0561, 0x0587}
-  ,
-  {0x0589, 0x058a}
+  {0x0559, 0x058a}
   ,
   {0x058d, 0x058f}
   ,
@@ -7976,7 +8672,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x05d0, 0x05ea}
   ,
-  {0x05f0, 0x05f4}
+  {0x05ef, 0x05f4}
   ,
   {0x0600, 0x061c}
   ,
@@ -7988,7 +8684,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0800, 0x082d}
+  {0x07fd, 0x082d}
   ,
   {0x0830, 0x083e}
   ,
@@ -7996,9 +8692,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x085e, 0x085e}
   ,
+  {0x0860, 0x086a}
+  ,
   {0x08a0, 0x08b4}
   ,
-  {0x08e3, 0x0983}
+  {0x08b6, 0x08c7}
+  ,
+  {0x08d3, 0x0983}
   ,
   {0x0985, 0x098c}
   ,
@@ -8024,7 +8724,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fb}
+  {0x09e6, 0x09fe}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -8056,7 +8756,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0a5e, 0x0a5e}
   ,
-  {0x0a66, 0x0a75}
+  {0x0a66, 0x0a76}
   ,
   {0x0a81, 0x0a83}
   ,
@@ -8084,7 +8784,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0ae6, 0x0af1}
   ,
-  {0x0af9, 0x0af9}
+  {0x0af9, 0x0aff}
   ,
   {0x0b01, 0x0b03}
   ,
@@ -8106,7 +8806,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0b4b, 0x0b4d}
   ,
-  {0x0b56, 0x0b57}
+  {0x0b55, 0x0b57}
   ,
   {0x0b5c, 0x0b5d}
   ,
@@ -8146,9 +8846,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0be6, 0x0bfa}
   ,
-  {0x0c00, 0x0c03}
-  ,
-  {0x0c05, 0x0c0c}
+  {0x0c00, 0x0c0c}
   ,
   {0x0c0e, 0x0c10}
   ,
@@ -8170,11 +8868,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0c66, 0x0c6f}
   ,
-  {0x0c78, 0x0c7f}
-  ,
-  {0x0c81, 0x0c83}
-  ,
-  {0x0c85, 0x0c8c}
+  {0x0c77, 0x0c8c}
   ,
   {0x0c8e, 0x0c90}
   ,
@@ -8200,29 +8894,21 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0cf1, 0x0cf2}
   ,
-  {0x0d01, 0x0d03}
-  ,
-  {0x0d05, 0x0d0c}
+  {0x0d00, 0x0d0c}
   ,
   {0x0d0e, 0x0d10}
   ,
-  {0x0d12, 0x0d3a}
-  ,
-  {0x0d3d, 0x0d44}
+  {0x0d12, 0x0d44}
   ,
   {0x0d46, 0x0d48}
   ,
-  {0x0d4a, 0x0d4e}
+  {0x0d4a, 0x0d4f}
   ,
-  {0x0d57, 0x0d57}
+  {0x0d54, 0x0d63}
   ,
-  {0x0d5f, 0x0d63}
+  {0x0d66, 0x0d7f}
   ,
-  {0x0d66, 0x0d75}
-  ,
-  {0x0d79, 0x0d7f}
-  ,
-  {0x0d82, 0x0d83}
+  {0x0d81, 0x0d83}
   ,
   {0x0d85, 0x0d96}
   ,
@@ -8254,27 +8940,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0e84, 0x0e84}
   ,
-  {0x0e87, 0x0e88}
+  {0x0e86, 0x0e8a}
   ,
-  {0x0e8a, 0x0e8a}
-  ,
-  {0x0e8d, 0x0e8d}
-  ,
-  {0x0e94, 0x0e97}
-  ,
-  {0x0e99, 0x0e9f}
-  ,
-  {0x0ea1, 0x0ea3}
+  {0x0e8c, 0x0ea3}
   ,
   {0x0ea5, 0x0ea5}
   ,
-  {0x0ea7, 0x0ea7}
-  ,
-  {0x0eaa, 0x0eab}
-  ,
-  {0x0ead, 0x0eb9}
-  ,
-  {0x0ebb, 0x0ebd}
+  {0x0ea7, 0x0ebd}
   ,
   {0x0ec0, 0x0ec4}
   ,
@@ -8372,7 +9044,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1810, 0x1819}
   ,
-  {0x1820, 0x1877}
+  {0x1820, 0x1878}
   ,
   {0x1880, 0x18aa}
   ,
@@ -8408,7 +9080,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1aa0, 0x1aad}
   ,
-  {0x1ab0, 0x1abe}
+  {0x1ab0, 0x1ac0}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -8420,17 +9092,17 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1c3b, 0x1c49}
   ,
-  {0x1c4d, 0x1c7f}
+  {0x1c4d, 0x1c88}
   ,
-  {0x1cc0, 0x1cc7}
+  {0x1c90, 0x1cba}
   ,
-  {0x1cd0, 0x1cf6}
+  {0x1cbd, 0x1cc7}
   ,
-  {0x1cf8, 0x1cf9}
+  {0x1cd0, 0x1cfa}
   ,
-  {0x1d00, 0x1df5}
+  {0x1d00, 0x1df9}
   ,
-  {0x1dfc, 0x1f15}
+  {0x1dfb, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -8470,15 +9142,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2090, 0x209c}
   ,
-  {0x20a0, 0x20be}
+  {0x20a0, 0x20bf}
   ,
   {0x20d0, 0x20f0}
   ,
   {0x2100, 0x218b}
   ,
-  {0x2190, 0x23fa}
-  ,
-  {0x2400, 0x2426}
+  {0x2190, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
@@ -8486,15 +9156,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2b76, 0x2b95}
   ,
-  {0x2b98, 0x2bb9}
-  ,
-  {0x2bbd, 0x2bc8}
-  ,
-  {0x2bca, 0x2bd1}
-  ,
-  {0x2bec, 0x2bef}
-  ,
-  {0x2c00, 0x2c2e}
+  {0x2b97, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
@@ -8528,7 +9190,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e42}
+  {0x2de0, 0x2e52}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -8544,21 +9206,15 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x3099, 0x30ff}
   ,
-  {0x3105, 0x312d}
+  {0x3105, 0x312f}
   ,
   {0x3131, 0x318e}
   ,
-  {0x3190, 0x31ba}
-  ,
-  {0x31c0, 0x31e3}
+  {0x3190, 0x31e3}
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x32fe}
-  ,
-  {0x3300, 0x4db5}
-  ,
-  {0x4dc0, 0x9fd5}
+  {0x3220, 0x9ffc}
   ,
   {0xa000, 0xa48c}
   ,
@@ -8568,23 +9224,21 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xa640, 0xa6f7}
   ,
-  {0xa700, 0xa7ad}
+  {0xa700, 0xa7bf}
   ,
-  {0xa7b0, 0xa7b7}
+  {0xa7c2, 0xa7ca}
   ,
-  {0xa7f7, 0xa82b}
+  {0xa7f5, 0xa82c}
   ,
   {0xa830, 0xa839}
   ,
   {0xa840, 0xa877}
   ,
-  {0xa880, 0xa8c4}
+  {0xa880, 0xa8c5}
   ,
   {0xa8ce, 0xa8d9}
   ,
-  {0xa8e0, 0xa8fd}
-  ,
-  {0xa900, 0xa953}
+  {0xa8e0, 0xa953}
   ,
   {0xa95f, 0xa97c}
   ,
@@ -8614,7 +9268,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xab28, 0xab2e}
   ,
-  {0xab30, 0xab65}
+  {0xab30, 0xab6b}
   ,
   {0xab70, 0xabed}
   ,
@@ -8702,9 +9356,9 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10107, 0x10133}
   ,
-  {0x10137, 0x1018c}
+  {0x10137, 0x1018e}
   ,
-  {0x10190, 0x1019b}
+  {0x10190, 0x1019c}
   ,
   {0x101a0, 0x101a0}
   ,
@@ -8718,7 +9372,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10300, 0x10323}
   ,
-  {0x10330, 0x1034a}
+  {0x1032d, 0x1034a}
   ,
   {0x10350, 0x1037a}
   ,
@@ -8732,6 +9386,10 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x104a0, 0x104a9}
   ,
+  {0x104b0, 0x104d3}
+  ,
+  {0x104d8, 0x104fb}
+  ,
   {0x10500, 0x10527}
   ,
   {0x10530, 0x10563}
@@ -8782,11 +9440,11 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10a15, 0x10a17}
   ,
-  {0x10a19, 0x10a33}
+  {0x10a19, 0x10a35}
   ,
   {0x10a38, 0x10a3a}
   ,
-  {0x10a3f, 0x10a47}
+  {0x10a3f, 0x10a48}
   ,
   {0x10a50, 0x10a58}
   ,
@@ -8814,35 +9472,51 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10cc0, 0x10cf2}
   ,
-  {0x10cfa, 0x10cff}
+  {0x10cfa, 0x10d27}
+  ,
+  {0x10d30, 0x10d39}
   ,
   {0x10e60, 0x10e7e}
   ,
+  {0x10e80, 0x10ea9}
+  ,
+  {0x10eab, 0x10ead}
+  ,
+  {0x10eb0, 0x10eb1}
+  ,
+  {0x10f00, 0x10f27}
+  ,
+  {0x10f30, 0x10f59}
+  ,
+  {0x10fb0, 0x10fcb}
+  ,
+  {0x10fe0, 0x10ff6}
+  ,
   {0x11000, 0x1104d}
   ,
   {0x11052, 0x1106f}
   ,
   {0x1107f, 0x110c1}
   ,
+  {0x110cd, 0x110cd}
+  ,
   {0x110d0, 0x110e8}
   ,
   {0x110f0, 0x110f9}
   ,
   {0x11100, 0x11134}
   ,
-  {0x11136, 0x11143}
+  {0x11136, 0x11147}
   ,
   {0x11150, 0x11176}
   ,
-  {0x11180, 0x111cd}
-  ,
-  {0x111d0, 0x111df}
+  {0x11180, 0x111df}
   ,
   {0x111e1, 0x111f4}
   ,
   {0x11200, 0x11211}
   ,
-  {0x11213, 0x1123d}
+  {0x11213, 0x1123e}
   ,
   {0x11280, 0x11286}
   ,
@@ -8872,7 +9546,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x11335, 0x11339}
   ,
-  {0x1133c, 0x11344}
+  {0x1133b, 0x11344}
   ,
   {0x11347, 0x11348}
   ,
@@ -8888,6 +9562,10 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x11370, 0x11374}
   ,
+  {0x11400, 0x1145b}
+  ,
+  {0x1145d, 0x11461}
+  ,
   {0x11480, 0x114c7}
   ,
   {0x114d0, 0x114d9}
@@ -8900,23 +9578,97 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x11650, 0x11659}
   ,
-  {0x11680, 0x116b7}
+  {0x11660, 0x1166c}
+  ,
+  {0x11680, 0x116b8}
   ,
   {0x116c0, 0x116c9}
   ,
-  {0x11700, 0x11719}
+  {0x11700, 0x1171a}
   ,
   {0x1171d, 0x1172b}
   ,
   {0x11730, 0x1173f}
   ,
+  {0x11800, 0x1183b}
+  ,
   {0x118a0, 0x118f2}
   ,
-  {0x118ff, 0x118ff}
+  {0x118ff, 0x11906}
+  ,
+  {0x11909, 0x11909}
+  ,
+  {0x1190c, 0x11913}
+  ,
+  {0x11915, 0x11916}
+  ,
+  {0x11918, 0x11935}
+  ,
+  {0x11937, 0x11938}
+  ,
+  {0x1193b, 0x11946}
+  ,
+  {0x11950, 0x11959}
+  ,
+  {0x119a0, 0x119a7}
+  ,
+  {0x119aa, 0x119d7}
+  ,
+  {0x119da, 0x119e4}
+  ,
+  {0x11a00, 0x11a47}
+  ,
+  {0x11a50, 0x11aa2}
   ,
   {0x11ac0, 0x11af8}
   ,
-  {0x12000, 0x12399}
+  {0x11c00, 0x11c08}
+  ,
+  {0x11c0a, 0x11c36}
+  ,
+  {0x11c38, 0x11c45}
+  ,
+  {0x11c50, 0x11c6c}
+  ,
+  {0x11c70, 0x11c8f}
+  ,
+  {0x11c92, 0x11ca7}
+  ,
+  {0x11ca9, 0x11cb6}
+  ,
+  {0x11d00, 0x11d06}
+  ,
+  {0x11d08, 0x11d09}
+  ,
+  {0x11d0b, 0x11d36}
+  ,
+  {0x11d3a, 0x11d3a}
+  ,
+  {0x11d3c, 0x11d3d}
+  ,
+  {0x11d3f, 0x11d47}
+  ,
+  {0x11d50, 0x11d59}
+  ,
+  {0x11d60, 0x11d65}
+  ,
+  {0x11d67, 0x11d68}
+  ,
+  {0x11d6a, 0x11d8e}
+  ,
+  {0x11d90, 0x11d91}
+  ,
+  {0x11d93, 0x11d98}
+  ,
+  {0x11da0, 0x11da9}
+  ,
+  {0x11ee0, 0x11ef8}
+  ,
+  {0x11fb0, 0x11fb0}
+  ,
+  {0x11fc0, 0x11ff1}
+  ,
+  {0x11fff, 0x12399}
   ,
   {0x12400, 0x1246e}
   ,
@@ -8926,6 +9678,8 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x13000, 0x1342e}
   ,
+  {0x13430, 0x13438}
+  ,
   {0x14400, 0x14646}
   ,
   {0x16800, 0x16a38}
@@ -8950,13 +9704,31 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x16b7d, 0x16b8f}
   ,
-  {0x16f00, 0x16f44}
+  {0x16e40, 0x16e9a}
   ,
-  {0x16f50, 0x16f7e}
+  {0x16f00, 0x16f4a}
+  ,
+  {0x16f4f, 0x16f87}
   ,
   {0x16f8f, 0x16f9f}
   ,
-  {0x1b000, 0x1b001}
+  {0x16fe0, 0x16fe4}
+  ,
+  {0x16ff0, 0x16ff1}
+  ,
+  {0x17000, 0x187f7}
+  ,
+  {0x18800, 0x18cd5}
+  ,
+  {0x18d00, 0x18d08}
+  ,
+  {0x1b000, 0x1b11e}
+  ,
+  {0x1b150, 0x1b152}
+  ,
+  {0x1b164, 0x1b167}
+  ,
+  {0x1b170, 0x1b2fb}
   ,
   {0x1bc00, 0x1bc6a}
   ,
@@ -8976,9 +9748,11 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1d200, 0x1d245}
   ,
+  {0x1d2e0, 0x1d2f3}
+  ,
   {0x1d300, 0x1d356}
   ,
-  {0x1d360, 0x1d371}
+  {0x1d360, 0x1d378}
   ,
   {0x1d400, 0x1d454}
   ,
@@ -9026,10 +9800,42 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1daa1, 0x1daaf}
   ,
+  {0x1e000, 0x1e006}
+  ,
+  {0x1e008, 0x1e018}
+  ,
+  {0x1e01b, 0x1e021}
+  ,
+  {0x1e023, 0x1e024}
+  ,
+  {0x1e026, 0x1e02a}
+  ,
+  {0x1e100, 0x1e12c}
+  ,
+  {0x1e130, 0x1e13d}
+  ,
+  {0x1e140, 0x1e149}
+  ,
+  {0x1e14e, 0x1e14f}
+  ,
+  {0x1e2c0, 0x1e2f9}
+  ,
+  {0x1e2ff, 0x1e2ff}
+  ,
   {0x1e800, 0x1e8c4}
   ,
   {0x1e8c7, 0x1e8d6}
   ,
+  {0x1e900, 0x1e94b}
+  ,
+  {0x1e950, 0x1e959}
+  ,
+  {0x1e95e, 0x1e95f}
+  ,
+  {0x1ec71, 0x1ecb4}
+  ,
+  {0x1ed01, 0x1ed3d}
+  ,
   {0x1ee00, 0x1ee03}
   ,
   {0x1ee05, 0x1ee1f}
@@ -9110,35 +9916,29 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1f0d1, 0x1f0f5}
   ,
-  {0x1f100, 0x1f10c}
-  ,
-  {0x1f110, 0x1f12e}
-  ,
-  {0x1f130, 0x1f16b}
-  ,
-  {0x1f170, 0x1f19a}
+  {0x1f100, 0x1f1ad}
   ,
   {0x1f1e6, 0x1f202}
   ,
-  {0x1f210, 0x1f23a}
+  {0x1f210, 0x1f23b}
   ,
   {0x1f240, 0x1f248}
   ,
   {0x1f250, 0x1f251}
   ,
-  {0x1f300, 0x1f579}
+  {0x1f260, 0x1f265}
   ,
-  {0x1f57b, 0x1f5a3}
-  ,
-  {0x1f5a5, 0x1f6d0}
+  {0x1f300, 0x1f6d7}
   ,
   {0x1f6e0, 0x1f6ec}
   ,
-  {0x1f6f0, 0x1f6f3}
+  {0x1f6f0, 0x1f6fc}
   ,
   {0x1f700, 0x1f773}
   ,
-  {0x1f780, 0x1f7d4}
+  {0x1f780, 0x1f7d8}
+  ,
+  {0x1f7e0, 0x1f7eb}
   ,
   {0x1f800, 0x1f80b}
   ,
@@ -9150,13 +9950,37 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1f890, 0x1f8ad}
   ,
-  {0x1f910, 0x1f918}
+  {0x1f8b0, 0x1f8b1}
   ,
-  {0x1f980, 0x1f984}
+  {0x1f900, 0x1f978}
   ,
-  {0x1f9c0, 0x1f9c0}
+  {0x1f97a, 0x1f9cb}
   ,
-  {0x20000, 0x2a6d6}
+  {0x1f9cd, 0x1fa53}
+  ,
+  {0x1fa60, 0x1fa6d}
+  ,
+  {0x1fa70, 0x1fa74}
+  ,
+  {0x1fa78, 0x1fa7a}
+  ,
+  {0x1fa80, 0x1fa86}
+  ,
+  {0x1fa90, 0x1faa8}
+  ,
+  {0x1fab0, 0x1fab6}
+  ,
+  {0x1fac0, 0x1fac2}
+  ,
+  {0x1fad0, 0x1fad6}
+  ,
+  {0x1fb00, 0x1fb92}
+  ,
+  {0x1fb94, 0x1fbca}
+  ,
+  {0x1fbf0, 0x1fbf9}
+  ,
+  {0x20000, 0x2a6dd}
   ,
   {0x2a700, 0x2b734}
   ,
@@ -9164,8 +9988,12 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2b820, 0x2cea1}
   ,
+  {0x2ceb0, 0x2ebe0}
+  ,
   {0x2f800, 0x2fa1d}
   ,
+  {0x30000, 0x3134a}
+  ,
   {0xe0001, 0xe0001}
   ,
   {0xe0020, 0xe007f}
@@ -9178,6 +10006,6 @@ scm_t_char_range cs_designated_ranges[] = {
 };
 
 scm_t_char_set cs_designated = {
-  613,
+  677,
   cs_designated_ranges
 };