# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 832084748 -7200
# Node ID 5b5386311dbd01579c4cb2f7eeac1ce32a99d333
# Parent  f324be2221e3b1bc1123c05e115368062b54adcf
concatenating mixed texts & strings

diff -r f324be2221e3 -r 5b5386311dbd CharArray.st
--- a/CharArray.st	Tue May 14 16:37:51 1996 +0200
+++ b/CharArray.st	Tue May 14 16:39:08 1996 +0200
@@ -2181,6 +2181,9 @@
     aStringOrCharacter isCharacter ifTrue:[
         ^ self , aStringOrCharacter asString
     ].
+    aStringOrCharacter isText ifTrue:[
+        ^ aStringOrCharacter concatenateFromString:self
+    ].
     ^ super , aStringOrCharacter
 
     "
@@ -2188,7 +2191,7 @@
      'hello' , '1'   
     "
 
-    "Modified: 29.2.1996 / 20:37:36 / cg"
+    "Modified: 14.5.1996 / 15:27:54 / cg"
 !
 
 concatenate:string1 and:string2
@@ -2232,6 +2235,16 @@
 
 !CharacterArray methodsFor:'emphasis'!
 
+emphasis
+    "return the emphasis.
+     Since characterArrays do not hold any emphasis information,
+     nil (no emphasis) is returned here."
+
+    ^ RunArray new:self size withAll:nil
+
+    "Created: 14.5.1996 / 13:58:58 / cg"
+!
+
 emphasisAt:characterIndex
     "return the emphasis at some index.
      Since characterArrays do not hold any emphasis information,
@@ -2240,6 +2253,17 @@
     ^ nil
 
     "Created: 11.5.1996 / 14:13:27 / cg"
+!
+
+emphasisCollection
+    "return the emphasis.
+     Since characterArrays do not hold any emphasis information,
+     nil (no emphasis) is returned here."
+
+    ^ RunArray new:(self size)
+
+    "Created: 14.5.1996 / 13:58:58 / cg"
+    "Modified: 14.5.1996 / 15:02:29 / cg"
 ! !
 
 !CharacterArray methodsFor:'encoding/decoding'!
@@ -3840,5 +3864,5 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/CharArray.st,v 1.86 1996-05-14 10:33:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/CharArray.st,v 1.87 1996-05-14 14:39:08 cg Exp $'
 ! !
diff -r f324be2221e3 -r 5b5386311dbd CharacterArray.st
--- a/CharacterArray.st	Tue May 14 16:37:51 1996 +0200
+++ b/CharacterArray.st	Tue May 14 16:39:08 1996 +0200
@@ -2181,6 +2181,9 @@
     aStringOrCharacter isCharacter ifTrue:[
         ^ self , aStringOrCharacter asString
     ].
+    aStringOrCharacter isText ifTrue:[
+        ^ aStringOrCharacter concatenateFromString:self
+    ].
     ^ super , aStringOrCharacter
 
     "
@@ -2188,7 +2191,7 @@
      'hello' , '1'   
     "
 
-    "Modified: 29.2.1996 / 20:37:36 / cg"
+    "Modified: 14.5.1996 / 15:27:54 / cg"
 !
 
 concatenate:string1 and:string2
@@ -2232,6 +2235,16 @@
 
 !CharacterArray methodsFor:'emphasis'!
 
+emphasis
+    "return the emphasis.
+     Since characterArrays do not hold any emphasis information,
+     nil (no emphasis) is returned here."
+
+    ^ RunArray new:self size withAll:nil
+
+    "Created: 14.5.1996 / 13:58:58 / cg"
+!
+
 emphasisAt:characterIndex
     "return the emphasis at some index.
      Since characterArrays do not hold any emphasis information,
@@ -2240,6 +2253,17 @@
     ^ nil
 
     "Created: 11.5.1996 / 14:13:27 / cg"
+!
+
+emphasisCollection
+    "return the emphasis.
+     Since characterArrays do not hold any emphasis information,
+     nil (no emphasis) is returned here."
+
+    ^ RunArray new:(self size)
+
+    "Created: 14.5.1996 / 13:58:58 / cg"
+    "Modified: 14.5.1996 / 15:02:29 / cg"
 ! !
 
 !CharacterArray methodsFor:'encoding/decoding'!
@@ -3840,5 +3864,5 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.86 1996-05-14 10:33:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.87 1996-05-14 14:39:08 cg Exp $'
 ! !