--- a/CharacterEncoder.st	Thu Feb 07 09:53:25 2013 +0100
+++ b/CharacterEncoder.st	Tue Mar 05 18:10:13 2013 +0000
@@ -213,6 +213,7 @@
 "
 ! !
 
+
 !CharacterEncoder class methodsFor:'instance creation'!
 
 encoderFor:encodingNameSymbol
@@ -518,6 +519,7 @@
     "Modified: / 12-07-2012 / 19:45:15 / cg"
 ! !
 
+
 !CharacterEncoder class methodsFor:'Compatibility-ST80'!
 
 encoderNamed: encoderName
@@ -537,18 +539,20 @@
     "Modified: 20.6.1997 / 17:38:40 / cg"
 ! !
 
+
 !CharacterEncoder class methodsFor:'accessing'!
 
 nullEncoderInstance
     ^ NullEncoderInstance
 ! !
 
+
 !CharacterEncoder class methodsFor:'class initialization'!
 
 initialize
     |ud|
 
-    AccessLock := RecursionLock new.
+    AccessLock := RecursionLock new name:'CharacterEncoder'.
     NullEncoderInstance := NullEncoder new.
 
     EncodersByName := Dictionary new.
@@ -719,6 +723,7 @@
     "Modified (format): / 23-01-2013 / 09:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !CharacterEncoder class methodsFor:'constants'!
 
 jis7KanjiEscapeSequence
@@ -764,6 +769,7 @@
     ^ JisISO2022EscapeSequence.
 ! !
 
+
 !CharacterEncoder class methodsFor:'encoding & decoding'!
 
 decode:aCodePoint
@@ -870,6 +876,7 @@
     "
 ! !
 
+
 !CharacterEncoder class methodsFor:'private'!
 
 flushCode
@@ -887,6 +894,7 @@
     "
 ! !
 
+
 !CharacterEncoder class methodsFor:'private-mapping setup'!
 
 generateCode
@@ -937,6 +945,7 @@
     ^ 'http://std.dkuug.dk/i18n/charmaps/' , rel
 ! !
 
+
 !CharacterEncoder class methodsFor:'queries'!
 
 isEncoding:subSetEncodingArg subSetOf:superSetEncodingArg
@@ -1040,6 +1049,7 @@
     ^ self nameOfEncoding asUppercaseFirst
 ! !
 
+
 !CharacterEncoder class methodsFor:'testing'!
 
 isAbstract
@@ -1050,6 +1060,7 @@
     ^ self == CharacterEncoder
 ! !
 
+
 !CharacterEncoder class methodsFor:'utilities'!
 
 guessEncodingOfBuffer:buffer
@@ -1235,6 +1246,7 @@
     "
 ! !
 
+
 !CharacterEncoder methodsFor:'encoding & decoding'!
 
 decode:anEncoding
@@ -1311,6 +1323,7 @@
     ^ newString
 ! !
 
+
 !CharacterEncoder methodsFor:'error handling'!
 
 decodingError 
@@ -1367,6 +1380,7 @@
     "Modified: / 12-07-2012 / 20:36:37 / cg"
 ! !
 
+
 !CharacterEncoder methodsFor:'printing'!
 
 printOn:aStream
@@ -1376,12 +1390,14 @@
         nextPutAll:(self nameOfEncoding)
 ! !
 
+
 !CharacterEncoder methodsFor:'private'!
 
 newString:size
     self subclassResponsibility
 ! !
 
+
 !CharacterEncoder methodsFor:'queries'!
 
 characterSize:codePoint
@@ -1411,6 +1427,7 @@
     ^ self class userFriendlyNameOfEncoding
 ! !
 
+
 !CharacterEncoder methodsFor:'stream support'!
 
 readNext:charactersToRead charactersFrom:stream 
@@ -1436,6 +1453,7 @@
     ^ aStream next
 ! !
 
+
 !CharacterEncoder::CompoundEncoder class methodsFor:'documentation'!
 
 documentation
@@ -1455,6 +1473,7 @@
 "
 ! !
 
+
 !CharacterEncoder::CompoundEncoder methodsFor:'accessing'!
 
 encoder:encoderArg decoder:decoderArg  
@@ -1464,6 +1483,7 @@
     encoder := encoderArg.
 ! !
 
+
 !CharacterEncoder::CompoundEncoder methodsFor:'encoding & decoding'!
 
 decode:aCode
@@ -1482,6 +1502,7 @@
     ^ encoder encodeString:(decoder decodeString:aString)
 ! !
 
+
 !CharacterEncoder::CompoundEncoder methodsFor:'printing'!
 
 printOn:aStream
@@ -1494,6 +1515,7 @@
     encoder printOn:aStream
 ! !
 
+
 !CharacterEncoder::DefaultEncoder class methodsFor:'documentation'!
 
 documentation
@@ -1502,6 +1524,7 @@
 "
 ! !
 
+
 !CharacterEncoder::InverseEncoder class methodsFor:'documentation'!
 
 documentation
@@ -1511,12 +1534,14 @@
 "
 ! !
 
+
 !CharacterEncoder::InverseEncoder methodsFor:'accessing'!
 
 decoder:something
     decoder := something.
 ! !
 
+
 !CharacterEncoder::InverseEncoder methodsFor:'encoding & decoding'!
 
 decode:aCode
@@ -1535,6 +1560,7 @@
     ^ decoder decodeString:aString
 ! !
 
+
 !CharacterEncoder::InverseEncoder methodsFor:'printing'!
 
 printOn:aStream
@@ -1544,18 +1570,21 @@
         nextPutAll:(decoder nameOfDecodedCode)
 ! !
 
+
 !CharacterEncoder::InverseEncoder methodsFor:'queries'!
 
 characterSize:charOrcodePoint
     ^ decoder characterSize:charOrcodePoint
 ! !
 
+
 !CharacterEncoder::InverseEncoder methodsFor:'stream support'!
 
 readNextInputCharacterFrom:aStream
     ^ decoder readNextInputCharacterFrom:aStream
 ! !
 
+
 !CharacterEncoder::NullEncoder class methodsFor:'documentation'!
 
 documentation
@@ -1564,6 +1593,7 @@
 "
 ! !
 
+
 !CharacterEncoder::NullEncoder methodsFor:'encoding & decoding'!
 
 decode:aCode
@@ -1582,12 +1612,14 @@
     ^ aString
 ! !
 
+
 !CharacterEncoder::NullEncoder methodsFor:'queries'!
 
 isNullEncoder
     ^ true
 ! !
 
+
 !CharacterEncoder::OtherEncoding class methodsFor:'private'!
 
 flushCode
@@ -1596,6 +1628,7 @@
 generateEncoderCode
 ! !
 
+
 !CharacterEncoder::TwoStepEncoder class methodsFor:'documentation'!
 
 documentation
@@ -1608,6 +1641,7 @@
 "
 ! !
 
+
 !CharacterEncoder::TwoStepEncoder methodsFor:'accessing'!
 
 encoder1:encoder1Arg encoder2:encoder2Arg
@@ -1617,6 +1651,7 @@
     encoder2 := encoder2Arg.
 ! !
 
+
 !CharacterEncoder::TwoStepEncoder methodsFor:'encoding & decoding'!
 
 decode:aCode
@@ -1635,6 +1670,7 @@
     ^ encoder2 encodeString:(encoder1 encodeString:aString)
 ! !
 
+
 !CharacterEncoder::TwoStepEncoder methodsFor:'printing'!
 
 printOn:aStream
@@ -1646,6 +1682,7 @@
         nextPutAll:(encoder2 nameOfEncoding)
 ! !
 
+
 !CharacterEncoder::TwoStepEncoder methodsFor:'queries'!
 
 characterSize:codePoint
@@ -1675,14 +1712,15 @@
 
 ! !
 
+
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.120 2012-12-12 22:57:59 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.121 2013-02-08 19:02:11 stefan Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.120 2012-12-12 22:57:59 stefan Exp §'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.121 2013-02-08 19:02:11 stefan Exp $'
 !
 
 version_HG