From 48223460608a1947ff85e6a5918139835c18e853 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 25 Jun 2001 12:07:43 +0000 Subject: [PATCH] Change canonical name of BIG5HKSCS to BIG5-HKSCS. Change canonical name of SJIS to SHIFT_JIS. --- ChangeLog | 4 ++++ lib/encodings.def | 4 ++-- libcharset/lib/ChangeLog | 5 +++++ libcharset/lib/config.charset | 14 +++++++------- libcharset/tools/all-charsets | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7ab43d..5f94ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-06-25 Bruno Haible + + * lib/encodings.def: Make SHIFT_JIS the primary name of SJIS. + 2001-06-08 Bruno Haible * autoconf/ltmain.sh: Upgrade to libtool-1.4. diff --git a/lib/encodings.def b/lib/encodings.def index a185ada..c02f6a5 100644 --- a/lib/encodings.def +++ b/lib/encodings.def @@ -677,9 +677,9 @@ DEFENCODING(( "EUC-JP", /* IANA */ euc_jp, { euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL }) -DEFENCODING(( "SJIS", /* JDK 1.1 */ - "SHIFT_JIS", /* IANA */ +DEFENCODING(( "SHIFT_JIS", /* IANA */ "SHIFT-JIS", /* glibc */ + "SJIS", /* JDK 1.1 */ "MS_KANJI", /* IANA */ "csShiftJIS", /* IANA */ ), diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog index 7d71ee5..808d725 100644 --- a/libcharset/lib/ChangeLog +++ b/libcharset/lib/ChangeLog @@ -1,3 +1,8 @@ +2001-06-24 Bruno Haible + + * config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS. + Change canonical name of SJIS to SHIFT_JIS. + 2001-05-06 Bruno Haible * Makefile.msvc (charset.lib): Allow the 'del' command to fail. diff --git a/libcharset/lib/config.charset b/libcharset/lib/config.charset index d6f3695..dbee2c0 100755 --- a/libcharset/lib/config.charset +++ b/libcharset/lib/config.charset @@ -80,10 +80,10 @@ # EUC-KR glibc aix hpux irix osf solaris freebsd yes # EUC-TW glibc aix hpux irix osf solaris # BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5HKSCS glibc +# BIG5-HKSCS glibc yes # GBK aix osf win32 dos # GB18030 glibc -# SJIS hpux osf solaris freebsd +# SHIFT_JIS hpux osf solaris freebsd yes # JOHAB glibc win32 # TIS-620 glibc aix hpux osf solaris # VISCII glibc yes @@ -174,7 +174,7 @@ case "$os" in echo "eucTW EUC-TW" echo "hp15CN GB2312" #echo "ccdc ?" # what is this? - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "utf8 UTF-8" ;; irix*) @@ -209,7 +209,7 @@ case "$os" in echo "GBK GBK" echo "KSC5601 CP949" echo "sdeckanji EUC-JP" - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "TACTIS TIS-620" echo "UTF-8 UTF-8" ;; @@ -230,7 +230,7 @@ case "$os" in echo "cns11643 EUC-TW" echo "5601 EUC-KR" echo "eucJP EUC-JP" - echo "PCK SJIS" + echo "PCK SHIFT_JIS" echo "TIS620.2533 TIS-620" #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" @@ -266,8 +266,8 @@ case "$os" in echo "zh_TW.Big5 BIG5" echo "zh_CN.EUC GB2312" echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SJIS" - echo "ja_JP.Shift_JIS SJIS" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ja_JP.Shift_JIS SHIFT_JIS" echo "ko_KR.EUC EUC-KR" ;; beos*) diff --git a/libcharset/tools/all-charsets b/libcharset/tools/all-charsets index dba529f..bf7bdd3 100755 --- a/libcharset/tools/all-charsets +++ b/libcharset/tools/all-charsets @@ -22,7 +22,7 @@ do KOI8-R | KOI8-U | \ CP437 | CP775 | CP850 | CP852 | CP855 | CP856 | CP857 | CP861 | CP862 | CP864 | CP865 | CP866 | CP869 | CP874 | CP922 | CP932 | CP943 | CP949 | CP950 | CP1046 | CP1124 | CP1129 | \ CP1250 | CP1251 | CP1252 | CP1253 | CP1254 | CP1255 | CP1256 | CP1257 | \ - GB2312 | EUC-JP | EUC-KR | EUC-TW | BIG5 | BIG5HKSCS | GBK | GB18030 | SJIS | JOHAB | \ + GB2312 | EUC-JP | EUC-KR | EUC-TW | BIG5 | BIG5-HKSCS | GBK | GB18030 | SHIFT_JIS | JOHAB | \ TIS-620 | VISCII | \ HP-ROMAN8 | HP-ARABIC8 | HP-GREEK8 | HP-HEBREW8 | HP-TURKISH8 | HP-KANA8 | \ DEC-KANJI | DEC-HANYU | \ -- 2.11.4.GIT