naruse	2011-03-09 11:54:40 +0900 (Wed, 09 Mar 2011)

  New Revision: 31073

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31073

  Log:
    * enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
    
    * enc/shift_jis.c: Add PCK as an alias of Windows-31J.

  Modified files:
    trunk/ChangeLog
    trunk/enc/shift_jis.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31072)
+++ ChangeLog	(revision 31073)
@@ -1,3 +1,9 @@
+Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@r...>
+
+	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
+
+	* enc/shift_jis.c: Add PCK as an alias of Windows-31J.
+
 Wed Mar  9 00:45:29 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/extmk.rb: nmake substitutes all occurences in macro.
Index: enc/shift_jis.c
===================================================================
--- enc/shift_jis.c	(revision 31072)
+++ enc/shift_jis.c	(revision 31073)
@@ -382,7 +382,6 @@
  * Link: http://www.iana.org/assignments/character-sets
  * Link: http://ja.wikipedia.org/wiki/Shift_JIS
  */
-ENC_ALIAS("SJIS", "Shift_JIS")
 
 /*
  * Name: Windows-31J
@@ -391,12 +390,29 @@
  * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
  * Link: http://ja.wikipedia.org/wiki/Windows-31J
  * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
+ *
+ * Windows Standard Character Set and its mapping to Unicode by Microsoft.
+ * Since 1.9.3, SJIS is the alias of Windows-31J because its character
+ * set is usually this one even if its mapping may differ.
  */
 ENC_REPLICATE("Windows-31J", "Shift_JIS")
 ENC_ALIAS("CP932", "Windows-31J")
 ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */
+ENC_ALIAS("SJIS", "Windows-31J")
 
 /*
+ * Name: PCK
+ * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/x-2chn0/index.html
+ * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/appb-pckwarn-1/index.html
+ *
+ * Solaris's SJIS variant. Its set is Windows Standard Character Set; it
+ * consists JIS X 0201 Latin (US-ASCII), JIS X 0201 Katakana, JIS X 0208, NEC
+ * special characters, NEC-selected IBM extended characters, and IBM extended
+ * characters. Solaris's iconv seems to use SJIS-open.
+ */
+ENC_ALIAS("PCK", "Windows-31J")
+
+/*
  * Name: MacJapanese
  * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
  * Link: http://ja.wikipedia.org/wiki/MacJapanese

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/