Update upstream source from tag 'upstream/0.5.3+git20210102'

Update to upstream version '0.5.3+git20210102'
with Debian dir e89c066385156d7c9ed01b0c8a1a08e01019959d

14 files changed, 115 insertions, 156 deletions

diff --git a/libwc/map/CVS/Entries b/libwc/map/CVS/Entries
deleted file mode 100644
index 7e3a839..0000000
--- a/libwc/map/CVS/Entries
+++ /dev/null
@@ -1,112 +0,0 @@
-/big5_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cns11643_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1006_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1250_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1251_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1252_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1253_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1254_ucs.map/1.1/Mon Sep 22 21:02:24 2003//
-/cp1255_combining.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1255_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1256_combining.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1256_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1257_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1258_combining.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp1258_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp437_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp737_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp775_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp850_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp852_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp855_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp856_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp857_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp860_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp861_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp862_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp863_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp864_combining.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp864_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp865_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp866_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp869_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp874_combining.map/1.1/Mon Sep 22 21:02:25 2003//
-/cp874_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/gb12345_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/gb18030_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/gb2312_gbk.map/1.1/Mon Sep 22 21:02:25 2003//
-/gb2312_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/gbk_ucs.map/1.1/Mon Sep 22 21:02:25 2003//
-/hkscs_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/hkscs_ucs_p2.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885910_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885911_combining.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885911_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885913_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885914_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885915_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso885916_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88591_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88592_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88593_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88594_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88595_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88596_combining.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88596_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88597_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88598_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/iso88599_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/jisx0201k_jisx0208.map/1.1/Mon Sep 22 21:02:26 2003//
-/jisx0201k_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/jisx0208_jisx02131.map/1.1/Mon Sep 22 21:02:26 2003//
-/jisx0208x0212x0213_ucs.map/1.1/Mon Sep 22 21:02:26 2003//
-/jisx02132_sjis.map/1.1/Mon Sep 22 21:02:28 2003//
-/jisx0213_ucs_p2.map/1.1/Mon Sep 22 21:02:28 2003//
-/johab_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/koi8r_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/koi8u_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/ksx1001_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/mk_big5_txt.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_big5_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_cns_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_combining_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_cp1258_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_cp950_txt.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_gb18030_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_gb_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_gbk_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_hkscs_p2_txt.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_hkscs_txt.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_hkscs_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_hkscs_ucs_p2_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_jis_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_jisx0213_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_johab_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_ks_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_sjis_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_tis_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_uhc_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/mk_viet_ucs_map.pl/1.1/Mon Sep 22 21:02:28 2003//
-/nextstep_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/sjis_ext_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/tcvn57123_tcvn5712.map/1.1/Mon Sep 22 21:02:28 2003//
-/tcvn5712_combining.map/1.1/Mon Sep 22 21:02:28 2003//
-/tcvn5712_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/ucs_combining.map/1.1/Mon Sep 22 21:02:28 2003//
-/ucs_fullwidth.map/1.1/Mon Sep 22 21:02:28 2003//
-/ucs_hangul.map/1.1/Mon Sep 22 21:02:28 2003//
-/ucs_precompose.map/1.1/Mon Sep 22 21:02:28 2003//
-/uhc_ucs.map/1.1/Mon Sep 22 21:02:28 2003//
-/viscii11_ucs.map/1.1/Mon Sep 22 21:02:29 2003//
-/vps_ucs.map/1.1/Mon Sep 22 21:02:29 2003//
-/mk_ucs_case_map.pl/1.1/Tue Aug 24 10:11:51 2010//
-/mk_ucs_isdigit_map.pl/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_ambwidth.map/1.1/Sun Jul 25 09:55:05 2010//
-/ucs_case.map/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_isalpha.map/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_isdigit.map/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_islower.map/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_isupper.map/1.1/Tue Aug 24 10:11:51 2010//
-/ucs_wide.map/1.2/Tue Jan  4 09:22:28 2011//
-D
diff --git a/libwc/map/CVS/Repository b/libwc/map/CVS/Repository
deleted file mode 100644
index 487f8e5..0000000
--- a/libwc/map/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-w3m/libwc/map
diff --git a/libwc/map/CVS/Root b/libwc/map/CVS/Root
deleted file mode 100644
index 121fa06..0000000
--- a/libwc/map/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/libwc/map/big5_ucs.map b/libwc/map/big5_ucs.map
index 0c6fd12..ac817a9 100644
--- a/libwc/map/big5_ucs.map
+++ b/libwc/map/big5_ucs.map
@@ -1,6 +1,8 @@
 /* Big5 (Chinese Taiwan) */
 
-static wc_uint16 big5_ucs_map[ 0x59 * 0x9D ] = {
+#define N_big5_ucs_map (0x59 * 0x9D)
+
+static wc_uint16 big5_ucs_map[ N_big5_ucs_map ] = {
  0x3000,	/* 0xA140 */
  0xFF0C,	/* 0xA141 */
  0x3001,	/* 0xA142 */
diff --git a/libwc/map/cns11643_ucs.map b/libwc/map/cns11643_ucs.map
index b426dd3..fcba334 100644
--- a/libwc/map/cns11643_ucs.map
+++ b/libwc/map/cns11643_ucs.map
@@ -1,6 +1,8 @@
 /* CNS 11643 (Chinese Taiwan) */
 
-static wc_uint16 cns116431_ucs_map[ 0x5E * 0x5E ] = {
+#define N_cns116431_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 cns116431_ucs_map[ N_cns116431_ucs_map ] = {
  0x3000,	/* 0x2121 */
  0xFF0C,	/* 0x2122 */
  0x3001,	/* 0x2123 */
@@ -8839,7 +8841,9 @@ static wc_uint16 cns116431_ucs_map[ 0x5E * 0x5E ] = {
  0,		/* 0x7E7E */
 };
 
-static wc_uint16 cns116432_ucs_map[ 0x5E * 0x5E ] = {
+#define N_cns116432_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 cns116432_ucs_map[ N_cns116432_ucs_map ] = {
  0x4E42,	/* 0x2121 */
  0x4E5C,	/* 0x2122 */
  0x51F5,	/* 0x2123 */
diff --git a/libwc/map/gb12345_ucs.map b/libwc/map/gb12345_ucs.map
index 55558c7..3fb338d 100644
--- a/libwc/map/gb12345_ucs.map
+++ b/libwc/map/gb12345_ucs.map
@@ -1,6 +1,8 @@
 /* GB 12345 (Chinese) */
 
-static wc_uint16 gb12345_ucs_map[ 0x5E * 0x5E ] = {
+#define N_gb12345_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 gb12345_ucs_map[ N_gb12345_ucs_map ] = {
  0x3000,	/* 0x2121 */
  0x3001,	/* 0x2122 */
  0x3002,	/* 0x2123 */
diff --git a/libwc/map/gb2312_ucs.map b/libwc/map/gb2312_ucs.map
index 38fb88f..3d37465 100644
--- a/libwc/map/gb2312_ucs.map
+++ b/libwc/map/gb2312_ucs.map
@@ -1,6 +1,8 @@
 /* GB 2312 (Chinese) */
 
-static wc_uint16 gb2312_ucs_map[ 0x5E * 0x5E ] = {
+#define N_gb2312_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 gb2312_ucs_map[ N_gb2312_ucs_map ] = {
  0x3000,	/* 0x2121 */
  0x3001,	/* 0x2122 */
  0x3002,	/* 0x2123 */
diff --git a/libwc/map/gbk_ucs.map b/libwc/map/gbk_ucs.map
index 5a0d5ba..d092fd7 100644
--- a/libwc/map/gbk_ucs.map
+++ b/libwc/map/gbk_ucs.map
@@ -6,7 +6,9 @@ static wc_map ucs_gbk_80_map[ N_ucs_gbk_80_map ] = {
   { 0x20AC, 0x0080 },
 };
 
-static wc_uint16 gbk_ucs_map[ 0x7E * 0xBE - 0x5E * 0x5E + 0x0A + 0x16 + 0x06 ] = {
+#define N_gbk_ucs_map (0x7E * 0xBE - 0x5E * 0x5E + 0x0A + 0x16 + 0x06)
+
+static wc_uint16 gbk_ucs_map[ N_gbk_ucs_map ] = {
   0x4E02,	/* 0x8140 */
   0x4E04,	/* 0x8141 */
   0x4E05,	/* 0x8142 */
diff --git a/libwc/map/hkscs_ucs.map b/libwc/map/hkscs_ucs.map
index 96d1566..2fbe6b4 100644
--- a/libwc/map/hkscs_ucs.map
+++ b/libwc/map/hkscs_ucs.map
@@ -1,6 +1,8 @@
 /* HKSCS (Chinese Hong Kong) */
 
-static wc_uint16 hkscs_ucs_map[ 0x1E * 0x9D ] = {
+#define N_hkscs_ucs_map (0x1E * 0x9D)
+
+static wc_uint16 hkscs_ucs_map[ N_hkscs_ucs_map ] = {
  0,		/* 0x8840 */
  0,		/* 0x8841 */
  0,		/* 0x8842 */
diff --git a/libwc/map/jisx0208x0212x0213_ucs.map b/libwc/map/jisx0208x0212x0213_ucs.map
index 1a1d706..28c2a6c 100644
--- a/libwc/map/jisx0208x0212x0213_ucs.map
+++ b/libwc/map/jisx0208x0212x0213_ucs.map
@@ -1,6 +1,8 @@
 /* JIS X 0208, JIS X 0212, JIS X 0213 (Japanese) */
 
-static wc_uint16 jisx0208x02131_ucs_map[ 0x5E * 0x5E ] = {
+#define N_jisx0208x02131_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 jisx0208x02131_ucs_map[ N_jisx0208x02131_ucs_map ] = {
  0x3000,	/* JIS X 0208 0x2121 */
  0x3001,	/* JIS X 0208 0x2122 */
  0x3002,	/* JIS X 0208 0x2123 */
@@ -8839,7 +8841,9 @@ static wc_uint16 jisx0208x02131_ucs_map[ 0x5E * 0x5E ] = {
  0,		/* JIS X 0213-1 0x7E7E */
 };
 
-static wc_uint16 jisx0212x02132_ucs_map[ 0x5E * 0x5E ] = {
+#define N_jisx0212x02132_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 jisx0212x02132_ucs_map[ N_jisx0212x02132_ucs_map ] = {
  0,		/* JIS X 0213-2 0x2121 */
  0x4E02,	/* JIS X 0213-2 0x2122 */
  0x4E0F,	/* JIS X 0213-2 0x2123 */
diff --git a/libwc/map/ksx1001_ucs.map b/libwc/map/ksx1001_ucs.map
index 9a17d61..cb62f98 100644
--- a/libwc/map/ksx1001_ucs.map
+++ b/libwc/map/ksx1001_ucs.map
@@ -1,6 +1,8 @@
 /* KS X 1001 (Korean) */
 
-static wc_uint16 ksx1001_ucs_map[ 0x5E * 0x5E ] = {
+#define N_ksx1001_ucs_map (0x5E * 0x5E)
+
+static wc_uint16 ksx1001_ucs_map[ N_ksx1001_ucs_map ] = {
  0x3000,	/* 0x2121 */
  0x3001,	/* 0x2122 */
  0x3002,	/* 0x2123 */
diff --git a/libwc/map/sjis_ext_ucs.map b/libwc/map/sjis_ext_ucs.map
index a82995c..cc748ba 100644
--- a/libwc/map/sjis_ext_ucs.map
+++ b/libwc/map/sjis_ext_ucs.map
@@ -1,6 +1,8 @@
 /* Shift_JIS/CP932 (Japanese) */
 
-static wc_uint16 sjis_ext_ucs_map[ 0x5E * 10 ] = {
+#define N_sjis_ext_ucs_map (0x5E * 10)
+
+static wc_uint16 sjis_ext_ucs_map[ N_sjis_ext_ucs_map ] = {
   0x2460,	/* 0x8740 */
   0x2461,	/* 0x8741 */
   0x2462,	/* 0x8742 */
diff --git a/libwc/map/ucs_ambwidth.map b/libwc/map/ucs_ambwidth.map
index 6f03ba8..35ceedb 100644
--- a/libwc/map/ucs_ambwidth.map
+++ b/libwc/map/ucs_ambwidth.map
@@ -1,50 +1,82 @@
 static wc_map ucs_ambwidth_map[] = {
    { 0x00A1, 0x00A1 },
    { 0x00A4, 0x00A4 },
-   { 0x00A7, 0x00AA },
-   { 0x00AD, 0x00BF },
+   { 0x00A7, 0x00A8 },
+   { 0x00AA, 0x00AA },
+   { 0x00AD, 0x00AE },
+   { 0x00B0, 0x00B4 },
+   { 0x00B6, 0x00BA },
+   { 0x00BC, 0x00BF },
    { 0x00C6, 0x00C6 },
    { 0x00D0, 0x00D0 },
    { 0x00D7, 0x00D8 },
    { 0x00DE, 0x00E1 },
-   { 0x00E6, 0x00ED },
-   { 0x00F0, 0x00F3 },
-   { 0x00F7, 0x00FE },
+   { 0x00E6, 0x00E6 },
+   { 0x00E8, 0x00EA },
+   { 0x00EC, 0x00ED },
+   { 0x00F0, 0x00F0 },
+   { 0x00F2, 0x00F3 },
+   { 0x00F7, 0x00FA },
+   { 0x00FC, 0x00FC },
+   { 0x00FE, 0x00FE },
    { 0x0101, 0x0101 },
-   { 0x0111, 0x0113 },
+   { 0x0111, 0x0111 },
+   { 0x0113, 0x0113 },
    { 0x011B, 0x011B },
    { 0x0126, 0x0127 },
    { 0x012B, 0x012B },
    { 0x0131, 0x0133 },
    { 0x0138, 0x0138 },
-   { 0x013F, 0x0144 },
-   { 0x0148, 0x014D },
+   { 0x013F, 0x0142 },
+   { 0x0144, 0x0144 },
+   { 0x0148, 0x014B },
+   { 0x014D, 0x014D },
    { 0x0152, 0x0153 },
    { 0x0166, 0x0167 },
    { 0x016B, 0x016B },
-   { 0x01CE, 0x01DC },
+   { 0x01CE, 0x01CE },
+   { 0x01D0, 0x01D0 },
+   { 0x01D2, 0x01D2 },
+   { 0x01D4, 0x01D4 },
+   { 0x01D6, 0x01D6 },
+   { 0x01D8, 0x01D8 },
+   { 0x01DA, 0x01DA },
+   { 0x01DC, 0x01DC },
    { 0x0251, 0x0251 },
    { 0x0261, 0x0261 },
    { 0x02C4, 0x02C4 },
-   { 0x02C7, 0x02CD },
+   { 0x02C7, 0x02C7 },
+   { 0x02C9, 0x02CB },
+   { 0x02CD, 0x02CD },
    { 0x02D0, 0x02D0 },
-   { 0x02D8, 0x02DF },
+   { 0x02D8, 0x02DB },
+   { 0x02DD, 0x02DD },
+   { 0x02DF, 0x02DF },
    { 0x0300, 0x036F },
-   { 0x0391, 0x03A9 },
-   { 0x03B1, 0x03C9 },
+   { 0x0391, 0x03A1 },
+   { 0x03A3, 0x03A9 },
+   { 0x03B1, 0x03C1 },
+   { 0x03C3, 0x03C9 },
    { 0x0401, 0x0401 },
-   { 0x0410, 0x0451 },
+   { 0x0410, 0x044F },
+   { 0x0451, 0x0451 },
    { 0x2010, 0x2010 },
-   { 0x2013, 0x2019 },
+   { 0x2013, 0x2016 },
+   { 0x2018, 0x2019 },
    { 0x201C, 0x201D },
-   { 0x2020, 0x2027 },
-   { 0x2030, 0x2035 },
+   { 0x2020, 0x2022 },
+   { 0x2024, 0x2027 },
+   { 0x2030, 0x2030 },
+   { 0x2032, 0x2033 },
+   { 0x2035, 0x2035 },
    { 0x203B, 0x203B },
    { 0x203E, 0x203E },
    { 0x2074, 0x2074 },
-   { 0x207F, 0x2084 },
+   { 0x207F, 0x207F },
+   { 0x2081, 0x2084 },
    { 0x20AC, 0x20AC },
-   { 0x2103, 0x2105 },
+   { 0x2103, 0x2103 },
+   { 0x2105, 0x2105 },
    { 0x2109, 0x2109 },
    { 0x2113, 0x2113 },
    { 0x2116, 0x2116 },
@@ -52,21 +84,28 @@ static wc_map ucs_ambwidth_map[] = {
    { 0x2126, 0x2126 },
    { 0x212B, 0x212B },
    { 0x2153, 0x2154 },
-   { 0x215B, 0x216B },
+   { 0x215B, 0x215E },
+   { 0x2160, 0x216B },
    { 0x2170, 0x2179 },
    { 0x2189, 0x2189 },
    { 0x2190, 0x2199 },
    { 0x21B8, 0x21B9 },
-   { 0x21D2, 0x21D4 },
+   { 0x21D2, 0x21D2 },
+   { 0x21D4, 0x21D4 },
    { 0x21E7, 0x21E7 },
-   { 0x2200, 0x2203 },
+   { 0x2200, 0x2200 },
+   { 0x2202, 0x2203 },
    { 0x2207, 0x2208 },
    { 0x220B, 0x220B },
-   { 0x220F, 0x2211 },
+   { 0x220F, 0x220F },
+   { 0x2211, 0x2211 },
    { 0x2215, 0x2215 },
    { 0x221A, 0x221A },
    { 0x221D, 0x2220 },
-   { 0x2223, 0x222E },
+   { 0x2223, 0x2223 },
+   { 0x2225, 0x2225 },
+   { 0x2227, 0x222C },
+   { 0x222E, 0x222E },
    { 0x2234, 0x2237 },
    { 0x223C, 0x223D },
    { 0x2248, 0x2248 },
@@ -83,11 +122,13 @@ static wc_map ucs_ambwidth_map[] = {
    { 0x22A5, 0x22A5 },
    { 0x22BF, 0x22BF },
    { 0x2312, 0x2312 },
-   { 0x2460, 0x254B },
+   { 0x2460, 0x24E9 },
+   { 0x24EB, 0x254B },
    { 0x2550, 0x2573 },
    { 0x2580, 0x258F },
    { 0x2592, 0x2595 },
-   { 0x25A0, 0x25A9 },
+   { 0x25A0, 0x25A1 },
+   { 0x25A3, 0x25A9 },
    { 0x25B2, 0x25B3 },
    { 0x25B6, 0x25B7 },
    { 0x25BC, 0x25BD },
@@ -101,12 +142,20 @@ static wc_map ucs_ambwidth_map[] = {
    { 0x2609, 0x2609 },
    { 0x260E, 0x260F },
    { 0x2614, 0x2615 },
-   { 0x261C, 0x261E },
-   { 0x2640, 0x2642 },
-   { 0x2660, 0x266F },
+   { 0x261C, 0x261C },
+   { 0x261E, 0x261E },
+   { 0x2640, 0x2640 },
+   { 0x2642, 0x2642 },
+   { 0x2660, 0x2661 },
+   { 0x2663, 0x2665 },
+   { 0x2667, 0x266A },
+   { 0x266C, 0x266D },
+   { 0x266F, 0x266F },
    { 0x269E, 0x269F },
    { 0x26BE, 0x26BF },
-   { 0x26C4, 0x26E3 },
+   { 0x26C4, 0x26CD },
+   { 0x26CF, 0x26E1 },
+   { 0x26E3, 0x26E3 },
    { 0x26E8, 0x26FF },
    { 0x273D, 0x273D },
    { 0x2757, 0x2757 },
diff --git a/libwc/map/uhc_ucs.map b/libwc/map/uhc_ucs.map
index b6b43ca..55efc09 100644
--- a/libwc/map/uhc_ucs.map
+++ b/libwc/map/uhc_ucs.map
@@ -1,6 +1,8 @@
 /* UHC/CP949 (Korean) */
 
-static wc_uint16 uhc_ucs_map[ 0x20 * 0xB2 + 0x27 * 0x54 + 2 ] = {
+#define N_uhc_ucs_map (0x20 * 0xB2 + 0x27 * 0x54 + 2)
+
+static wc_uint16 uhc_ucs_map[ N_uhc_ucs_map ] = {
   0xAC02,	/* 0x8141 */
   0xAC03,	/* 0x8142 */
   0xAC05,	/* 0x8143 */