--- a/CharacterArray.st	Fri Feb 06 00:00:22 2004 +0100
+++ b/CharacterArray.st	Fri Feb 06 00:53:07 2004 +0100
@@ -725,6 +725,9 @@
 
     ^ #( 
          (
+          'utf8         (unicode as 8Bit characters)'  
+          'utf7         (unicode as 7Bit characters)'  
+          nil
           'iso8859      (ansi)'  
           'iso8859-1    (latin1)'  
           'iso8859-2    (latin2)'  
@@ -734,6 +737,7 @@
           'iso8859-6    (arabic)'  
           'iso8859-7    (greek)'  
           'iso8859-8    (hebrew)'  
+          nil
           'msdos US     (codepage 437)'  
           'msdos Latin1 (codepage 850)'  
           'macintosh    (8 bit)' 
@@ -750,6 +754,9 @@
 "/          'KSC          (korean)'
          )
          (
+          #'utf8'  
+          #'utf7'  
+          nil
           #'iso8859'
           #'iso8859-1'    "/ latin1
           #'iso8859-2'    "/ latin2
@@ -759,6 +766,7 @@
           #'iso8859-6'    "/ arabic
           #'iso8859-7'    "/ greek
           #'iso8859-8'    "/ hebrew
+          nil
           #'msdos437'                   
           #'msdos850'                   
           #'mac'         
@@ -1756,6 +1764,10 @@
     "Modified: 16.7.1997 / 11:30:45 / cg"
 !
 
+encodeIntoUTF8:aString
+    ^ aString utf8Encoded
+!
+
 encodeRomans:aTwoByteString
     "return a new (usually 2-byte) string with roman characters
      encoded. The position of roman characters are encoding specific.
@@ -3623,7 +3635,7 @@
 asFilename
     "return a Filename with pathname taken from the receiver"
 
-    ^ Filename named:self string
+    ^ Filename named:self "(self asSingleByteStringReplaceInvalidWith:$?)"
 
     "Modified: 20.5.1996 / 09:38:15 / cg"
 !
@@ -6620,7 +6632,7 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.266 2004-02-05 22:37:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.267 2004-02-05 23:53:07 cg Exp $'
 ! !
 
 CharacterArray initialize!