aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xiconvdata/tst-table.sh26
-rw-r--r--localedata/ChangeLog7
2 files changed, 20 insertions, 13 deletions
diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index 7b3ad92..1de71148 100755
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -38,6 +38,13 @@ set -e
${SHELL} tst-table-charmap.sh ${charmap:-$charset} \
< ../localedata/charmaps/${charmap:-$charset} \
> ${objpfx}tst-${charset}.charmap.table
+# When the charset is GB18030, truncate this table because for this encoding,
+# the tst-table-from and tst-table-to programs scan the Unicode BMP only.
+if test ${charset} = GB18030; then
+ grep '0x....$' < ${objpfx}tst-${charset}.charmap.table \
+ > ${objpfx}tst-${charset}.truncated.table
+ mv ${objpfx}tst-${charset}.truncated.table ${objpfx}tst-${charset}.charmap.table
+fi
# Precomputed expexted differences between the charmap and iconv forward.
precomposed=${charset}.precomposed
@@ -68,21 +75,14 @@ diff ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.inverse.table
# Check 1: charmap and iconv forward should be identical, except for
# precomposed characters.
-if test ${charset} = GB18030; then
- grep '0x....$' < ${objpfx}tst-${charset}.charmap.table \
- > ${objpfx}tst-${charset}.truncated.table
- cmp -s ${objpfx}tst-${charset}.truncated.table ${objpfx}tst-${charset}.table ||
+if test -f ${precomposed}; then
+ cat ${objpfx}tst-${charset}.table ${precomposed} | sort | uniq -u \
+ > ${objpfx}tst-${charset}.tmp.table
+ cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.tmp.table ||
exit 1
else
- if test -f ${precomposed}; then
- cat ${objpfx}tst-${charset}.table ${precomposed} | sort | uniq -u \
- > ${objpfx}tst-${charset}.tmp.table
- cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.tmp.table ||
- exit 1
- else
- cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.table ||
- exit 1
- fi
+ cmp -s ${objpfx}tst-${charset}.charmap.table ${objpfx}tst-${charset}.table ||
+ exit 1
fi
# Check 2: the difference between the charmap and iconv backward.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index fbccb7f..5e8cc65 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-21 Bruno Haible <bruno@clisp.org>
+
+ * charmaps/GB18030: Add Unicode planes 1 (scripts, symbols), 2 (CJK),
+ 14 (tags), 15 and 16 (private use), accidentally removed by the
+ 2002-01-16 patch. Replace width table by one which is based on
+ Unicode but is biased for CJK.
+
2002-04-19 Bruno Haible <bruno@clisp.org>
* charmaps/ISO-IR-209: Fix the Unicode values for LETTER H WITH CARON.