- CharacterEncoderImplementations::ISO8859_13 jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 07 Sep 2012 11:49:18 +0100
branchjv
changeset 17964 fb0bbcbb6f83
parent 17963 2b9f744b4b11
child 17965 a8a04402986c
- CharacterEncoderImplementations::ISO8859_13 added: #version_SVN - Method changed: #version_SVN - UninterpretedBytes added: #version_SVN - CharacterEncoderImplementations::ISO10646_to_UTF16LE added: #version_SVN - Class changed: #version_SVN - CharacterEncoderImplementations::ISO8859_10 added: #version_SVN - CharacterEncoderImplementations::ISO8859_16 added: #version_SVN - CharacterEncoderImplementations::ISO8859_8 added: #version_SVN - CharacterEncoderImplementations::CP437 added: #version_SVN - CharacterEncoderImplementations::MS_Hebrew added: #version_SVN - stx_libbasic changed: #version_SVN - String added: #version_SVN - SmalltalkChunkFileSourceWriter changed: #fileOutMethods:on: #fileOutPackageDefinition:on: - CharacterEncoderImplementations::ISO8859_11 added: #version_SVN - CharacterEncoderImplementations::ISO8859_4 added: #version_SVN - CharacterEncoderImplementations::ISO8859_6 added: #version_SVN - ProjectDefinition changed: #extensionMethodNames_code_ignoreOldEntries: - CharacterEncoderImplementations::KOI8_U added: #version_SVN - CharacterEncoderImplementations::MS_EastEuropean added: #version_SVN - CharacterEncoderImplementations::MS_Arabic added: #version_SVN - CharacterEncoderImplementations::ISO8859_14 added: #version_SVN - CharacterEncoderImplementations::ISO8859_9 added: #version_SVN - CharacterEncoderImplementations::MS_Turkish added: #version_SVN - CharacterEncoderImplementations::ISO8859_3 added: #version_SVN - CharacterEncoderImplementations::MS_Symbol added: #version_SVN
CharacterEncoderImplementations__CP437.st
CharacterEncoderImplementations__ISO10646_to_UTF16LE.st
CharacterEncoderImplementations__ISO8859_10.st
CharacterEncoderImplementations__ISO8859_11.st
CharacterEncoderImplementations__ISO8859_13.st
CharacterEncoderImplementations__ISO8859_14.st
CharacterEncoderImplementations__ISO8859_16.st
CharacterEncoderImplementations__ISO8859_3.st
CharacterEncoderImplementations__ISO8859_4.st
CharacterEncoderImplementations__ISO8859_6.st
CharacterEncoderImplementations__ISO8859_8.st
CharacterEncoderImplementations__ISO8859_9.st
CharacterEncoderImplementations__KOI8_U.st
CharacterEncoderImplementations__MS_Arabic.st
CharacterEncoderImplementations__MS_EastEuropean.st
CharacterEncoderImplementations__MS_Hebrew.st
CharacterEncoderImplementations__MS_Symbol.st
CharacterEncoderImplementations__MS_Turkish.st
Class.st
Make.proto
Make.spec
Method.st
ProjectDefinition.st
SmalltalkChunkFileSourceWriter.st
String.st
UninterpretedBytes.st
abbrev.stc
bc.mak
libInit.cc
libbasic.rc
stx_libbasic.st
--- a/CharacterEncoderImplementations__CP437.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__CP437.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -933,8 +932,9 @@
 !CP437 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__CP437.st,v 1.4 2005/03/31 18:12:18 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__CP437.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__CP437.st 10842 2012-09-07 10:49:18Z vranyj1                                           $'
+! !
--- a/CharacterEncoderImplementations__ISO10646_to_UTF16LE.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO10646_to_UTF16LE.st	Fri Sep 07 11:49:18 2012 +0100
@@ -91,8 +91,9 @@
 !ISO10646_to_UTF16LE class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO10646_to_UTF16LE.st,v 1.3 2012/07/10 07:55:26 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO10646_to_UTF16LE.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO10646_to_UTF16LE.st 10842 2012-09-07 10:49:18Z vranyj1                             $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_10.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_10.st	Fri Sep 07 11:49:18 2012 +0100
@@ -739,8 +739,9 @@
 !ISO8859_10 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_10.st,v 1.5 2012/07/11 16:42:51 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_10.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_10.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_11.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_11.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -596,8 +595,9 @@
 !ISO8859_11 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_11.st,v 1.4 2005/03/31 18:12:32 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_11.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_11.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_13.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_13.st	Fri Sep 07 11:49:18 2012 +0100
@@ -742,8 +742,9 @@
 !ISO8859_13 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_13.st,v 1.5 2012/07/11 16:43:18 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_13.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_13.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_14.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_14.st	Fri Sep 07 11:49:18 2012 +0100
@@ -785,8 +785,9 @@
 !ISO8859_14 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_14.st,v 1.5 2012/07/11 16:43:17 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_14.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_14.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_16.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_16.st	Fri Sep 07 11:49:18 2012 +0100
@@ -728,8 +728,9 @@
 !ISO8859_16 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_16.st,v 1.5 2012/07/11 16:43:10 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_16.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_16.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_3.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_3.st	Fri Sep 07 11:49:18 2012 +0100
@@ -703,8 +703,9 @@
 !ISO8859_3 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_3.st,v 1.5 2012/07/11 16:43:09 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_3.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_3.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_4.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_4.st	Fri Sep 07 11:49:18 2012 +0100
@@ -754,8 +754,9 @@
 !ISO8859_4 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_4.st,v 1.5 2012/07/11 16:43:07 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_4.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_4.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_6.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_6.st	Fri Sep 07 11:49:18 2012 +0100
@@ -551,8 +551,9 @@
 !ISO8859_6 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_6.st,v 1.5 2012/07/11 16:43:13 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_6.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_6.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_8.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_8.st	Fri Sep 07 11:49:18 2012 +0100
@@ -555,8 +555,9 @@
 !ISO8859_8 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_8.st,v 1.5 2012/07/11 16:43:21 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_8.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_8.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__ISO8859_9.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__ISO8859_9.st	Fri Sep 07 11:49:18 2012 +0100
@@ -450,8 +450,9 @@
 !ISO8859_9 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__ISO8859_9.st,v 1.5 2012/07/11 16:43:15 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__ISO8859_9.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__ISO8859_9.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__KOI8_U.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__KOI8_U.st	Fri Sep 07 11:49:18 2012 +0100
@@ -416,8 +416,9 @@
 !KOI8_U class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__KOI8_U.st,v 1.4 2012/07/11 16:43:20 stefan Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__KOI8_U.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__KOI8_U.st 10842 2012-09-07 10:49:18Z vranyj1                                          $'
+! !
--- a/CharacterEncoderImplementations__MS_Arabic.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__MS_Arabic.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -839,8 +838,9 @@
 !MS_Arabic class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__MS_Arabic.st,v 1.4 2005/03/31 18:48:44 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__MS_Arabic.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__MS_Arabic.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__MS_EastEuropean.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__MS_EastEuropean.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -813,8 +812,9 @@
 !MS_EastEuropean class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__MS_EastEuropean.st,v 1.4 2005/03/31 18:48:47 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__MS_EastEuropean.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__MS_EastEuropean.st 10842 2012-09-07 10:49:18Z vranyj1                                 $'
+! !
--- a/CharacterEncoderImplementations__MS_Hebrew.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__MS_Hebrew.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -607,8 +606,9 @@
 !MS_Hebrew class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__MS_Hebrew.st,v 1.4 2005/03/31 18:48:50 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__MS_Hebrew.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__MS_Hebrew.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__MS_Symbol.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__MS_Symbol.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -88,8 +87,9 @@
 !MS_Symbol class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__MS_Symbol.st,v 1.5 2005/03/31 18:48:55 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__MS_Symbol.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__MS_Symbol.st 10842 2012-09-07 10:49:18Z vranyj1                                       $'
+! !
--- a/CharacterEncoderImplementations__MS_Turkish.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/CharacterEncoderImplementations__MS_Turkish.st	Fri Sep 07 11:49:18 2012 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic' }"
 
 "{ NameSpace: CharacterEncoderImplementations }"
@@ -819,8 +818,9 @@
 !MS_Turkish class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoderImplementations__MS_Turkish.st,v 1.5 2005/03/31 18:49:37 cg Exp $'
-! !
+    ^ '$Id: CharacterEncoderImplementations__MS_Turkish.st 10842 2012-09-07 10:49:18Z vranyj1 $'
+!
 
-
-
+version_SVN
+    ^ '$Id:: CharacterEncoderImplementations__MS_Turkish.st 10842 2012-09-07 10:49:18Z vranyj1                                      $'
+! !
--- a/Class.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/Class.st	Fri Sep 07 11:49:18 2012 +0100
@@ -21,7 +21,7 @@
 	category:'Kernel-Classes'
 !
 
-Array subclass:#ArrayWithSequenceNumberValidation
+Array variableSubclass:#ArrayWithSequenceNumberValidation
 	instanceVariableNames:'sequenceNumber'
 	classVariableNames:''
 	poolDictionaries:''
@@ -447,6 +447,9 @@
     "Modified: 23.4.1996 / 15:56:58 / cg"
 ! !
 
+
+
+
 !Class methodsFor:'Compatibility-Dolphin'!
 
 defaultCategoryForDolphinClasses
@@ -629,6 +632,7 @@
     "Created: / 18.6.1998 / 22:08:45 / cg"
 ! !
 
+
 !Class methodsFor:'accessing'!
 
 addChangeRecordForClass:aClass andNotifyChangeOf:aspect
@@ -1844,9 +1848,9 @@
     ]
 
     "Modified: / 20.6.1998 / 18:17:37 / cg"
-!
-
- !
+! !
+
+
 
 !Class methodsFor:'adding & removing'!
 
@@ -1935,6 +1939,7 @@
     "Modified: 4.6.1997 / 14:48:02 / cg"
 ! !
 
+
 !Class methodsFor:'changes management'!
 
 addChangeRecordForChangeCategory
@@ -3281,6 +3286,7 @@
     "
 ! !
 
+
 !Class methodsFor:'printOut'!
 
 htmlDocumentation
@@ -5554,7 +5560,7 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.607 2012/07/22 09:10:54 cg Exp $'
+    ^ '$Id: Class.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
@@ -5562,5 +5568,5 @@
 !
 
 version_SVN
-    ^ '$ Id: Class.st 10643 2011-06-08 21:53:07Z vranyj1  $'
+    ^ '$Id:: Class.st 10842 2012-09-07 10:49:18Z vranyj1                                                                            $'
 ! !
--- a/Make.proto	Wed Sep 05 00:27:33 2012 +0100
+++ b/Make.proto	Fri Sep 07 11:49:18 2012 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.253 2012/07/11 16:41:39 stefan Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -79,12 +79,15 @@
 	fi
 
 stx_libbasic.o: stx_libbasic.st .svnversion 
-	if [ -d .svn ]; then \
+	@if [ -d .svn ]; then \
 		rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+		echo "  [SV]  Expanding svnRevisionNo in $1.st"; \
 		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libbasic.svn.st; \
 	fi
-	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic.svn $(O_RULE);
-	mv .stx_libbasic.svn.$(O) stx_libbasic.$(O) 
+	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic.svn $(C_RULE);
+	sed -i -e "s/\".stx_libbasic.svn.st\");/\"\stx_libbasic.st\");/g" .stx_libbasic.svn.c
+	$(MAKE) .stx_libbasic.svn.$(O)
+	@mv .stx_libbasic.svn.$(O) stx_libbasic.$(O) 
 endif
 
 
@@ -218,7 +221,6 @@
 $(OUTDIR)Association.$(O) Association.$(H): Association.st $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Block.$(O) Block.$(H): Block.st $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ASCII.$(O) CharacterEncoderImplementations__ASCII.$(H): CharacterEncoderImplementations__ASCII.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__CP437.$(O) CharacterEncoderImplementations__CP437.$(H): CharacterEncoderImplementations__CP437.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__EBCDIC.$(O) CharacterEncoderImplementations__EBCDIC.$(H): CharacterEncoderImplementations__EBCDIC.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(O) CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(H): CharacterEncoderImplementations__ISO10646_to_UTF16BE.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF8.$(O) CharacterEncoderImplementations__ISO10646_to_UTF8.$(H): CharacterEncoderImplementations__ISO10646_to_UTF8.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -335,7 +337,6 @@
 $(OUTDIR)AssertionFailedError.$(O) AssertionFailedError.$(H): AssertionFailedError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)AutoloadMetaclass.$(O) AutoloadMetaclass.$(H): AutoloadMetaclass.st $(INCLUDE_TOP)/stx/libbasic/Metaclass.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Association.$(H) $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
 $(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -380,6 +381,7 @@
 $(OUTDIR)ArgumentError.$(O) ArgumentError.$(H): ArgumentError.st $(INCLUDE_TOP)/stx/libbasic/ExecutionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CannotResumeError.$(O) CannotResumeError.$(H): CannotResumeError.st $(INCLUDE_TOP)/stx/libbasic/ContextError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CannotReturnError.$(O) CannotReturnError.$(H): CannotReturnError.st $(INCLUDE_TOP)/stx/libbasic/ContextError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderError.$(O) CharacterEncoderError.$(H): CharacterEncoderError.st $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DateConversionError.$(O) DateConversionError.$(H): DateConversionError.st $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DomainError.$(O) DomainError.$(H): DomainError.st $(INCLUDE_TOP)/stx/libbasic/ArithmeticError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -405,9 +407,7 @@
 $(OUTDIR)ReadError.$(O) ReadError.$(H): ReadError.st $(INCLUDE_TOP)/stx/libbasic/StreamError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)StreamIOError.$(O) StreamIOError.$(H): StreamIOError.st $(INCLUDE_TOP)/stx/libbasic/StreamError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)StreamNotOpenError.$(O) StreamNotOpenError.$(H): StreamNotOpenError.st $(INCLUDE_TOP)/stx/libbasic/StreamError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)String.$(O) String.$(H): String.st $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)TimeConversionError.$(O) TimeConversionError.$(H): TimeConversionError.st $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnorderedNumbersError.$(O) UnorderedNumbersError.$(H): UnorderedNumbersError.st $(INCLUDE_TOP)/stx/libbasic/ArithmeticError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnprotectedExternalBytes.$(O) UnprotectedExternalBytes.$(H): UnprotectedExternalBytes.st $(INCLUDE_TOP)/stx/libbasic/ExternalBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)WeakDependencyDictionary.$(O) WeakDependencyDictionary.$(H): WeakDependencyDictionary.st $(INCLUDE_TOP)/stx/libbasic/WeakIdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -418,7 +418,6 @@
 $(OUTDIR)EncodingError.$(O) EncodingError.$(H): EncodingError.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderError.$(H) $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)FileDoesNotExistException.$(O) FileDoesNotExistException.$(H): FileDoesNotExistException.st $(INCLUDE_TOP)/stx/libbasic/OpenError.$(H) $(INCLUDE_TOP)/stx/libbasic/StreamError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)FileStream.$(O) FileStream.$(H): FileStream.st $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ImmutableString.$(O) ImmutableString.$(H): ImmutableString.st $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidByteCodeError.$(O) InvalidByteCodeError.$(H): InvalidByteCodeError.st $(INCLUDE_TOP)/stx/libbasic/InvalidCodeError.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidInstructionError.$(O) InvalidInstructionError.$(H): InvalidInstructionError.st $(INCLUDE_TOP)/stx/libbasic/InvalidCodeError.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidReadError.$(O) InvalidReadError.$(H): InvalidReadError.st $(INCLUDE_TOP)/stx/libbasic/ReadError.$(H) $(INCLUDE_TOP)/stx/libbasic/StreamError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -427,16 +426,19 @@
 $(OUTDIR)NonIntegerIndexError.$(O) NonIntegerIndexError.$(H): NonIntegerIndexError.st $(INCLUDE_TOP)/stx/libbasic/IndexNotFoundError.$(H) $(INCLUDE_TOP)/stx/libbasic/NotFoundError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)NonPositionableExternalStream.$(O) NonPositionableExternalStream.$(H): NonPositionableExternalStream.st $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)OverflowError.$(O) OverflowError.$(H): OverflowError.st $(INCLUDE_TOP)/stx/libbasic/RangeError.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)String.$(O) String.$(H): String.st $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SubscriptOutOfBoundsError.$(O) SubscriptOutOfBoundsError.$(H): SubscriptOutOfBoundsError.st $(INCLUDE_TOP)/stx/libbasic/IndexNotFoundError.$(H) $(INCLUDE_TOP)/stx/libbasic/NotFoundError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Symbol.$(O) Symbol.$(H): Symbol.st $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnderflowError.$(O) UnderflowError.$(H): UnderflowError.st $(INCLUDE_TOP)/stx/libbasic/RangeError.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)/stx/libbasic/TwoByteString.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)WrongNumberOfArgumentsError.$(O) WrongNumberOfArgumentsError.$(H): WrongNumberOfArgumentsError.st $(INCLUDE_TOP)/stx/libbasic/ArgumentError.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ZeroDivide.$(O) ZeroDivide.$(H): ZeroDivide.st $(INCLUDE_TOP)/stx/libbasic/DomainError.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterRangeError.$(O) CharacterRangeError.$(H): CharacterRangeError.st $(INCLUDE_TOP)/stx/libbasic/DecodingError.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderError.$(H) $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DirectoryStream.$(O) DirectoryStream.$(H): DirectoryStream.st $(INCLUDE_TOP)/stx/libbasic/FileStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ImmutableString.$(O) ImmutableString.$(H): ImmutableString.st $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidEncodingError.$(O) InvalidEncodingError.$(H): InvalidEncodingError.st $(INCLUDE_TOP)/stx/libbasic/DecodingError.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderError.$(H) $(INCLUDE_TOP)/stx/libbasic/ConversionError.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)PipeStream.$(O) PipeStream.$(H): PipeStream.st $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Symbol.$(O) Symbol.$(H): Symbol.st $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)/stx/libbasic/TwoByteString.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnixDesktop.$(O) UnixDesktop.$(H): UnixDesktop.st $(INCLUDE_TOP)/stx/libbasic/AbstractDesktop.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnixFileDescriptorHandle.$(O) UnixFileDescriptorHandle.$(H): UnixFileDescriptorHandle.st $(INCLUDE_TOP)/stx/libbasic/OSFileHandle.$(H) $(INCLUDE_TOP)/stx/libbasic/OSHandle.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UnixFileHandle.$(O) UnixFileHandle.$(H): UnixFileHandle.st $(INCLUDE_TOP)/stx/libbasic/OSFileHandle.$(H) $(INCLUDE_TOP)/stx/libbasic/OSHandle.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Wed Sep 05 00:27:33 2012 +0100
+++ b/Make.spec	Fri Sep 07 11:49:18 2012 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.134 2012/07/11 17:13:03 stefan Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -68,10 +68,9 @@
 	Behavior \
 	Boolean \
 	CharacterEncoder \
-	CharacterEncoderImplementations::SingleByteEncoder \
 	CharacterEncoderImplementations::TwoByteEncoder \
 	CharacterEncoderImplementations::ISO10646_to_UTF16BE \
-	CharacterEncoderImplementations::ISO8859_10 \
+	CharacterEncoderImplementations::SingleByteEncoder \
 	CharacterEncoderImplementations::ISO8859_11 \
 	CharacterEncoderImplementations::ISO8859_13 \
 	CharacterEncoderImplementations::ISO8859_14 \
@@ -141,7 +140,7 @@
 	CachingRegistry \
 	Character \
 	CharacterEncoderImplementations::ISO10646_1 \
-	CharacterEncoderImplementations::CP437 \
+	CharacterEncoderImplementations::ISO8859_10 \
 	CharacterEncoderImplementations::ISO10646_to_UTF16LE \
 	CompiledCode \
 	ControlInterrupt \
@@ -377,6 +376,7 @@
 	FileDoesNotExistException \
 	MiniLogger \
 	PolymorphicInlineCache \
+
 WIN32_CLASSES= \
 	Win32Process \
 	WindowsDesktop \
@@ -386,10 +386,6 @@
 	Win32Constants \
 	Win32OperatingSystem \
 
-UNIX_CLASSES= \
-       UnixFileDescriptorHandle \
-       UnixFileHandle \
-       UnixOperatingSystem \
 
 
 
@@ -412,10 +408,9 @@
     $(OUTDIR)Behavior.$(O) \
     $(OUTDIR)Boolean.$(O) \
     $(OUTDIR)CharacterEncoder.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__SingleByteEncoder.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__TwoByteEncoder.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__ISO8859_10.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__SingleByteEncoder.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO8859_11.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO8859_13.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO8859_14.$(O) \
@@ -485,7 +480,7 @@
     $(OUTDIR)CachingRegistry.$(O) \
     $(OUTDIR)Character.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO10646_1.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__CP437.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_10.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF16LE.$(O) \
     $(OUTDIR)CompiledCode.$(O) \
     $(OUTDIR)ControlInterrupt.$(O) \
@@ -730,3 +725,6 @@
     $(OUTDIR)Win32FILEHandle.$(O) \
     $(OUTDIR)Win32Constants.$(O) \
     $(OUTDIR)Win32OperatingSystem.$(O) \
+
+
+
--- a/Method.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/Method.st	Fri Sep 07 11:49:18 2012 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libbasic' }"
 
-CompiledCode subclass:#Method
+CompiledCode variableSubclass:#Method
 	instanceVariableNames:'source sourcePosition category package mclass lookupObject
 		annotations'
 	classVariableNames:'PrivateMethodSignal LastFileReference LastSourceFileName
@@ -219,6 +219,7 @@
     ^ PrivateMethodSignal
 ! !
 
+
 !Method class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -413,6 +414,7 @@
     ^ self sends:aSelectorSymbol
 ! !
 
+
 !Method methodsFor:'accessing'!
 
 annotateWith: annotation
@@ -969,6 +971,7 @@
     "Modified: 16.1.1997 / 01:28:25 / cg"
 ! !
 
+
 !Method methodsFor:'accessing-visibility'!
 
 isIgnored
@@ -1439,6 +1442,7 @@
     ^ temporaryMethod
 ! !
 
+
 !Method methodsFor:'copying'!
 
 copy
@@ -1855,6 +1859,7 @@
     "Modified: 4.11.1996 / 22:58:28 / cg"
 ! !
 
+
 !Method methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -3481,6 +3486,7 @@
     "Created: / 23-07-2012 / 11:16:36 / cg"
 ! !
 
+
 !Method methodsFor:'trap methods'!
 
 makeInvalid
@@ -3717,7 +3723,7 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.388 2012/07/23 09:17:47 cg Exp $'
+    ^ '$Id: Method.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
@@ -3725,7 +3731,7 @@
 !
 
 version_SVN
-    ^ '$ Id: Method.st 10648 2011-06-23 15:55:10Z vranyj1 $'
+    ^ '$Id:: Method.st 10842 2012-09-07 10:49:18Z vranyj1                                                                           $'
 ! !
 
 Method initialize!
--- a/ProjectDefinition.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/ProjectDefinition.st	Fri Sep 07 11:49:18 2012 +0100
@@ -1495,60 +1495,67 @@
 
 extensionMethodNames_code_ignoreOldEntries:ignoreOldEntries
     ^ String streamContents:[:s |
-	|oldSpec|
-
-	s nextPutLine:'extensionMethodNames'.
-	s nextPutLine:'    "lists the extension methods which are to be included in the project.'.
-	s nextPutLine:'     Entries are 2-element array literals, consisting of class-name and selector."'.
-	s nextPutLine:''.
-	s nextPutLine:'    ^ #('.
-
-	oldSpec := self extensionMethodNames pairWiseCollect:[:className :selector | className -> selector ].
-
-	ignoreOldEntries ifFalse:[
-	    oldSpec do:[:entry |
-		|mclassName mselector|
-
-		mclassName := entry key asSymbol.
-		(mclassName endsWith:' class') ifTrue:[
-		    mclassName := mclassName asString.
-		].
-		mselector := entry value asSymbol.
-
-		s spaces:8.
-		mclassName storeArrayElementOn:s.
-		s space.
-		mselector storeArrayElementOn:s.
-		s cr.
-	    ].
-	].
-
-	self searchForExtensions do:[:eachMethod |
-	    |attributes oldSpecEntry mclassName mselector|
-
-	    mclassName := eachMethod mclass name.
-	    mselector := eachMethod selector.
-	    oldSpecEntry := oldSpec detect:[:entry | entry key = mclassName and:[ entry value = mselector]] ifNone:nil.
-	    (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
-		s spaces:8.
-		mclassName storeArrayElementOn:s.
-		s space.
-		mselector storeArrayElementOn:s.
-		s cr.
-	    ]
-	].
-
-	s nextPutLine:'    )'
+        |oldSpec|
+
+        s nextPutLine:'extensionMethodNames'.
+        s nextPutLine:'    "lists the extension methods which are to be included in the project.'.
+        s nextPutLine:'     Entries are 2-element array literals, consisting of class-name and selector."'.
+        s nextPutLine:''.
+        s nextPutLine:'    ^ #('.
+
+        oldSpec := self extensionMethodNames pairWiseCollect:[:className :selector | className -> selector ].
+
+        ignoreOldEntries ifFalse:[
+            oldSpec do:[:entry |
+                |mclassName mselector|
+
+                mclassName := entry key asSymbol.
+                (mclassName endsWith:' class') ifTrue:[
+                    mclassName := mclassName asString.
+                ].
+                mselector := entry value asSymbol.
+
+                s spaces:8.
+                mclassName storeArrayElementOn:s.
+                s space.
+                mselector storeArrayElementOn:s.
+                s cr.
+            ].
+        ].
+
+        self searchForExtensions do:[:eachMethod |
+            |attributes oldSpecEntry mclassName mselector|
+
+            mclassName := eachMethod mclass name.
+            mselector := eachMethod selector.
+            "JV@2012-09-07: Do not list Java methods in extensionMethodNames.
+             They are loaded lazily by JavaClassReader and if listed here,
+             they would cause an error if the package is loaded from source.
+             Sort of a HACK, indeed"
+            eachMethod mclass isJavaClass ifFalse:[
+                oldSpecEntry := oldSpec detect:[:entry | entry key = mclassName and:[ entry value = mselector]] ifNone:nil.
+                (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
+                    s spaces:8.
+                    mclassName storeArrayElementOn:s.
+                    s space.
+                    mselector storeArrayElementOn:s.
+                    s cr.
+                ]
+            ].
+        ].
+
+        s nextPutLine:'    )'
     ].
 
     "
      self extensionMethodNames_code_ignoreOldEntries:false
-     stx_libtool extensionMethodNames_code_ignoreOldEntries:false
+     stx_libjava extensionMethodNames_code_ignoreOldEntries:false
      stx_libtool extensionMethodNames_code_ignoreOldEntries:true
     "
 
     "Created: / 10-10-2006 / 22:02:36 / cg"
     "Modified: / 23-10-2006 / 11:07:29 / cg"
+    "Modified: / 07-09-2012 / 11:06:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 forEachContentsMethodsCodeToCompileDo:aTwoArgBlock ignoreOldDefinition:ignoreOldDefinition
@@ -6782,7 +6789,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProjectDefinition.st 10834 2012-08-01 10:53:10Z vranyj1 $'
+    ^ '$Id: ProjectDefinition.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
@@ -6790,7 +6797,7 @@
 !
 
 version_SVN
-    ^ '$Id:: ProjectDefinition.st 10834 2012-08-01 10:53:10Z vranyj1                                                                $'
+    ^ '$Id:: ProjectDefinition.st 10842 2012-09-07 10:49:18Z vranyj1                                                                $'
 ! !
 
 ProjectDefinition initialize!
--- a/SmalltalkChunkFileSourceWriter.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/SmalltalkChunkFileSourceWriter.st	Fri Sep 07 11:49:18 2012 +0100
@@ -422,15 +422,34 @@
     ].
 !
 
-fileOutMethods: methods on: stream
+fileOutMethods: extensions on: stream
+    | methodsSortedByName |
+
+    "/ sort them by name (to avoid conflict due to CVS merge)
+    methodsSortedByName := extensions asOrderedCollection.
+    methodsSortedByName sort:[:a :b |
+                                |clsA clsB|
 
-    methods do:
-        [:method| |cat source privacy|
+                                clsA := a mclass name.
+                                clsB := b mclass name.
+                                clsA < clsB ifTrue:[
+                                    true
+                                ] ifFalse:[
+                                    clsA > clsB ifTrue:[
+                                        false
+                                    ] ifFalse:[
+                                        a selector < b selector
+                                    ]
+                                ]
+                              ].
+    methodsSortedByName do:[:method |
+        | privacy cat |
 
+        self assert: method programmingLanguage isSmalltalk.
         stream nextPutChunkSeparator.
         "JV@2012-09-05: Support for filing out Java extension methods"
         method mclass isJavaClass ifTrue:[
-            stream nextPutAll: 'JAVA '.
+            stream nextPutAll: 'JAVA'.
             (method mclass name tokensBasedOn:$/) do:[:each|
                 stream space; nextPutAll: each
             ]
@@ -444,7 +463,6 @@
         ] ifFalse:[
             stream nextPutAll:' methodsFor:'.
         ].
-
         cat := method category ? ''.
         stream nextPutAll:cat asString storeString.
         stream nextPutChunkSeparator; cr; cr.
@@ -453,19 +471,21 @@
 
         stream space.
         stream nextPutChunkSeparator.
-        stream cr]
+        stream cr.
+        stream cr.
+    ].
 
     "Created: / 30-12-2009 / 18:43:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-fileOutPackageDefinition:pkg on:aStream 
+fileOutPackageDefinition:pkg on:stream 
     (pkg notNil and:[ pkg ~= PackageId noProjectID ]) ifTrue:[
-        aStream nextPutAll:'"{ Package: '''.
-        aStream nextPutAll:pkg asString.
-        aStream
-            nextPutAll:''' }"'; cr; cr;
-            nextPut:$!!; cr; cr
+        stream nextPutAll:'"{ Package: '''.
+        stream nextPutAll:pkg asString.
+        stream nextPutAll:''' }"'; nextPutChunkSeparator; cr; cr.
     ]
+
+    "Modified: / 07-09-2012 / 11:19:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 generateHeaderWithCopyrightOn:outStream
@@ -506,5 +526,5 @@
 !
 
 version_SVN
-    ^ '$Id: SmalltalkChunkFileSourceWriter.st 10841 2012-09-04 23:27:33Z vranyj1 $'
+    ^ '$Id: SmalltalkChunkFileSourceWriter.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 ! !
--- a/String.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/String.st	Fri Sep 07 11:49:18 2012 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libbasic' }"
 
-CharacterArray subclass:#String
+CharacterArray variableByteSubclass:#String
 	instanceVariableNames:''
 	classVariableNames:'CRLF LF'
 	poolDictionaries:''
@@ -92,6 +92,7 @@
 }
 %}
 ! !
+
 !String class methodsFor:'documentation'!
 
 copyright
@@ -486,6 +487,8 @@
     ^ Character tab asString
 ! !
 
+
+
 !String class methodsFor:'queries'!
 
 defaultPlatformClass
@@ -505,6 +508,16 @@
     "Modified: 23.4.1996 / 16:00:38 / cg"
 ! !
 
+
+
+
+
+
+
+
+
+
+
 !String methodsFor:'Compatibility-VW5.4'!
 
 asGUID
@@ -698,6 +711,7 @@
     "
 ! !
 
+
 !String methodsFor:'character searching'!
 
 identityIndexOf:aCharacter
@@ -2629,6 +2643,7 @@
     ^ super simpleDeepCopy
 ! !
 
+
 !String methodsFor:'filling & replacing'!
 
 atAllPut:aCharacter
@@ -3335,6 +3350,7 @@
     ^ String
 ! !
 
+
 !String methodsFor:'sorting & reordering'!
 
 reverse
@@ -3365,6 +3381,7 @@
     ^ super reverse
 ! !
 
+
 !String methodsFor:'substring searching'!
 
 indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
@@ -3826,9 +3843,13 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.286 2012/07/19 13:23:22 stefan Exp $'
+    ^ '$Id: String.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic/String.st,v 1.286 2012/07/19 13:23:22 stefan Exp §'
+!
+
+version_SVN
+    ^ '$Id:: String.st 10842 2012-09-07 10:49:18Z vranyj1                                                                           $'
 ! !
--- a/UninterpretedBytes.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/UninterpretedBytes.st	Fri Sep 07 11:49:18 2012 +0100
@@ -2964,9 +2964,13 @@
 !UninterpretedBytes class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.90 2012/07/19 17:36:24 stefan Exp $'
+    ^ '$Id: UninterpretedBytes.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.90 2012/07/19 17:36:24 stefan Exp §'
-! !
\ No newline at end of file
+!
+
+version_SVN
+    ^ '$Id:: UninterpretedBytes.st 10842 2012-09-07 10:49:18Z vranyj1                                                               $'
+! !
--- a/abbrev.stc	Wed Sep 05 00:27:33 2012 +0100
+++ b/abbrev.stc	Fri Sep 07 11:49:18 2012 +0100
@@ -189,9 +189,9 @@
 CharacterEncoderImplementations::ISO8859_7 CharacterEncoderImplementations__ISO8859_7 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208_to_SJIS CharacterEncoderImplementations__JIS0208_to_SJIS stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::MS_Ansi CharacterEncoderImplementations__MS_Ansi stx:libbasic 'Collections-Text-Encodings' 0
-CharacterEncoderImplementations::MS_Baltic CharacterEncoderImplementations__MS_Baltic stx:libbasic  'unknownCategory'  0
-CharacterEncoderImplementations::MS_Cyrillic CharacterEncoderImplementations__MS_Cyrillic stx:libbasic  'unknownCategory'  0
-CharacterEncoderImplementations::MS_Greek CharacterEncoderImplementations__MS_Greek stx:libbasic  'unknownCategory'  0
+CharacterEncoderImplementations::MS_Baltic CharacterEncoderImplementations__MS_Baltic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Cyrillic CharacterEncoderImplementations__MS_Cyrillic stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Greek CharacterEncoderImplementations__MS_Greek stx:libbasic 'Collections-Text-Encodings' 0
 ClassDescription ClassDescription stx:libbasic 'Kernel-Classes' 0
 ControlRequest ControlRequest stx:libbasic 'Kernel-Exceptions-Control' 1
 Dictionary Dictionary stx:libbasic 'Collections-Unordered' 0
--- a/bc.mak	Wed Sep 05 00:27:33 2012 +0100
+++ b/bc.mak	Fri Sep 07 11:49:18 2012 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/bc.mak,v 1.187 2012/07/11 16:41:42 stefan Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -160,7 +160,6 @@
 $(OUTDIR)Association.$(O) Association.$(H): Association.st $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Block.$(O) Block.$(H): Block.st $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ASCII.$(O) CharacterEncoderImplementations__ASCII.$(H): CharacterEncoderImplementations__ASCII.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__CP437.$(O) CharacterEncoderImplementations__CP437.$(H): CharacterEncoderImplementations__CP437.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__EBCDIC.$(O) CharacterEncoderImplementations__EBCDIC.$(H): CharacterEncoderImplementations__EBCDIC.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(O) CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(H): CharacterEncoderImplementations__ISO10646_to_UTF16BE.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF8.$(O) CharacterEncoderImplementations__ISO10646_to_UTF8.$(H): CharacterEncoderImplementations__ISO10646_to_UTF8.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -277,7 +276,6 @@
 $(OUTDIR)AssertionFailedError.$(O) AssertionFailedError.$(H): AssertionFailedError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)AutoloadMetaclass.$(O) AutoloadMetaclass.$(H): AutoloadMetaclass.st $(INCLUDE_TOP)\stx\libbasic\Metaclass.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Association.$(H) $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
 $(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -322,6 +320,7 @@
 $(OUTDIR)ArgumentError.$(O) ArgumentError.$(H): ArgumentError.st $(INCLUDE_TOP)\stx\libbasic\ExecutionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CannotResumeError.$(O) CannotResumeError.$(H): CannotResumeError.st $(INCLUDE_TOP)\stx\libbasic\ContextError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CannotReturnError.$(O) CannotReturnError.$(H): CannotReturnError.st $(INCLUDE_TOP)\stx\libbasic\ContextError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterEncoderError.$(O) CharacterEncoderError.$(H): CharacterEncoderError.st $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)DateConversionError.$(O) DateConversionError.$(H): DateConversionError.st $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)DomainError.$(O) DomainError.$(H): DomainError.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -347,9 +346,7 @@
 $(OUTDIR)ReadError.$(O) ReadError.$(H): ReadError.st $(INCLUDE_TOP)\stx\libbasic\StreamError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)StreamIOError.$(O) StreamIOError.$(H): StreamIOError.st $(INCLUDE_TOP)\stx\libbasic\StreamError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)StreamNotOpenError.$(O) StreamNotOpenError.$(H): StreamNotOpenError.st $(INCLUDE_TOP)\stx\libbasic\StreamError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)String.$(O) String.$(H): String.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)TimeConversionError.$(O) TimeConversionError.$(H): TimeConversionError.st $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UnorderedNumbersError.$(O) UnorderedNumbersError.$(H): UnorderedNumbersError.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UnprotectedExternalBytes.$(O) UnprotectedExternalBytes.$(H): UnprotectedExternalBytes.st $(INCLUDE_TOP)\stx\libbasic\ExternalBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)WeakDependencyDictionary.$(O) WeakDependencyDictionary.$(H): WeakDependencyDictionary.st $(INCLUDE_TOP)\stx\libbasic\WeakIdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -360,7 +357,6 @@
 $(OUTDIR)EncodingError.$(O) EncodingError.$(H): EncodingError.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderError.$(H) $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FileDoesNotExistException.$(O) FileDoesNotExistException.$(H): FileDoesNotExistException.st $(INCLUDE_TOP)\stx\libbasic\OpenError.$(H) $(INCLUDE_TOP)\stx\libbasic\StreamError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FileStream.$(O) FileStream.$(H): FileStream.st $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ImmutableString.$(O) ImmutableString.$(H): ImmutableString.st $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidByteCodeError.$(O) InvalidByteCodeError.$(H): InvalidByteCodeError.st $(INCLUDE_TOP)\stx\libbasic\InvalidCodeError.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidInstructionError.$(O) InvalidInstructionError.$(H): InvalidInstructionError.st $(INCLUDE_TOP)\stx\libbasic\InvalidCodeError.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidReadError.$(O) InvalidReadError.$(H): InvalidReadError.st $(INCLUDE_TOP)\stx\libbasic\ReadError.$(H) $(INCLUDE_TOP)\stx\libbasic\StreamError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -369,19 +365,22 @@
 $(OUTDIR)NonIntegerIndexError.$(O) NonIntegerIndexError.$(H): NonIntegerIndexError.st $(INCLUDE_TOP)\stx\libbasic\IndexNotFoundError.$(H) $(INCLUDE_TOP)\stx\libbasic\NotFoundError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)NonPositionableExternalStream.$(O) NonPositionableExternalStream.$(H): NonPositionableExternalStream.st $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)OverflowError.$(O) OverflowError.$(H): OverflowError.st $(INCLUDE_TOP)\stx\libbasic\RangeError.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)String.$(O) String.$(H): String.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)SubscriptOutOfBoundsError.$(O) SubscriptOutOfBoundsError.$(H): SubscriptOutOfBoundsError.st $(INCLUDE_TOP)\stx\libbasic\IndexNotFoundError.$(H) $(INCLUDE_TOP)\stx\libbasic\NotFoundError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Symbol.$(O) Symbol.$(H): Symbol.st $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UnderflowError.$(O) UnderflowError.$(H): UnderflowError.st $(INCLUDE_TOP)\stx\libbasic\RangeError.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)\stx\libbasic\TwoByteString.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)WrongNumberOfArgumentsError.$(O) WrongNumberOfArgumentsError.$(H): WrongNumberOfArgumentsError.st $(INCLUDE_TOP)\stx\libbasic\ArgumentError.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ZeroDivide.$(O) ZeroDivide.$(H): ZeroDivide.st $(INCLUDE_TOP)\stx\libbasic\DomainError.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CharacterRangeError.$(O) CharacterRangeError.$(H): CharacterRangeError.st $(INCLUDE_TOP)\stx\libbasic\DecodingError.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderError.$(H) $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)DirectoryStream.$(O) DirectoryStream.$(H): DirectoryStream.st $(INCLUDE_TOP)\stx\libbasic\FileStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)ImmutableString.$(O) ImmutableString.$(H): ImmutableString.st $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)InvalidEncodingError.$(O) InvalidEncodingError.$(H): InvalidEncodingError.st $(INCLUDE_TOP)\stx\libbasic\DecodingError.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderError.$(H) $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PipeStream.$(O) PipeStream.$(H): PipeStream.st $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Symbol.$(O) Symbol.$(H): Symbol.st $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)\stx\libbasic\TwoByteString.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Win32Process.$(O) Win32Process.$(H): Win32Process.st $(STCHDR)
+$(OUTDIR)WindowsDesktop.$(O) WindowsDesktop.$(H): WindowsDesktop.st $(STCHDR)
 $(OUTDIR)PCFilename.$(O) PCFilename.$(H): PCFilename.st $(STCHDR)
-$(OUTDIR)WindowsDesktop.$(O) WindowsDesktop.$(H): WindowsDesktop.st $(INCLUDE_TOP)\stx\libbasic\AbstractDesktop.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Win32Handle.$(O) Win32Handle.$(H): Win32Handle.st $(STCHDR)
 $(OUTDIR)Win32FILEHandle.$(O) Win32FILEHandle.$(H): Win32FILEHandle.st $(STCHDR)
 $(OUTDIR)Win32Constants.$(O) Win32Constants.$(H): Win32Constants.st $(STCHDR)
--- a/libInit.cc	Wed Sep 05 00:27:33 2012 +0100
+++ b/libInit.cc	Fri Sep 07 11:49:18 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libbasic/libInit.cc,v 1.180 2012/07/11 17:13:03 stefan Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libbasic.
@@ -127,7 +127,6 @@
 _Association_Init(pass,__pRT__,snd);
 _Block_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__ASCII_Init(pass,__pRT__,snd);
-_CharacterEncoderImplementations__CP437_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__EBCDIC_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__ISO10646_137to_137UTF16BE_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__ISO10646_137to_137UTF8_Init(pass,__pRT__,snd);
@@ -244,7 +243,6 @@
 _AssertionFailedError_Init(pass,__pRT__,snd);
 _AutoloadMetaclass_Init(pass,__pRT__,snd);
 _ByteArray_Init(pass,__pRT__,snd);
-_CharacterArray_Init(pass,__pRT__,snd);
 _CharacterWriteStream_Init(pass,__pRT__,snd);
 _Class_Init(pass,__pRT__,snd);
 _ContextError_Init(pass,__pRT__,snd);
@@ -289,6 +287,7 @@
 _ArgumentError_Init(pass,__pRT__,snd);
 _CannotResumeError_Init(pass,__pRT__,snd);
 _CannotReturnError_Init(pass,__pRT__,snd);
+_CharacterArray_Init(pass,__pRT__,snd);
 _CharacterEncoderError_Init(pass,__pRT__,snd);
 _DateConversionError_Init(pass,__pRT__,snd);
 _DomainError_Init(pass,__pRT__,snd);
@@ -314,9 +313,7 @@
 _ReadError_Init(pass,__pRT__,snd);
 _StreamIOError_Init(pass,__pRT__,snd);
 _StreamNotOpenError_Init(pass,__pRT__,snd);
-_String_Init(pass,__pRT__,snd);
 _TimeConversionError_Init(pass,__pRT__,snd);
-_TwoByteString_Init(pass,__pRT__,snd);
 _UnorderedNumbersError_Init(pass,__pRT__,snd);
 _UnprotectedExternalBytes_Init(pass,__pRT__,snd);
 _WeakDependencyDictionary_Init(pass,__pRT__,snd);
@@ -327,7 +324,6 @@
 _EncodingError_Init(pass,__pRT__,snd);
 _FileDoesNotExistException_Init(pass,__pRT__,snd);
 _FileStream_Init(pass,__pRT__,snd);
-_ImmutableString_Init(pass,__pRT__,snd);
 _InvalidByteCodeError_Init(pass,__pRT__,snd);
 _InvalidInstructionError_Init(pass,__pRT__,snd);
 _InvalidReadError_Init(pass,__pRT__,snd);
@@ -336,16 +332,27 @@
 _NonIntegerIndexError_Init(pass,__pRT__,snd);
 _NonPositionableExternalStream_Init(pass,__pRT__,snd);
 _OverflowError_Init(pass,__pRT__,snd);
+_String_Init(pass,__pRT__,snd);
 _SubscriptOutOfBoundsError_Init(pass,__pRT__,snd);
-_Symbol_Init(pass,__pRT__,snd);
+_TwoByteString_Init(pass,__pRT__,snd);
 _UnderflowError_Init(pass,__pRT__,snd);
-_Unicode16String_Init(pass,__pRT__,snd);
 _WrongNumberOfArgumentsError_Init(pass,__pRT__,snd);
 _ZeroDivide_Init(pass,__pRT__,snd);
 _CharacterRangeError_Init(pass,__pRT__,snd);
 _DirectoryStream_Init(pass,__pRT__,snd);
+_ImmutableString_Init(pass,__pRT__,snd);
 _InvalidEncodingError_Init(pass,__pRT__,snd);
 _PipeStream_Init(pass,__pRT__,snd);
+_Symbol_Init(pass,__pRT__,snd);
+_Unicode16String_Init(pass,__pRT__,snd);
+#ifdef UNIX
+_UnixDesktop_Init(pass,__pRT__,snd);
+_XDGDesktop_Init(pass,__pRT__,snd);
+_GNOMEDesktop_Init(pass,__pRT__,snd);
+_UnixFileDescriptorHandle_Init(pass,__pRT__,snd);
+_UnixFileHandle_Init(pass,__pRT__,snd);
+_UnixOperatingSystem_Init(pass,__pRT__,snd);
+#endif /* UNIX */
 #ifdef WIN32
 _Win32Process_Init(pass,__pRT__,snd);
 _WindowsDesktop_Init(pass,__pRT__,snd);
@@ -355,15 +362,6 @@
 _Win32Constants_Init(pass,__pRT__,snd);
 _Win32OperatingSystem_Init(pass,__pRT__,snd);
 #endif /* WIN32 */
-#ifdef UNIX
-_UnixFileDescriptorHandle_Init(pass,__pRT__,snd);
-_UnixFileHandle_Init(pass,__pRT__,snd);
-_UnixOperatingSystem_Init(pass,__pRT__,snd);
-_UnixDesktop_Init(pass,__pRT__,snd);
-_XDGDesktop_Init(pass,__pRT__,snd);
-_GNOMEDesktop_Init(pass,__pRT__,snd);
-#endif /* UNIX */
-
 
 
 __END_PACKAGE__();
--- a/libbasic.rc	Wed Sep 05 00:27:33 2012 +0100
+++ b/libbasic.rc	Fri Sep 07 11:49:18 2012 +0100
@@ -3,8 +3,8 @@
 // automagically generated from the projectDefinition: stx_libbasic.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,99
-  PRODUCTVERSION  6,2,1,1
+  FILEVERSION     6,2,0,1
+  PRODUCTVERSION  6,2,3,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.1.99\0"
+      VALUE "FileVersion", "6.2.0.1\0"
       VALUE "InternalName", "stx:libbasic\0"
-      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
+      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
-      VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Wed, 11 Jul 2012 16:41:36 GMT\0"
+      VALUE "ProductVersion", "6.2.3.1\0"
+      VALUE "ProductDate", "Fri, 07 Sep 2012 10:46:20 GMT\0"
     END
 
   END
--- a/stx_libbasic.st	Wed Sep 05 00:27:33 2012 +0100
+++ b/stx_libbasic.st	Fri Sep 07 11:49:18 2012 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libbasic' }"
 
-LibraryDefinition subclass:#'stx_libbasic'
+LibraryDefinition subclass:#stx_libbasic
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -554,7 +554,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'10807           '"$"
+    ^ "$SVN-Revision:"'10841           '"$"
 ! !
 
 !stx_libbasic class methodsFor:'private-prerequisites'!
@@ -572,7 +572,7 @@
 !stx_libbasic class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/stx_libbasic.st,v 1.101 2012/07/18 17:13:14 cg Exp $'
+    ^ '$Id: stx_libbasic.st 10842 2012-09-07 10:49:18Z vranyj1 $'
 !
 
 version_CVS
@@ -580,5 +580,5 @@
 !
 
 version_SVN
-    ^ '$ Id: stx_libbasic.st 10648 2011-06-23 15:55:10Z vranyj1  $'
+    ^ '$Id:: stx_libbasic.st 10842 2012-09-07 10:49:18Z vranyj1                                                                     $'
 ! !