diff -r 3548845d3c09 -r 66d1004f1806 CharacterEncoder.st
--- a/CharacterEncoder.st	Fri Mar 12 16:23:46 2004 +0100
+++ b/CharacterEncoder.st	Fri Mar 12 17:29:58 2004 +0100
@@ -481,6 +481,8 @@
 
         (JIS0208_to_EUC     jis0208     ( euc #'x-euc-jp' ))
 
+        (JIS0208_to_SJIS    jis0208     ( 'sjis' 'shiftjis' 'x-sjis' #'x-shift-jis' #'shift-jis'))
+
         (JIS0212            unicode     ( 'jis0212' ))
 
         (JOHAB              unicode     ( 'johab' ))
@@ -544,8 +546,6 @@
         (MS_Turkish         unicode     ( 'ms-turkish' 'ms-cp1254' 'microsoft-cp1254' 'cp1254' 'microsoft-turkish' 'windows-1254'  ))
 
         (NEXT               unicode     ( 'next' 'nextstep'  ))
-
-        (SJIS               unicode     ( 'sjis' 'shiftjis' 'x-sjis' #'x-shift-jis' #'shift-jis'))
     ) triplesDo:[:className :decodesTo :encodesTo |
         |dict|
 
@@ -839,36 +839,36 @@
      More than one external name may be mapped onto the same symbolic."
 
     ^ #( 
-	 ('utf8'        'Unicode as 8Bit characters'    )  
-	 ('utf7'        'Unicode as 7Bit characters'    ) 
-	 nil
-	 ('ascii'       'Common 7bit subset of iso8859' )
-	 ('iso8859-1'   'Latin1'                        )
-	 ('iso8859-2'   'Latin2'                        )
-	 ('iso8859-3'   'Latin3'                        )
-	 ('iso8859-4'   'Latin4'                        )
-	 ('iso8859-5'   'Cyrillic'                      )
-	 ('iso8859-6'   'Arabic'                        )
-	 ('iso8859-7'   'Greek'                         )
-	 ('iso8859-8'   'Hebrew'                        )
-	 nil
-	 ('koi7'        'Cyrillic (Old)'                )
-	 ('koi8-r'      'Cyrillic'                      )
-	 ('koi8-u'      'Cyrillic (Ukraine)'            )
-	 nil
-	 ('cp437'       'msdos US / codepage 437'       )
-	 ('cp850'       'msdos Latin1 codepage 850'     )
-	 ('mac'         'macintosh 8 bit'               )
-	 ('next'        'NeXT 8 bit'                    )
-	 ('hp'          'hpux 8 bit'                    )
-	 nil
-	 ('euc'         'EUC - extended unix code japanese'     )
-	 ('jis7'        'JIS7 - jis 7bit escape codes japanese' )
-	 ('iso-2022-jp' 'Same as jis 7bit'                      )
-	 ('sjis'        'SJIS - shift jis 8bit codes japanese'  )
-	 nil
-	 ('gb'          'GB - mainland chin'                    )
-	 ('big5'        'BIG5 - taiwan'                         )
+         ('utf8'        'Unicode as 8Bit characters'    )  
+"/         ('utf7'        'Unicode as 7Bit characters'    ) 
+"/       nil
+         ('ascii'       'Common 7bit subset of iso8859' )
+         ('iso8859-1'   'Latin1'                        )
+         ('iso8859-2'   'Latin2'                        )
+         ('iso8859-3'   'Latin3'                        )
+         ('iso8859-4'   'Latin4'                        )
+         ('iso8859-5'   'Cyrillic'                      )
+         ('iso8859-6'   'Arabic'                        )
+         ('iso8859-7'   'Greek'                         )
+         ('iso8859-8'   'Hebrew'                        )
+"/       nil
+         ('koi7'        'Cyrillic (Old)'                )
+         ('koi8-r'      'Cyrillic'                      )
+         ('koi8-u'      'Cyrillic (Ukraine)'            )
+"/       nil
+         ('cp437'       'msdos US / codepage 437'       )
+         ('cp850'       'msdos Latin1 codepage 850'     )
+"/         ('mac'         'macintosh 8 bit'               )
+         ('next'        'NeXT 8 bit'                    )
+"/         ('hp'          'hpux 8 bit'                    )
+"/       nil
+         ('euc'         'EUC - extended unix code (japanese)'     )
+         ('jis7'        'JIS7 - jis 7bit escape codes (japanese)' )
+         ('iso-2022-jp' 'Same as jis 7bit'                        )
+         ('sjis'        'SJIS - shift jis 8bit codes (japanese)'  )
+"/       nil
+         ('gb'          'GB - mainland china'                   )
+         ('big5'        'BIG5 - taiwan'                         )
 "/         ('ksc'         'korean'                        )
        )
 !
@@ -1250,7 +1250,7 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.73 2004-03-12 12:44:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.74 2004-03-12 16:29:58 cg Exp $'
 ! !
 
 CharacterEncoder initialize!