Update GB18030 charset maps to 2005 edition

3 files changed, 32 insertions, 16 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d56523167d9..dfe4630e5bb 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-18  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charsets/GB180302.map: Update to 2005 edition.
+        * charsets/GB180304.map: Likewise.
+
 2011-07-17  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.2.93.
diff --git a/etc/charsets/GB180302.map b/etc/charsets/GB180302.map
index a001f22153f..ee7e0ecd42e 100644
--- a/etc/charsets/GB180302.map
+++ b/etc/charsets/GB180302.map
@@ -2048,17 +2048,20 @@
 0xA6B9-0xA6C0 0xE785
 0xA6C1-0xA6D1 0x03B1
 0xA6D2-0xA6D8 0x03C3
-0xA6D9-0xA6DF 0xE78D
+0xA6D9 0xFE10
+0xA6DA 0xFE12
+0xA6DB 0xFE11
+0xA6DC-0xA6DF 0xFE13
 0xA6E0-0xA6E1 0xFE35
 0xA6E2-0xA6E3 0xFE39
 0xA6E4-0xA6E5 0xFE3F
 0xA6E6-0xA6E7 0xFE3D
 0xA6E8-0xA6EB 0xFE41
-0xA6EC-0xA6ED 0xE794
+0xA6EC-0xA6ED 0xFE17
 0xA6EE-0xA6EF 0xFE3B
 0xA6F0-0xA6F1 0xFE37
 0xA6F2 0xFE31
-0xA6F3 0xE796
+0xA6F3 0xFE19
 0xA6F4-0xA6F5 0xFE33
 0xA6F6-0xA6FE 0xE797
 0xA740-0xA77E 0xE706
@@ -2124,7 +2127,7 @@
 0xA8B9 0x00FC
 0xA8BA 0x00EA
 0xA8BB 0x0251
-0xA8BC 0xE7C7
+0xA8BC 0x1E3F
 0xA8BD 0x0144
 0xA8BE 0x0148
 0xA8BF 0x01F9
@@ -10385,13 +10388,15 @@
 0xFE4B-0xFE4C 0xFA23
 0xFE4D-0xFE4F 0xFA27
 0xFE50 0x2E81
-0xFE51-0xFE53 0xE816
+0xFE51 0x00020087
+0xFE52 0x00020089
+0xFE53 0x000200CC
 0xFE54 0x2E84
 0xFE55 0x3473
 0xFE56 0x3447
 0xFE57 0x2E88
 0xFE58 0x2E8B
-0xFE59 0xE81E
+0xFE59 0x9FB4
 0xFE5A 0x359E
 0xFE5B 0x361A
 0xFE5C 0x360E
@@ -10399,17 +10404,18 @@
 0xFE5E 0x2E97
 0xFE5F 0x396E
 0xFE60 0x3918
-0xFE61 0xE826
+0xFE61 0x9FB5
 0xFE62 0x39CF
 0xFE63 0x39DF
 0xFE64 0x3A73
 0xFE65 0x39D0
-0xFE66-0xFE67 0xE82B
+0xFE66-0xFE67 0x9FB6
 0xFE68 0x3B4E
 0xFE69 0x3C6E
 0xFE6A 0x3CE0
 0xFE6B 0x2EA7
-0xFE6C-0xFE6D 0xE831
+0xFE6C 0x000215D7
+0xFE6D 0x9FB8
 0xFE6E 0x2EAA
 0xFE6F 0x4056
 0xFE70 0x415F
@@ -10417,7 +10423,7 @@
 0xFE72 0x4337
 0xFE73 0x2EB3
 0xFE74-0xFE75 0x2EB6
-0xFE76 0xE83B
+0xFE76 0x0002298F
 0xFE77 0x43B1
 0xFE78 0x43AC
 0xFE79 0x2EBB
@@ -10425,7 +10431,7 @@
 0xFE7B 0x44D6
 0xFE7C 0x4661
 0xFE7D 0x464C
-0xFE7E 0xE843
+0xFE7E 0x9FB9
 0xFE80 0x4723
 0xFE81 0x4729
 0xFE82 0x477C
@@ -10440,12 +10446,13 @@
 0xFE8D 0x499B
 0xFE8E 0x49B7
 0xFE8F 0x49B6
-0xFE90-0xFE91 0xE854
+0xFE90 0x9FBA
+0xFE91 0x000241FE
 0xFE92 0x4CA3
 0xFE93-0xFE95 0x4C9F
 0xFE96 0x4C77
 0xFE97 0x4CA2
 0xFE98-0xFE9E 0x4D13
 0xFE9F 0x4DAE
-0xFEA0 0xE864
+0xFEA0 0x9FBB
 0xFEA1-0xFEFE 0xE468
diff --git a/etc/charsets/GB180304.map b/etc/charsets/GB180304.map
index e81eacff601..31352e266c8 100644
--- a/etc/charsets/GB180304.map
+++ b/etc/charsets/GB180304.map
@@ -40,7 +40,8 @@
 0x8130CC30-0x8130D134   0x03CA
 0x8130D135-0x8130D238   0x0402
 0x8130D239              0x0450
-0x8130D330-0x8136A531   0x0452
+0x8130D330-0x8135F436   0x0452
+0x8135F438-0x8136A531   0x1E40
 0x8136A532-0x8136A533   0x2011
 0x8136A534              0x2017
 0x8136A535-0x8136A536   0x201A
@@ -171,8 +172,10 @@
 0x8234EB33-0x8234F633   0x4CA4
 0x8234F634-0x82358731   0x4D1A
 0x82358732-0x82358F32   0x4DAF
-0x82358F33-0x8336C738   0x9FA6
+0x82358F33-0x82359036   0x9FA6
+0x82359135-0x8336C738   0x9FBC
 0x8336C739              0xE76C
+0x8135F437              0xE7C7
 0x8336C830              0xE7C8
 0x8336C831-0x8336C933   0xE7E7
 0x8336C934              0xE815
@@ -196,7 +199,8 @@
 0x84309B39-0x84309C34   0xFA19
 0x84309C35              0xFA22
 0x84309C36-0x84309C37   0xFA25
-0x84309C38-0x84318537   0xFA2A
+0x84309C38-0x84318235   0xFA2A
+0x84318336-0x84318537   0xFE1A
 0x84318538              0xFE32
 0x84318539-0x84318632   0xFE45
 0x84318633              0xFE53