--- a/CharacterEncoder.st	Fri Feb 20 11:45:15 2004 +0100
+++ b/CharacterEncoder.st	Fri Feb 20 13:44:24 2004 +0100
@@ -646,7 +646,14 @@
     |enc cls lcName name|
 
     encodingNameSymbol includesMatchCharacters ifTrue:[
-        self halt.
+        self allSubclassesDo:[:cls |
+            cls nameOfDecodedCode == #'unicode' ifTrue:[
+                (cls namesOfEncoding contains:[:any | encodingNameSymbol matches:any]) ifTrue:[
+                    ^ cls new.
+                ]
+            ].
+        ].
+        ^ exceptionValue value
     ].
 
     lcName := encodingNameSymbol asLowercase asSymbolIfInterned.
@@ -1022,7 +1029,7 @@
 !
 
 nameOfEncoding
-    ^ self nameWithoutPrefix asLowercase asSymbol
+    ^ (self nameWithoutPrefix asLowercase copyReplaceAll:$_ with:$-) asSymbol
 !
 
 namesOfEncoding
@@ -53124,7 +53131,7 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.31 2004-02-20 10:45:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.32 2004-02-20 12:44:24 cg Exp $'
 ! !
 
 CharacterEncoder initialize!