Update.

2001-06-09  Bruno Haible  <haible@clisp.cons.org>

	* charmaps/BIG5-HKSCS: Renamed from charmaps/BIG5HKSCS.  Change
	code_set_name to BIG5-HKSCS. Add BIG5HKSCS alias.

	* charmaps/SHIFT_JIS: Renamed from charmaps/SJIS.  Change code_set_name

diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 8a63c9b..89b806b 100755 (executable)
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -185,7 +185,7 @@ cat <<EOF |
   #
   # Multibyte encodings come here
   #
-  SJIS
+  SJIS              SHIFT_JIS
   EUC-KR
   CP949
   JOHAB

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5be260f..9958c69 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,11 @@
+2001-06-09  Bruno Haible  <haible@clisp.cons.org>
+
+       * charmaps/BIG5-HKSCS: Renamed from charmaps/BIG5HKSCS.  Change
+       code_set_name to BIG5-HKSCS. Add BIG5HKSCS alias.
+
 2001-05-26  Bruno Haible  <haible@clisp.cons.org>
 
-       * charmaps/SHIFT_JIS: Renamed from charmaps/SJIS. Change code_set_name
+       * charmaps/SHIFT_JIS: Renamed from charmaps/SJIS.  Change code_set_name
        to SHIFT_JIS. Add SJIS as alias.
        * Makefile (CHARMAPS): For SJIS locale, use SHIFT_JIS charmap.
        * gen-locale.sh: Likewise.

diff --git a/localedata/charmaps/BIG5HKSCS b/localedata/charmaps/BIG5-HKSCS
similarity index 99%
rename from localedata/charmaps/BIG5HKSCS
rename to localedata/charmaps/BIG5-HKSCS
index 95d3149..ddf95e8 100644 (file)
--- a/localedata/charmaps/BIG5HKSCS
+++ b/localedata/charmaps/BIG5-HKSCS
@@ -1,8 +1,11 @@
-<code_set_name> BIG5HKSCS
+<code_set_name> BIG5-HKSCS
 <mb_cur_max>  2
 <mb_cur_min>  1
 <comment_char> %
 <escape_char> /
+
+% alias BIG5HKSCS
+
 %
 % Generated from the big5hkscs.c iconv module.
 %

diff --git a/manual/charset.texi b/manual/charset.texi
index de420ea..9068e42 100644 (file)
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -247,6 +247,7 @@ character on its own or whether it has to be combined with some more
 bytes.
 
 @cindex EUC
+@cindex Shift_JIS
 @cindex SJIS
 In most uses of @w{ISO 2022} the defined character sets do not allow
 state changes which cover more than the next character.  This has the
@@ -254,7 +255,7 @@ big advantage that whenever one can identify the beginning of the byte
 sequence of a character one can interpret a text correctly.  Examples of
 character sets using this policy are the various EUC character sets
 (used by Sun's operations systems, EUC-JP, EUC-KR, EUC-TW, and EUC-CN)
-or SJIS (Shift-JIS, a Japanese encoding).
+or Shift_JIS (SJIS, a Japanese encoding).
 
 But there are also character sets using a state which is valid for more
 than one character and has to be changed by another byte sequence.