--- a/CharacterEncoder.st	Wed Nov 21 19:57:52 2012 +0100
+++ b/CharacterEncoder.st	Thu Nov 22 13:39:56 2012 +0100
@@ -12,55 +12,55 @@
 "{ Package: 'stx:libbasic' }"
 
 Object subclass:#CharacterEncoder
-        instanceVariableNames:''
-        classVariableNames:'EncoderClassesByName EncodersByName CachedEncoders LastEncoder
-                AccessLock NullEncoderInstance Jis7KanjiEscapeSequence
-                Jis7RomanEscapeSequence JisISO2022EscapeSequence
-                Jis7KanjiOldEscapeSequence'
-        poolDictionaries:''
-        category:'Collections-Text-Encodings'
+	instanceVariableNames:''
+	classVariableNames:'EncoderClassesByName EncodersByName CachedEncoders LastEncoder
+		AccessLock NullEncoderInstance Jis7KanjiEscapeSequence
+		Jis7RomanEscapeSequence JisISO2022EscapeSequence
+		Jis7KanjiOldEscapeSequence'
+	poolDictionaries:''
+	category:'Collections-Text-Encodings'
 !
 
 CharacterEncoder subclass:#CompoundEncoder
-        instanceVariableNames:'decoder encoder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:'decoder encoder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#DefaultEncoder
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#InverseEncoder
-        instanceVariableNames:'decoder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:'decoder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#NullEncoder
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#OtherEncoding
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#TwoStepEncoder
-        instanceVariableNames:'encoder1 encoder2'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:CharacterEncoder
+	instanceVariableNames:'encoder1 encoder2'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:CharacterEncoder
 !
 
 !CharacterEncoder class methodsFor:'documentation'!
@@ -1642,6 +1642,13 @@
 
 !CharacterEncoder::TwoStepEncoder methodsFor:'queries'!
 
+characterSize:codePoint
+    "/ naive; actually, we have to do a real encoding to get this info proper
+    ^ (encoder2 characterSize:codePoint)
+
+    "Created: / 22-11-2012 / 13:07:47 / cg"
+!
+
 nameOfEncoding
     ^ "encoder1 nameOfEncoding , '-' ," encoder2 nameOfEncoding
 
@@ -1665,11 +1672,11 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.118 2012-07-13 12:46:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.119 2012-11-22 12:39:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.118 2012-07-13 12:46:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.119 2012-11-22 12:39:56 cg Exp $'
 ! !
 
 CharacterEncoder initialize!