[Guile-commits] GNU Guile branch, master, updated. release_1-9-9-41-g897bf7b

[Michael Gran]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=897bf7b0f756e7a5e8c016f7cf77ca84d135a1db

The branch, master has been updated
       via  897bf7b0f756e7a5e8c016f7cf77ca84d135a1db (commit)
       via  6d30df5dbd4080c08d606c9f2b21672d47f04203 (commit)
      from  43cd9cec2320b0fad4e04410226b319918a57f35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 897bf7b0f756e7a5e8c016f7cf77ca84d135a1db
Author: Michael Gran <address@hidden>
Date:   Fri Apr 2 21:12:55 2010 -0700

    Update standard character sets to Unicode 5.2
    
    * srfi-14.i.c: all character ranges updated to Unicode 5.2

commit 6d30df5dbd4080c08d606c9f2b21672d47f04203
Author: Michael Gran <address@hidden>
Date:   Fri Apr 2 21:08:42 2010 -0700

    Unicode data parsing script incorrect for char-set:ascii
    
    char-set:ascii is the only char-set consisting of a single contiguous
    range, and there was an off-by-one error for that case.
    
    * libguile/unidata_to_charset.pl (compute): fix off-by-one

-----------------------------------------------------------------------

Summary of changes:
 libguile/srfi-14.i.c           |  922 ++++++++++++++++++++++++++++++----------
 libguile/unidata_to_charset.pl |    5 +-
 test-suite/tests/srfi-14.test  |   10 +-
 3 files changed, 715 insertions(+), 222 deletions(-)

diff --git a/libguile/srfi-14.i.c b/libguile/srfi-14.i.c
index fd537da..ace61df 100644
--- a/libguile/srfi-14.i.c
+++ b/libguile/srfi-14.i.c
@@ -559,6 +559,8 @@ scm_t_char_range cs_lower_case_ranges[] = {
   ,
   {0x0523, 0x0523}
   ,
+  {0x0525, 0x0525}
+  ,
   {0x0561, 0x0587}
   ,
   {0x1930, 0x1938}
@@ -1055,7 +1057,7 @@ scm_t_char_range cs_lower_case_ranges[] = {
 };
 
 scm_t_char_set cs_lower_case = {
-  523,
+  524,
   cs_lower_case_ranges
 };
 
@@ -1586,6 +1588,8 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x0522, 0x0522}
   ,
+  {0x0524, 0x0524}
+  ,
   {0x0531, 0x0556}
   ,
   {0x10a0, 0x10c5}
@@ -2042,11 +2046,35 @@ scm_t_char_range cs_upper_case_ranges[] = {
   ,
   {0x10400, 0x10427}
   ,
+  {0x1f110, 0x1f12c}
+  ,
+  {0x1f131, 0x1f131}
+  ,
+  {0x1f13d, 0x1f13d}
+  ,
+  {0x1f13f, 0x1f13f}
+  ,
+  {0x1f142, 0x1f142}
+  ,
+  {0x1f146, 0x1f146}
+  ,
+  {0x1f157, 0x1f157}
+  ,
+  {0x1f15f, 0x1f15f}
+  ,
+  {0x1f179, 0x1f179}
+  ,
+  {0x1f17b, 0x1f17c}
+  ,
+  {0x1f17f, 0x1f17f}
+  ,
+  {0x1f18a, 0x1f18a}
+  ,
   {0xe0041, 0xe005a}
 };
 
 scm_t_char_set cs_upper_case = {
-  492,
+  505,
   cs_upper_case_ranges
 };
 
@@ -2120,7 +2148,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x03f7, 0x0481}
   ,
-  {0x048a, 0x0523}
+  {0x048a, 0x0525}
   ,
   {0x0531, 0x0556}
   ,
@@ -2162,6 +2190,14 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x07fa, 0x07fa}
   ,
+  {0x0800, 0x0815}
+  ,
+  {0x081a, 0x081a}
+  ,
+  {0x0824, 0x0824}
+  ,
+  {0x0828, 0x0828}
+  ,
   {0x0904, 0x0939}
   ,
   {0x093d, 0x093d}
@@ -2172,7 +2208,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x0971, 0x0972}
   ,
-  {0x097b, 0x097f}
+  {0x0979, 0x097f}
   ,
   {0x0985, 0x098c}
   ,
@@ -2404,13 +2440,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10fc, 0x10fc}
   ,
-  {0x1100, 0x1159}
-  ,
-  {0x115f, 0x11a2}
-  ,
-  {0x11a8, 0x11f9}
-  ,
-  {0x1200, 0x1248}
+  {0x1100, 0x1248}
   ,
   {0x124a, 0x124d}
   ,
@@ -2448,7 +2478,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1401, 0x166c}
   ,
-  {0x166f, 0x1676}
+  {0x166f, 0x167f}
   ,
   {0x1681, 0x169a}
   ,
@@ -2478,18 +2508,24 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x18aa, 0x18aa}
   ,
+  {0x18b0, 0x18f5}
+  ,
   {0x1900, 0x191c}
   ,
   {0x1950, 0x196d}
   ,
   {0x1970, 0x1974}
   ,
-  {0x1980, 0x19a9}
+  {0x1980, 0x19ab}
   ,
   {0x19c1, 0x19c7}
   ,
   {0x1a00, 0x1a16}
   ,
+  {0x1a20, 0x1a54}
+  ,
+  {0x1aa7, 0x1aa7}
+  ,
   {0x1b05, 0x1b33}
   ,
   {0x1b45, 0x1b4b}
@@ -2504,6 +2540,10 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1c5a, 0x1c7d}
   ,
+  {0x1ce9, 0x1cec}
+  ,
+  {0x1cee, 0x1cf1}
+  ,
   {0x1d00, 0x1dbf}
   ,
   {0x1e00, 0x1f15}
@@ -2582,11 +2622,9 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x2c30, 0x2c5e}
   ,
-  {0x2c60, 0x2c6f}
-  ,
-  {0x2c71, 0x2c7d}
+  {0x2c60, 0x2ce4}
   ,
-  {0x2c80, 0x2ce4}
+  {0x2ceb, 0x2cee}
   ,
   {0x2d00, 0x2d25}
   ,
@@ -2638,10 +2676,12 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x3400, 0x4db5}
   ,
-  {0x4e00, 0x9fc3}
+  {0x4e00, 0x9fcb}
   ,
   {0xa000, 0xa48c}
   ,
+  {0xa4d0, 0xa4fd}
+  ,
   {0xa500, 0xa60c}
   ,
   {0xa610, 0xa61f}
@@ -2654,6 +2694,8 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa67f, 0xa697}
   ,
+  {0xa6a0, 0xa6e5}
+  ,
   {0xa717, 0xa71f}
   ,
   {0xa722, 0xa788}
@@ -2672,21 +2714,55 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0xa882, 0xa8b3}
   ,
+  {0xa8f2, 0xa8f7}
+  ,
+  {0xa8fb, 0xa8fb}
+  ,
   {0xa90a, 0xa925}
   ,
   {0xa930, 0xa946}
   ,
+  {0xa960, 0xa97c}
+  ,
+  {0xa984, 0xa9b2}
+  ,
+  {0xa9cf, 0xa9cf}
+  ,
   {0xaa00, 0xaa28}
   ,
   {0xaa40, 0xaa42}
   ,
   {0xaa44, 0xaa4b}
   ,
+  {0xaa60, 0xaa76}
+  ,
+  {0xaa7a, 0xaa7a}
+  ,
+  {0xaa80, 0xaaaf}
+  ,
+  {0xaab1, 0xaab1}
+  ,
+  {0xaab5, 0xaab6}
+  ,
+  {0xaab9, 0xaabd}
+  ,
+  {0xaac0, 0xaac0}
+  ,
+  {0xaac2, 0xaac2}
+  ,
+  {0xaadb, 0xaadd}
+  ,
+  {0xabc0, 0xabe2}
+  ,
   {0xac00, 0xd7a3}
   ,
+  {0xd7b0, 0xd7c6}
+  ,
+  {0xd7cb, 0xd7fb}
+  ,
   {0xf900, 0xfa2d}
   ,
-  {0xfa30, 0xfa6a}
+  {0xfa30, 0xfa6d}
   ,
   {0xfa70, 0xfad9}
   ,
@@ -2778,7 +2854,7 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x1083c, 0x1083c}
   ,
-  {0x1083f, 0x1083f}
+  {0x1083f, 0x10855}
   ,
   {0x10900, 0x10915}
   ,
@@ -2792,8 +2868,22 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x10a19, 0x10a33}
   ,
+  {0x10a60, 0x10a7c}
+  ,
+  {0x10b00, 0x10b35}
+  ,
+  {0x10b40, 0x10b55}
+  ,
+  {0x10b60, 0x10b72}
+  ,
+  {0x10c00, 0x10c48}
+  ,
+  {0x11083, 0x110af}
+  ,
   {0x12000, 0x1236e}
   ,
+  {0x13000, 0x1342e}
+  ,
   {0x1d400, 0x1d454}
   ,
   {0x1d456, 0x1d49c}
@@ -2856,11 +2946,13 @@ scm_t_char_range cs_letter_ranges[] = {
   ,
   {0x20000, 0x2a6d6}
   ,
+  {0x2a700, 0x2b734}
+  ,
   {0x2f800, 0x2fa1d}
 };
 
 scm_t_char_set cs_letter = {
-  390,
+  422,
   cs_letter_ranges
 };
 
@@ -2907,7 +2999,11 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0x1946, 0x194f}
   ,
-  {0x19d0, 0x19d9}
+  {0x19d0, 0x19da}
+  ,
+  {0x1a80, 0x1a89}
+  ,
+  {0x1a90, 0x1a99}
   ,
   {0x1b50, 0x1b59}
   ,
@@ -2923,8 +3019,12 @@ scm_t_char_range cs_digit_ranges[] = {
   ,
   {0xa900, 0xa909}
   ,
+  {0xa9d0, 0xa9d9}
+  ,
   {0xaa50, 0xaa59}
   ,
+  {0xabf0, 0xabf9}
+  ,
   {0xff10, 0xff19}
   ,
   {0x104a0, 0x104a9}
@@ -2933,7 +3033,7 @@ scm_t_char_range cs_digit_ranges[] = {
 };
 
 scm_t_char_set cs_digit = {
-  33,
+  37,
   cs_digit_ranges
 };
 
@@ -2995,7 +3095,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x03f7, 0x0481}
   ,
-  {0x048a, 0x0523}
+  {0x048a, 0x0525}
   ,
   {0x0531, 0x0556}
   ,
@@ -3037,6 +3137,14 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x07fa, 0x07fa}
   ,
+  {0x0800, 0x0815}
+  ,
+  {0x081a, 0x081a}
+  ,
+  {0x0824, 0x0824}
+  ,
+  {0x0828, 0x0828}
+  ,
   {0x0904, 0x0939}
   ,
   {0x093d, 0x093d}
@@ -3049,7 +3157,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x0971, 0x0972}
   ,
-  {0x097b, 0x097f}
+  {0x0979, 0x097f}
   ,
   {0x0985, 0x098c}
   ,
@@ -3303,13 +3411,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10fc, 0x10fc}
   ,
-  {0x1100, 0x1159}
-  ,
-  {0x115f, 0x11a2}
-  ,
-  {0x11a8, 0x11f9}
-  ,
-  {0x1200, 0x1248}
+  {0x1100, 0x1248}
   ,
   {0x124a, 0x124d}
   ,
@@ -3347,7 +3449,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1401, 0x166c}
   ,
-  {0x166f, 0x1676}
+  {0x166f, 0x167f}
   ,
   {0x1681, 0x169a}
   ,
@@ -3381,20 +3483,30 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x18aa, 0x18aa}
   ,
+  {0x18b0, 0x18f5}
+  ,
   {0x1900, 0x191c}
   ,
   {0x1946, 0x196d}
   ,
   {0x1970, 0x1974}
   ,
-  {0x1980, 0x19a9}
+  {0x1980, 0x19ab}
   ,
   {0x19c1, 0x19c7}
   ,
-  {0x19d0, 0x19d9}
+  {0x19d0, 0x19da}
   ,
   {0x1a00, 0x1a16}
   ,
+  {0x1a20, 0x1a54}
+  ,
+  {0x1a80, 0x1a89}
+  ,
+  {0x1a90, 0x1a99}
+  ,
+  {0x1aa7, 0x1aa7}
+  ,
   {0x1b05, 0x1b33}
   ,
   {0x1b45, 0x1b4b}
@@ -3411,6 +3523,10 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1c4d, 0x1c7d}
   ,
+  {0x1ce9, 0x1cec}
+  ,
+  {0x1cee, 0x1cf1}
+  ,
   {0x1d00, 0x1dbf}
   ,
   {0x1e00, 0x1f15}
@@ -3489,11 +3605,9 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x2c30, 0x2c5e}
   ,
-  {0x2c60, 0x2c6f}
-  ,
-  {0x2c71, 0x2c7d}
+  {0x2c60, 0x2ce4}
   ,
-  {0x2c80, 0x2ce4}
+  {0x2ceb, 0x2cee}
   ,
   {0x2d00, 0x2d25}
   ,
@@ -3545,10 +3659,12 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x3400, 0x4db5}
   ,
-  {0x4e00, 0x9fc3}
+  {0x4e00, 0x9fcb}
   ,
   {0xa000, 0xa48c}
   ,
+  {0xa4d0, 0xa4fd}
+  ,
   {0xa500, 0xa60c}
   ,
   {0xa610, 0xa62b}
@@ -3559,6 +3675,8 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa67f, 0xa697}
   ,
+  {0xa6a0, 0xa6e5}
+  ,
   {0xa717, 0xa71f}
   ,
   {0xa722, 0xa788}
@@ -3579,10 +3697,20 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xa8d0, 0xa8d9}
   ,
+  {0xa8f2, 0xa8f7}
+  ,
+  {0xa8fb, 0xa8fb}
+  ,
   {0xa900, 0xa925}
   ,
   {0xa930, 0xa946}
   ,
+  {0xa960, 0xa97c}
+  ,
+  {0xa984, 0xa9b2}
+  ,
+  {0xa9cf, 0xa9d9}
+  ,
   {0xaa00, 0xaa28}
   ,
   {0xaa40, 0xaa42}
@@ -3591,11 +3719,37 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
+  {0xaa60, 0xaa76}
+  ,
+  {0xaa7a, 0xaa7a}
+  ,
+  {0xaa80, 0xaaaf}
+  ,
+  {0xaab1, 0xaab1}
+  ,
+  {0xaab5, 0xaab6}
+  ,
+  {0xaab9, 0xaabd}
+  ,
+  {0xaac0, 0xaac0}
+  ,
+  {0xaac2, 0xaac2}
+  ,
+  {0xaadb, 0xaadd}
+  ,
+  {0xabc0, 0xabe2}
+  ,
+  {0xabf0, 0xabf9}
+  ,
   {0xac00, 0xd7a3}
   ,
+  {0xd7b0, 0xd7c6}
+  ,
+  {0xd7cb, 0xd7fb}
+  ,
   {0xf900, 0xfa2d}
   ,
-  {0xfa30, 0xfa6a}
+  {0xfa30, 0xfa6d}
   ,
   {0xfa70, 0xfad9}
   ,
@@ -3691,7 +3845,7 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x1083c, 0x1083c}
   ,
-  {0x1083f, 0x1083f}
+  {0x1083f, 0x10855}
   ,
   {0x10900, 0x10915}
   ,
@@ -3705,8 +3859,22 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x10a19, 0x10a33}
   ,
+  {0x10a60, 0x10a7c}
+  ,
+  {0x10b00, 0x10b35}
+  ,
+  {0x10b40, 0x10b55}
+  ,
+  {0x10b60, 0x10b72}
+  ,
+  {0x10c00, 0x10c48}
+  ,
+  {0x11083, 0x110af}
+  ,
   {0x12000, 0x1236e}
   ,
+  {0x13000, 0x1342e}
+  ,
   {0x1d400, 0x1d454}
   ,
   {0x1d456, 0x1d49c}
@@ -3771,11 +3939,13 @@ scm_t_char_range cs_letter_plus_digit_ranges[] = {
   ,
   {0x20000, 0x2a6d6}
   ,
+  {0x2a700, 0x2b734}
+  ,
   {0x2f800, 0x2fa1d}
 };
 
 scm_t_char_set cs_letter_plus_digit = {
-  411,
+  446,
   cs_letter_plus_digit_ranges
 };
 
@@ -3794,7 +3964,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0523}
+  {0x03a3, 0x0525}
   ,
   {0x0531, 0x0556}
   ,
@@ -3826,15 +3996,19 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0901, 0x0939}
+  {0x0800, 0x082d}
+  ,
+  {0x0830, 0x083e}
   ,
-  {0x093c, 0x094d}
+  {0x0900, 0x0939}
   ,
-  {0x0950, 0x0954}
+  {0x093c, 0x094e}
+  ,
+  {0x0950, 0x0955}
   ,
   {0x0958, 0x0972}
   ,
-  {0x097b, 0x097f}
+  {0x0979, 0x097f}
   ,
   {0x0981, 0x0983}
   ,
@@ -3862,7 +4036,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fa}
+  {0x09e6, 0x09fb}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -4138,21 +4312,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x0fbe, 0x0fcc}
   ,
-  {0x0fce, 0x0fd4}
-  ,
-  {0x1000, 0x1099}
+  {0x0fce, 0x0fd8}
   ,
-  {0x109e, 0x10c5}
+  {0x1000, 0x10c5}
   ,
   {0x10d0, 0x10fc}
   ,
-  {0x1100, 0x1159}
-  ,
-  {0x115f, 0x11a2}
-  ,
-  {0x11a8, 0x11f9}
-  ,
-  {0x1200, 0x1248}
+  {0x1100, 0x1248}
   ,
   {0x124a, 0x124d}
   ,
@@ -4190,7 +4356,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x13a0, 0x13f4}
   ,
-  {0x1401, 0x1676}
+  {0x1400, 0x167f}
   ,
   {0x1681, 0x169c}
   ,
@@ -4226,6 +4392,8 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1880, 0x18aa}
   ,
+  {0x18b0, 0x18f5}
+  ,
   {0x1900, 0x191c}
   ,
   {0x1920, 0x192b}
@@ -4238,15 +4406,23 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1970, 0x1974}
   ,
-  {0x1980, 0x19a9}
+  {0x1980, 0x19ab}
   ,
   {0x19b0, 0x19c9}
   ,
-  {0x19d0, 0x19d9}
+  {0x19d0, 0x19da}
   ,
   {0x19de, 0x1a1b}
   ,
-  {0x1a1e, 0x1a1f}
+  {0x1a1e, 0x1a5e}
+  ,
+  {0x1a60, 0x1a7c}
+  ,
+  {0x1a7f, 0x1a89}
+  ,
+  {0x1a90, 0x1a99}
+  ,
+  {0x1aa0, 0x1aad}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -4262,9 +4438,11 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1c4d, 0x1c7f}
   ,
+  {0x1cd0, 0x1cf2}
+  ,
   {0x1d00, 0x1de6}
   ,
-  {0x1dfe, 0x1f15}
+  {0x1dfd, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -4306,25 +4484,25 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2090, 0x2094}
   ,
-  {0x20a0, 0x20b5}
+  {0x20a0, 0x20b8}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x214f}
-  ,
-  {0x2153, 0x2188}
+  {0x2100, 0x2189}
   ,
-  {0x2190, 0x23e7}
+  {0x2190, 0x23e8}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x269d}
+  {0x2460, 0x26cd}
   ,
-  {0x26a0, 0x26bc}
+  {0x26cf, 0x26e1}
   ,
-  {0x26c0, 0x26c3}
+  {0x26e3, 0x26e3}
+  ,
+  {0x26e8, 0x26ff}
   ,
   {0x2701, 0x2704}
   ,
@@ -4338,9 +4516,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x274f, 0x2752}
   ,
-  {0x2756, 0x2756}
-  ,
-  {0x2758, 0x275e}
+  {0x2756, 0x275e}
   ,
   {0x2761, 0x2794}
   ,
@@ -4354,17 +4530,13 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x27d0, 0x2b4c}
   ,
-  {0x2b50, 0x2b54}
+  {0x2b50, 0x2b59}
   ,
   {0x2c00, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
-  {0x2c60, 0x2c6f}
-  ,
-  {0x2c71, 0x2c7d}
-  ,
-  {0x2c80, 0x2cea}
+  {0x2c60, 0x2cf1}
   ,
   {0x2cf9, 0x2d25}
   ,
@@ -4390,7 +4562,7 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e30}
+  {0x2de0, 0x2e31}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -4416,19 +4588,17 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x3243}
-  ,
-  {0x3250, 0x32fe}
+  {0x3220, 0x32fe}
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fc3}
+  {0x4dc0, 0x9fcb}
   ,
   {0xa000, 0xa48c}
   ,
   {0xa490, 0xa4c6}
   ,
-  {0xa500, 0xa62b}
+  {0xa4d0, 0xa62b}
   ,
   {0xa640, 0xa65f}
   ,
@@ -4436,19 +4606,31 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xa67c, 0xa697}
   ,
+  {0xa6a0, 0xa6f7}
+  ,
   {0xa700, 0xa78c}
   ,
   {0xa7fb, 0xa82b}
   ,
+  {0xa830, 0xa839}
+  ,
   {0xa840, 0xa877}
   ,
   {0xa880, 0xa8c4}
   ,
   {0xa8ce, 0xa8d9}
   ,
+  {0xa8e0, 0xa8fb}
+  ,
   {0xa900, 0xa953}
   ,
-  {0xa95f, 0xa95f}
+  {0xa95f, 0xa97c}
+  ,
+  {0xa980, 0xa9cd}
+  ,
+  {0xa9cf, 0xa9d9}
+  ,
+  {0xa9de, 0xa9df}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -4456,13 +4638,25 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa5f}
+  {0xaa5c, 0xaa7b}
+  ,
+  {0xaa80, 0xaac2}
+  ,
+  {0xaadb, 0xaadf}
+  ,
+  {0xabc0, 0xabed}
+  ,
+  {0xabf0, 0xabf9}
   ,
   {0xac00, 0xd7a3}
   ,
+  {0xd7b0, 0xd7c6}
+  ,
+  {0xd7cb, 0xd7fb}
+  ,
   {0xf900, 0xfa2d}
   ,
-  {0xfa30, 0xfa6a}
+  {0xfa30, 0xfa6d}
   ,
   {0xfa70, 0xfad9}
   ,
@@ -4574,9 +4768,11 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1083c, 0x1083c}
   ,
-  {0x1083f, 0x1083f}
+  {0x1083f, 0x10855}
   ,
-  {0x10900, 0x10919}
+  {0x10857, 0x1085f}
+  ,
+  {0x10900, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -4598,12 +4794,32 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
+  {0x10a60, 0x10a7f}
+  ,
+  {0x10b00, 0x10b35}
+  ,
+  {0x10b39, 0x10b55}
+  ,
+  {0x10b58, 0x10b72}
+  ,
+  {0x10b78, 0x10b7f}
+  ,
+  {0x10c00, 0x10c48}
+  ,
+  {0x10e60, 0x10e7e}
+  ,
+  {0x11080, 0x110bc}
+  ,
+  {0x110be, 0x110c1}
+  ,
   {0x12000, 0x1236e}
   ,
   {0x12400, 0x12462}
   ,
   {0x12470, 0x12473}
   ,
+  {0x13000, 0x1342e}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
@@ -4664,15 +4880,53 @@ scm_t_char_range cs_graphic_ranges[] = {
   ,
   {0x1f030, 0x1f093}
   ,
+  {0x1f100, 0x1f10a}
+  ,
+  {0x1f110, 0x1f12e}
+  ,
+  {0x1f131, 0x1f131}
+  ,
+  {0x1f13d, 0x1f13d}
+  ,
+  {0x1f13f, 0x1f13f}
+  ,
+  {0x1f142, 0x1f142}
+  ,
+  {0x1f146, 0x1f146}
+  ,
+  {0x1f14a, 0x1f14e}
+  ,
+  {0x1f157, 0x1f157}
+  ,
+  {0x1f15f, 0x1f15f}
+  ,
+  {0x1f179, 0x1f179}
+  ,
+  {0x1f17b, 0x1f17c}
+  ,
+  {0x1f17f, 0x1f17f}
+  ,
+  {0x1f18a, 0x1f18d}
+  ,
+  {0x1f190, 0x1f190}
+  ,
+  {0x1f200, 0x1f200}
+  ,
+  {0x1f210, 0x1f231}
+  ,
+  {0x1f240, 0x1f248}
+  ,
   {0x20000, 0x2a6d6}
   ,
+  {0x2a700, 0x2b734}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_graphic = {
-  445,
+  487,
   cs_graphic_ranges
 };
 
@@ -4720,7 +4974,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0523}
+  {0x03a3, 0x0525}
   ,
   {0x0531, 0x0556}
   ,
@@ -4752,15 +5006,19 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0901, 0x0939}
+  {0x0800, 0x082d}
+  ,
+  {0x0830, 0x083e}
+  ,
+  {0x0900, 0x0939}
   ,
-  {0x093c, 0x094d}
+  {0x093c, 0x094e}
   ,
-  {0x0950, 0x0954}
+  {0x0950, 0x0955}
   ,
   {0x0958, 0x0972}
   ,
-  {0x097b, 0x097f}
+  {0x0979, 0x097f}
   ,
   {0x0981, 0x0983}
   ,
@@ -4788,7 +5046,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fa}
+  {0x09e6, 0x09fb}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -5064,21 +5322,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x0fbe, 0x0fcc}
   ,
-  {0x0fce, 0x0fd4}
+  {0x0fce, 0x0fd8}
   ,
-  {0x1000, 0x1099}
-  ,
-  {0x109e, 0x10c5}
+  {0x1000, 0x10c5}
   ,
   {0x10d0, 0x10fc}
   ,
-  {0x1100, 0x1159}
-  ,
-  {0x115f, 0x11a2}
-  ,
-  {0x11a8, 0x11f9}
-  ,
-  {0x1200, 0x1248}
+  {0x1100, 0x1248}
   ,
   {0x124a, 0x124d}
   ,
@@ -5116,9 +5366,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x13a0, 0x13f4}
   ,
-  {0x1401, 0x1676}
-  ,
-  {0x1680, 0x169c}
+  {0x1400, 0x169c}
   ,
   {0x16a0, 0x16f0}
   ,
@@ -5152,6 +5400,8 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1880, 0x18aa}
   ,
+  {0x18b0, 0x18f5}
+  ,
   {0x1900, 0x191c}
   ,
   {0x1920, 0x192b}
@@ -5164,15 +5414,23 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1970, 0x1974}
   ,
-  {0x1980, 0x19a9}
+  {0x1980, 0x19ab}
   ,
   {0x19b0, 0x19c9}
   ,
-  {0x19d0, 0x19d9}
+  {0x19d0, 0x19da}
   ,
   {0x19de, 0x1a1b}
   ,
-  {0x1a1e, 0x1a1f}
+  {0x1a1e, 0x1a5e}
+  ,
+  {0x1a60, 0x1a7c}
+  ,
+  {0x1a7f, 0x1a89}
+  ,
+  {0x1a90, 0x1a99}
+  ,
+  {0x1aa0, 0x1aad}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -5188,9 +5446,11 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1c4d, 0x1c7f}
   ,
+  {0x1cd0, 0x1cf2}
+  ,
   {0x1d00, 0x1de6}
   ,
-  {0x1dfe, 0x1f15}
+  {0x1dfd, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -5234,25 +5494,25 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2090, 0x2094}
   ,
-  {0x20a0, 0x20b5}
+  {0x20a0, 0x20b8}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x214f}
-  ,
-  {0x2153, 0x2188}
+  {0x2100, 0x2189}
   ,
-  {0x2190, 0x23e7}
+  {0x2190, 0x23e8}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x269d}
+  {0x2460, 0x26cd}
+  ,
+  {0x26cf, 0x26e1}
   ,
-  {0x26a0, 0x26bc}
+  {0x26e3, 0x26e3}
   ,
-  {0x26c0, 0x26c3}
+  {0x26e8, 0x26ff}
   ,
   {0x2701, 0x2704}
   ,
@@ -5266,9 +5526,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x274f, 0x2752}
   ,
-  {0x2756, 0x2756}
-  ,
-  {0x2758, 0x275e}
+  {0x2756, 0x275e}
   ,
   {0x2761, 0x2794}
   ,
@@ -5282,17 +5540,13 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x27d0, 0x2b4c}
   ,
-  {0x2b50, 0x2b54}
+  {0x2b50, 0x2b59}
   ,
   {0x2c00, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
-  {0x2c60, 0x2c6f}
-  ,
-  {0x2c71, 0x2c7d}
-  ,
-  {0x2c80, 0x2cea}
+  {0x2c60, 0x2cf1}
   ,
   {0x2cf9, 0x2d25}
   ,
@@ -5318,7 +5572,7 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e30}
+  {0x2de0, 0x2e31}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -5344,19 +5598,17 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x3243}
-  ,
-  {0x3250, 0x32fe}
+  {0x3220, 0x32fe}
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fc3}
+  {0x4dc0, 0x9fcb}
   ,
   {0xa000, 0xa48c}
   ,
   {0xa490, 0xa4c6}
   ,
-  {0xa500, 0xa62b}
+  {0xa4d0, 0xa62b}
   ,
   {0xa640, 0xa65f}
   ,
@@ -5364,19 +5616,31 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xa67c, 0xa697}
   ,
+  {0xa6a0, 0xa6f7}
+  ,
   {0xa700, 0xa78c}
   ,
   {0xa7fb, 0xa82b}
   ,
+  {0xa830, 0xa839}
+  ,
   {0xa840, 0xa877}
   ,
   {0xa880, 0xa8c4}
   ,
   {0xa8ce, 0xa8d9}
   ,
+  {0xa8e0, 0xa8fb}
+  ,
   {0xa900, 0xa953}
   ,
-  {0xa95f, 0xa95f}
+  {0xa95f, 0xa97c}
+  ,
+  {0xa980, 0xa9cd}
+  ,
+  {0xa9cf, 0xa9d9}
+  ,
+  {0xa9de, 0xa9df}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -5384,13 +5648,25 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa5f}
+  {0xaa5c, 0xaa7b}
+  ,
+  {0xaa80, 0xaac2}
+  ,
+  {0xaadb, 0xaadf}
+  ,
+  {0xabc0, 0xabed}
+  ,
+  {0xabf0, 0xabf9}
   ,
   {0xac00, 0xd7a3}
   ,
+  {0xd7b0, 0xd7c6}
+  ,
+  {0xd7cb, 0xd7fb}
+  ,
   {0xf900, 0xfa2d}
   ,
-  {0xfa30, 0xfa6a}
+  {0xfa30, 0xfa6d}
   ,
   {0xfa70, 0xfad9}
   ,
@@ -5502,9 +5778,11 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1083c, 0x1083c}
   ,
-  {0x1083f, 0x1083f}
+  {0x1083f, 0x10855}
   ,
-  {0x10900, 0x10919}
+  {0x10857, 0x1085f}
+  ,
+  {0x10900, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -5526,12 +5804,32 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
+  {0x10a60, 0x10a7f}
+  ,
+  {0x10b00, 0x10b35}
+  ,
+  {0x10b39, 0x10b55}
+  ,
+  {0x10b58, 0x10b72}
+  ,
+  {0x10b78, 0x10b7f}
+  ,
+  {0x10c00, 0x10c48}
+  ,
+  {0x10e60, 0x10e7e}
+  ,
+  {0x11080, 0x110bc}
+  ,
+  {0x110be, 0x110c1}
+  ,
   {0x12000, 0x1236e}
   ,
   {0x12400, 0x12462}
   ,
   {0x12470, 0x12473}
   ,
+  {0x13000, 0x1342e}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
@@ -5592,15 +5890,53 @@ scm_t_char_range cs_printing_ranges[] = {
   ,
   {0x1f030, 0x1f093}
   ,
+  {0x1f100, 0x1f10a}
+  ,
+  {0x1f110, 0x1f12e}
+  ,
+  {0x1f131, 0x1f131}
+  ,
+  {0x1f13d, 0x1f13d}
+  ,
+  {0x1f13f, 0x1f13f}
+  ,
+  {0x1f142, 0x1f142}
+  ,
+  {0x1f146, 0x1f146}
+  ,
+  {0x1f14a, 0x1f14e}
+  ,
+  {0x1f157, 0x1f157}
+  ,
+  {0x1f15f, 0x1f15f}
+  ,
+  {0x1f179, 0x1f179}
+  ,
+  {0x1f17b, 0x1f17c}
+  ,
+  {0x1f17f, 0x1f17f}
+  ,
+  {0x1f18a, 0x1f18d}
+  ,
+  {0x1f190, 0x1f190}
+  ,
+  {0x1f200, 0x1f200}
+  ,
+  {0x1f210, 0x1f231}
+  ,
+  {0x1f240, 0x1f248}
+  ,
   {0x20000, 0x2a6d6}
   ,
+  {0x2a700, 0x2b734}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0100, 0xe01ef}
 };
 
 scm_t_char_set cs_printing = {
-  447,
+  488,
   cs_printing_ranges
 };
 
@@ -5678,6 +6014,8 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x07f7, 0x07f9}
   ,
+  {0x0830, 0x083e}
+  ,
   {0x0964, 0x0965}
   ,
   {0x0970, 0x0970}
@@ -5702,6 +6040,8 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x1361, 0x1368}
   ,
+  {0x1400, 0x1400}
+  ,
   {0x166d, 0x166e}
   ,
   {0x169b, 0x169c}
@@ -5722,12 +6062,18 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x1a1e, 0x1a1f}
   ,
+  {0x1aa0, 0x1aa6}
+  ,
+  {0x1aa8, 0x1aad}
+  ,
   {0x1b5a, 0x1b60}
   ,
   {0x1c3b, 0x1c3f}
   ,
   {0x1c7e, 0x1c7f}
   ,
+  {0x1cd3, 0x1cd3}
+  ,
   {0x2010, 0x2027}
   ,
   {0x2030, 0x2043}
@@ -5760,7 +6106,7 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x2e00, 0x2e2e}
   ,
-  {0x2e30, 0x2e30}
+  {0x2e30, 0x2e31}
   ,
   {0x3001, 0x3003}
   ,
@@ -5776,22 +6122,36 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x30fb, 0x30fb}
   ,
+  {0xa4fe, 0xa4ff}
+  ,
   {0xa60d, 0xa60f}
   ,
   {0xa673, 0xa673}
   ,
   {0xa67e, 0xa67e}
   ,
+  {0xa6f2, 0xa6f7}
+  ,
   {0xa874, 0xa877}
   ,
   {0xa8ce, 0xa8cf}
   ,
+  {0xa8f8, 0xa8fa}
+  ,
   {0xa92e, 0xa92f}
   ,
   {0xa95f, 0xa95f}
   ,
+  {0xa9c1, 0xa9cd}
+  ,
+  {0xa9de, 0xa9df}
+  ,
   {0xaa5c, 0xaa5f}
   ,
+  {0xaade, 0xaadf}
+  ,
+  {0xabeb, 0xabeb}
+  ,
   {0xfd3e, 0xfd3f}
   ,
   {0xfe10, 0xfe19}
@@ -5832,17 +6192,27 @@ scm_t_char_range cs_punctuation_ranges[] = {
   ,
   {0x103d0, 0x103d0}
   ,
+  {0x10857, 0x10857}
+  ,
   {0x1091f, 0x1091f}
   ,
   {0x1093f, 0x1093f}
   ,
   {0x10a50, 0x10a58}
   ,
+  {0x10a7f, 0x10a7f}
+  ,
+  {0x10b39, 0x10b3f}
+  ,
+  {0x110bb, 0x110bc}
+  ,
+  {0x110be, 0x110c1}
+  ,
   {0x12470, 0x12473}
 };
 
 scm_t_char_set cs_punctuation = {
-  112,
+  129,
   cs_punctuation_ranges
 };
 
@@ -5909,7 +6279,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x09f2, 0x09f3}
   ,
-  {0x09fa, 0x09fa}
+  {0x09fa, 0x09fb}
   ,
   {0x0af1, 0x0af1}
   ,
@@ -5943,6 +6313,8 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x0fce, 0x0fcf}
   ,
+  {0x0fd5, 0x0fd8}
+  ,
   {0x109e, 0x109f}
   ,
   {0x1360, 0x1360}
@@ -5979,7 +6351,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x208a, 0x208c}
   ,
-  {0x20a0, 0x20b5}
+  {0x20a0, 0x20b8}
   ,
   {0x2100, 0x2101}
   ,
@@ -6011,7 +6383,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x2190, 0x2328}
   ,
-  {0x232b, 0x23e7}
+  {0x232b, 0x23e8}
   ,
   {0x2400, 0x2426}
   ,
@@ -6019,11 +6391,13 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x249c, 0x24e9}
   ,
-  {0x2500, 0x269d}
+  {0x2500, 0x26cd}
+  ,
+  {0x26cf, 0x26e1}
   ,
-  {0x26a0, 0x26bc}
+  {0x26e3, 0x26e3}
   ,
-  {0x26c0, 0x26c3}
+  {0x26e8, 0x26ff}
   ,
   {0x2701, 0x2704}
   ,
@@ -6037,9 +6411,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x274f, 0x2752}
   ,
-  {0x2756, 0x2756}
-  ,
-  {0x2758, 0x275e}
+  {0x2756, 0x275e}
   ,
   {0x2761, 0x2767}
   ,
@@ -6065,7 +6437,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x29fe, 0x2b4c}
   ,
-  {0x2b50, 0x2b54}
+  {0x2b50, 0x2b59}
   ,
   {0x2ce5, 0x2cea}
   ,
@@ -6097,9 +6469,7 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0x3200, 0x321e}
   ,
-  {0x322a, 0x3243}
-  ,
-  {0x3250, 0x3250}
+  {0x322a, 0x3250}
   ,
   {0x3260, 0x327f}
   ,
@@ -6121,6 +6491,10 @@ scm_t_char_range cs_symbol_ranges[] = {
   ,
   {0xa828, 0xa82b}
   ,
+  {0xa836, 0xa839}
+  ,
+  {0xaa77, 0xaa79}
+  ,
   {0xfb29, 0xfb29}
   ,
   {0xfdfc, 0xfdfd}
@@ -6204,10 +6578,44 @@ scm_t_char_range cs_symbol_ranges[] = {
   {0x1f000, 0x1f02b}
   ,
   {0x1f030, 0x1f093}
+  ,
+  {0x1f110, 0x1f12e}
+  ,
+  {0x1f131, 0x1f131}
+  ,
+  {0x1f13d, 0x1f13d}
+  ,
+  {0x1f13f, 0x1f13f}
+  ,
+  {0x1f142, 0x1f142}
+  ,
+  {0x1f146, 0x1f146}
+  ,
+  {0x1f14a, 0x1f14e}
+  ,
+  {0x1f157, 0x1f157}
+  ,
+  {0x1f15f, 0x1f15f}
+  ,
+  {0x1f179, 0x1f179}
+  ,
+  {0x1f17b, 0x1f17c}
+  ,
+  {0x1f17f, 0x1f17f}
+  ,
+  {0x1f18a, 0x1f18d}
+  ,
+  {0x1f190, 0x1f190}
+  ,
+  {0x1f200, 0x1f200}
+  ,
+  {0x1f210, 0x1f231}
+  ,
+  {0x1f240, 0x1f248}
 };
 
 scm_t_char_set cs_symbol = {
-  179,
+  198,
   cs_symbol_ranges
 };
 
@@ -6241,7 +6649,7 @@ scm_t_char_range cs_ascii_ranges[] = {
 };
 
 scm_t_char_set cs_ascii = {
-  0,
+  1,
   cs_ascii_ranges
 };
 
@@ -6264,7 +6672,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x038e, 0x03a1}
   ,
-  {0x03a3, 0x0523}
+  {0x03a3, 0x0525}
   ,
   {0x0531, 0x0556}
   ,
@@ -6296,15 +6704,19 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x07c0, 0x07fa}
   ,
-  {0x0901, 0x0939}
+  {0x0800, 0x082d}
+  ,
+  {0x0830, 0x083e}
   ,
-  {0x093c, 0x094d}
+  {0x0900, 0x0939}
   ,
-  {0x0950, 0x0954}
+  {0x093c, 0x094e}
+  ,
+  {0x0950, 0x0955}
   ,
   {0x0958, 0x0972}
   ,
-  {0x097b, 0x097f}
+  {0x0979, 0x097f}
   ,
   {0x0981, 0x0983}
   ,
@@ -6332,7 +6744,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x09df, 0x09e3}
   ,
-  {0x09e6, 0x09fa}
+  {0x09e6, 0x09fb}
   ,
   {0x0a01, 0x0a03}
   ,
@@ -6608,21 +7020,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x0fbe, 0x0fcc}
   ,
-  {0x0fce, 0x0fd4}
-  ,
-  {0x1000, 0x1099}
+  {0x0fce, 0x0fd8}
   ,
-  {0x109e, 0x10c5}
+  {0x1000, 0x10c5}
   ,
   {0x10d0, 0x10fc}
   ,
-  {0x1100, 0x1159}
-  ,
-  {0x115f, 0x11a2}
-  ,
-  {0x11a8, 0x11f9}
-  ,
-  {0x1200, 0x1248}
+  {0x1100, 0x1248}
   ,
   {0x124a, 0x124d}
   ,
@@ -6660,9 +7064,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x13a0, 0x13f4}
   ,
-  {0x1401, 0x1676}
-  ,
-  {0x1680, 0x169c}
+  {0x1400, 0x169c}
   ,
   {0x16a0, 0x16f0}
   ,
@@ -6694,6 +7096,8 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1880, 0x18aa}
   ,
+  {0x18b0, 0x18f5}
+  ,
   {0x1900, 0x191c}
   ,
   {0x1920, 0x192b}
@@ -6706,15 +7110,23 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1970, 0x1974}
   ,
-  {0x1980, 0x19a9}
+  {0x1980, 0x19ab}
   ,
   {0x19b0, 0x19c9}
   ,
-  {0x19d0, 0x19d9}
+  {0x19d0, 0x19da}
   ,
   {0x19de, 0x1a1b}
   ,
-  {0x1a1e, 0x1a1f}
+  {0x1a1e, 0x1a5e}
+  ,
+  {0x1a60, 0x1a7c}
+  ,
+  {0x1a7f, 0x1a89}
+  ,
+  {0x1a90, 0x1a99}
+  ,
+  {0x1aa0, 0x1aad}
   ,
   {0x1b00, 0x1b4b}
   ,
@@ -6730,9 +7142,11 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1c4d, 0x1c7f}
   ,
+  {0x1cd0, 0x1cf2}
+  ,
   {0x1d00, 0x1de6}
   ,
-  {0x1dfe, 0x1f15}
+  {0x1dfd, 0x1f15}
   ,
   {0x1f18, 0x1f1d}
   ,
@@ -6772,25 +7186,25 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2090, 0x2094}
   ,
-  {0x20a0, 0x20b5}
+  {0x20a0, 0x20b8}
   ,
   {0x20d0, 0x20f0}
   ,
-  {0x2100, 0x214f}
-  ,
-  {0x2153, 0x2188}
+  {0x2100, 0x2189}
   ,
-  {0x2190, 0x23e7}
+  {0x2190, 0x23e8}
   ,
   {0x2400, 0x2426}
   ,
   {0x2440, 0x244a}
   ,
-  {0x2460, 0x269d}
+  {0x2460, 0x26cd}
   ,
-  {0x26a0, 0x26bc}
+  {0x26cf, 0x26e1}
   ,
-  {0x26c0, 0x26c3}
+  {0x26e3, 0x26e3}
+  ,
+  {0x26e8, 0x26ff}
   ,
   {0x2701, 0x2704}
   ,
@@ -6804,9 +7218,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x274f, 0x2752}
   ,
-  {0x2756, 0x2756}
-  ,
-  {0x2758, 0x275e}
+  {0x2756, 0x275e}
   ,
   {0x2761, 0x2794}
   ,
@@ -6820,17 +7232,13 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x27d0, 0x2b4c}
   ,
-  {0x2b50, 0x2b54}
+  {0x2b50, 0x2b59}
   ,
   {0x2c00, 0x2c2e}
   ,
   {0x2c30, 0x2c5e}
   ,
-  {0x2c60, 0x2c6f}
-  ,
-  {0x2c71, 0x2c7d}
-  ,
-  {0x2c80, 0x2cea}
+  {0x2c60, 0x2cf1}
   ,
   {0x2cf9, 0x2d25}
   ,
@@ -6856,7 +7264,7 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x2dd8, 0x2dde}
   ,
-  {0x2de0, 0x2e30}
+  {0x2de0, 0x2e31}
   ,
   {0x2e80, 0x2e99}
   ,
@@ -6882,19 +7290,17 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x31f0, 0x321e}
   ,
-  {0x3220, 0x3243}
-  ,
-  {0x3250, 0x32fe}
+  {0x3220, 0x32fe}
   ,
   {0x3300, 0x4db5}
   ,
-  {0x4dc0, 0x9fc3}
+  {0x4dc0, 0x9fcb}
   ,
   {0xa000, 0xa48c}
   ,
   {0xa490, 0xa4c6}
   ,
-  {0xa500, 0xa62b}
+  {0xa4d0, 0xa62b}
   ,
   {0xa640, 0xa65f}
   ,
@@ -6902,19 +7308,31 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xa67c, 0xa697}
   ,
+  {0xa6a0, 0xa6f7}
+  ,
   {0xa700, 0xa78c}
   ,
   {0xa7fb, 0xa82b}
   ,
+  {0xa830, 0xa839}
+  ,
   {0xa840, 0xa877}
   ,
   {0xa880, 0xa8c4}
   ,
   {0xa8ce, 0xa8d9}
   ,
+  {0xa8e0, 0xa8fb}
+  ,
   {0xa900, 0xa953}
   ,
-  {0xa95f, 0xa95f}
+  {0xa95f, 0xa97c}
+  ,
+  {0xa980, 0xa9cd}
+  ,
+  {0xa9cf, 0xa9d9}
+  ,
+  {0xa9de, 0xa9df}
   ,
   {0xaa00, 0xaa36}
   ,
@@ -6922,13 +7340,25 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0xaa50, 0xaa59}
   ,
-  {0xaa5c, 0xaa5f}
+  {0xaa5c, 0xaa7b}
+  ,
+  {0xaa80, 0xaac2}
+  ,
+  {0xaadb, 0xaadf}
+  ,
+  {0xabc0, 0xabed}
+  ,
+  {0xabf0, 0xabf9}
   ,
   {0xac00, 0xd7a3}
   ,
+  {0xd7b0, 0xd7c6}
+  ,
+  {0xd7cb, 0xd7fb}
+  ,
   {0xe000, 0xfa2d}
   ,
-  {0xfa30, 0xfa6a}
+  {0xfa30, 0xfa6d}
   ,
   {0xfa70, 0xfad9}
   ,
@@ -7042,9 +7472,11 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1083c, 0x1083c}
   ,
-  {0x1083f, 0x1083f}
+  {0x1083f, 0x10855}
+  ,
+  {0x10857, 0x1085f}
   ,
-  {0x10900, 0x10919}
+  {0x10900, 0x1091b}
   ,
   {0x1091f, 0x10939}
   ,
@@ -7066,12 +7498,30 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x10a50, 0x10a58}
   ,
+  {0x10a60, 0x10a7f}
+  ,
+  {0x10b00, 0x10b35}
+  ,
+  {0x10b39, 0x10b55}
+  ,
+  {0x10b58, 0x10b72}
+  ,
+  {0x10b78, 0x10b7f}
+  ,
+  {0x10c00, 0x10c48}
+  ,
+  {0x10e60, 0x10e7e}
+  ,
+  {0x11080, 0x110c1}
+  ,
   {0x12000, 0x1236e}
   ,
   {0x12400, 0x12462}
   ,
   {0x12470, 0x12473}
   ,
+  {0x13000, 0x1342e}
+  ,
   {0x1d000, 0x1d0f5}
   ,
   {0x1d100, 0x1d126}
@@ -7130,8 +7580,46 @@ scm_t_char_range cs_designated_ranges[] = {
   ,
   {0x1f030, 0x1f093}
   ,
+  {0x1f100, 0x1f10a}
+  ,
+  {0x1f110, 0x1f12e}
+  ,
+  {0x1f131, 0x1f131}
+  ,
+  {0x1f13d, 0x1f13d}
+  ,
+  {0x1f13f, 0x1f13f}
+  ,
+  {0x1f142, 0x1f142}
+  ,
+  {0x1f146, 0x1f146}
+  ,
+  {0x1f14a, 0x1f14e}
+  ,
+  {0x1f157, 0x1f157}
+  ,
+  {0x1f15f, 0x1f15f}
+  ,
+  {0x1f179, 0x1f179}
+  ,
+  {0x1f17b, 0x1f17c}
+  ,
+  {0x1f17f, 0x1f17f}
+  ,
+  {0x1f18a, 0x1f18d}
+  ,
+  {0x1f190, 0x1f190}
+  ,
+  {0x1f200, 0x1f200}
+  ,
+  {0x1f210, 0x1f231}
+  ,
+  {0x1f240, 0x1f248}
+  ,
   {0x20000, 0x2a6d6}
   ,
+  {0x2a700, 0x2b734}
+  ,
   {0x2f800, 0x2fa1d}
   ,
   {0xe0001, 0xe0001}
@@ -7146,6 +7634,6 @@ scm_t_char_range cs_designated_ranges[] = {
 };
 
 scm_t_char_set cs_designated = {
-  445,
+  485,
   cs_designated_ranges
 };
diff --git a/libguile/unidata_to_charset.pl b/libguile/unidata_to_charset.pl
index d086c8e..961dba6 100755
--- a/libguile/unidata_to_charset.pl
+++ b/libguile/unidata_to_charset.pl
@@ -340,8 +340,9 @@ sub compute {
             $rend[$len] = $end;
             $len++;
         } elsif ($len == 0) {
-            $rstart[0] = $start;
-            $rend[0] = $end;
+           $rstart[0] = $start;
+           $rend[0] = $end;
+           $len++;
         }
     }
 
diff --git a/test-suite/tests/srfi-14.test b/test-suite/tests/srfi-14.test
index f12a255..93b1883 100644
--- a/test-suite/tests/srfi-14.test
+++ b/test-suite/tests/srfi-14.test
@@ -721,10 +721,14 @@
                                      (integer->char #x20))))
                  char-set:printing))
 
+  (pass-if "char-set:ASCII"
+     (char-set= (ucs-range->char-set 0 128)
+                char-set:ascii))
+
   (pass-if "char-set:iso-control"
-     (char-set<= (string->char-set 
-                  (apply string 
-                         (map integer->char (append 
+     (char-set<= (string->char-set
+                  (apply string
+                         (map integer->char (append
                                              ;; U+0000 to U+001F
                                              (iota #x20)
                                              (list #x7f)))))


hooks/post-receive
-- 
GNU Guile