--- a/CharacterEncoder.st	Wed Feb 11 17:31:45 2004 +0100
+++ b/CharacterEncoder.st	Wed Feb 11 18:32:34 2004 +0100
@@ -535,6 +535,17 @@
 "
 ! !
 
+!CharacterEncoder class methodsFor:'instance creation'!
+
+new
+    "singleton - there is only one"
+
+    mySingleInstance isNil ifTrue:[
+	mySingleInstance := self basicNew initialize.
+    ].
+    ^ mySingleInstance
+! !
+
 !CharacterEncoder class methodsFor:'class initialization'!
 
 initialize
@@ -671,15 +682,6 @@
     "
      self flushSingletons
     "
-!
-
-new
-    "singleton - there is only one"
-
-    mySingleInstance isNil ifTrue:[
-	mySingleInstance := self basicNew initialize.
-    ].
-    ^ mySingleInstance
 ! !
 
 !CharacterEncoder class methodsFor:'private-mapping setup'!
@@ -10847,8 +10849,6 @@
 
     |code "{ Class: SmallInteger }"|
 
-self halt.
-
     code := codeArg.
     code <= 16r813F ifTrue:[
         ^ self decodingError.
@@ -40596,10 +40596,10 @@
 
     unicode := unicodeArg.
     unicode <= 16r403 ifTrue:[
-        ^ super encode:codeArg.
+        ^ super encode:unicodeArg.
     ].
     unicode > 16r256B ifTrue:[
-        ^ super encode:codeArg.
+        ^ super encode:unicodeArg.
     ].
     unicode <= 16r491 ifTrue:[
         unicode <= 16r457 ifTrue:[
@@ -49717,7 +49717,7 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.8 2004-02-11 16:31:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.9 2004-02-11 17:32:34 cg Exp $'
 ! !
 
 CharacterEncoder initialize!