hg/stx-libbasic2: comparison Text.st

equal deleted inserted replaced

-:6b1167c90973
+:04be25181a2e
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1996 by Claus Gittinger
 All Rights Reserved
 This software is furnished under a license and may be used
 new
 "create a new empty Text instance.
 Redefined for string-protocol compatibility"
-^ super new string:(String new) emphasis:nil
+^ super new string:'' emphasis:nil
 "Text new"
 "Modified: 12.5.1996 / 17:05:17 / cg"
 "Modified: 31.12.1996 / 12:39:57 / stefan"
 "Created: 22.10.1996 / 21:01:16 / cg"
 !
 postCopy
 string := string copy.
-runs := runs copy
+runs := runs copy.
+"
+|t|
+t := 'hello' emphasizeAllWith:#bold.
+t inspect. t copy inspect.
+t emphasisAllRemove:#bold.
+"
 ! !
 !Text methodsFor:'displaying'!
 displayOn:aGC x:x0 y:y opaque:opaqueWanted
 device := aGC graphicsDevice.
 pos := 1.
 x := x0.
 bold := italic := underline := underwave := strikeout := reverse := false.
+runs size > string size ifTrue:[
+Transcript showCR:'inconsistent text: runs size > string size'.
+runs := runs copyTo:(string size)
+].
 runs runsDo:[:len :emphasis |
 wasItalic := italic.
 color := savedPaint.
 bold := italic := underline := underwave := strikeout := reverse := false.
 ].
 aGC basicFont:savedFont.
 aGC paint:savedPaint on:savedBgPaint.
+pos < string size ifTrue:[
+"/ draw rest
+aGC displayString:string from:pos to:string size x:x y:y.
+].
 "Created: / 12.5.1996 / 11:14:30 / cg"
 "Modified: / 7.7.1999 / 00:08:12 / cg"
 ! !
 !Text methodsFor:'emphasis'!
 prevE := runs at:characterIndex-1.
 e = prevE ifTrue:[
 e := prevE
 ]
 ].
-runs at:characterIndex put:e
+runs at:characterIndex put:e.
 "
 (Text string:'hello') allBold emphasisAt:2 add:#italic
 "
 prevE := runs at:characterIndex-1.
 emphasis = prevE ifTrue:[
 e := prevE
 ]
 ].
-runs at:characterIndex put:e
+runs at:characterIndex put:e.
 "
 (Text string:'hello') allBold emphasisAt:2 put:#italic
 "
 |e|
 e := runs at:characterIndex.
 e := self class removeEmphasis:emphasisToRemove from:e.
-runs at:characterIndex put:e
+runs at:characterIndex put:e.
 "
 (Text string:'hello')
 allBold emphasisAt:2 remove:#bold
 !
 emphasizeAllWith:emphasis
 "change the emphasis of all characters"
-runs := RunArray new:(string size) withAll:emphasis
+runs := RunArray new:(string size) withAll:emphasis.
 "
 (Text string:'hello') allBold emphasizeAllWith:#italic
 "
 emphasisCollection:emphasisCollection
 "set the string and emphasis collection.
 The emphasis collection contains per-character information."
-runs := emphasisCollection
+runs := emphasisCollection.
 "Created: / 7.4.1998 / 08:52:03 / cg"
 !
 runs
 ^ runs
 !
 setRuns:anArrayOrRunArray
-runs := anArrayOrRunArray
+runs := anArrayOrRunArray.
 !
 setString:aString setRuns:anArrayOrRunArray
 string := aString.
-runs := anArrayOrRunArray
+runs := anArrayOrRunArray.
 !
 string:aString emphasis:emphasis
 "set the string and emphasis. The emphasis is applied to all characters."
 string := aString string.
-runs   := RunArray new:string size withAll:emphasis
+runs   := RunArray new:string size withAll:emphasis.
 "
 |t|
 t := Text new string:'hello' emphasis:#bold.
 string := maxCharacter stringSpecies fromString:string.
 ].
 ].
 string replaceFrom:start to:stop with:aCollection startingAt:startIndex.
-self emphasizeFrom:start to:stop with:nil
+self emphasizeFrom:start to:stop with:nil.
 "
 ((Text string:'hello') allBold emphasisAt:2 put:#italic)
 replaceFrom:1 to:3 with:'HEL' startingAt:1
 ! !
 !Text class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/Text.st,v 1.128 2015-01-29 17:54:22 cg Exp $'
+^ '$Header$'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic2/Text.st,v 1.128 2015-01-29 17:54:22 cg Exp $'
+^ '$Header$'
 ! !
 Text initialize!

changeset 3598	04be25181a2e
parent 3472	a61d50c15405
child 3644	baa4ec9a3b28