--- a/FontDescr.st Thu Feb 04 10:34:17 1999 +0100
+++ b/FontDescr.st Thu Feb 04 16:37:46 1999 +0100
@@ -503,21 +503,18 @@
!
fromLiteralArrayEncoding:encoding
- "read my contents from a aLiteralEncodedArray"
-
- |items groups values|
+ "read my contents from a aLiteralEncodedArray.
+ Must match to what is generated in #literalArrayEncoding"
family := encoding at:2.
face := encoding at:3.
style := encoding at:4.
size := encoding at:5.
-
-
-
!
literalArrayEncoding
- "return myself encoded as a literal array"
+ "return myself encoded as a literal array.
+ Must match to what is expected in #fromLiteralArrayEncoding:"
^ Array
with:self class name asSymbol
@@ -525,7 +522,6 @@
with:face
with:style
with:size
-
!
on:aDevice
@@ -729,6 +725,6 @@
!FontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/FontDescr.st,v 1.25 1998-06-20 15:04:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/FontDescr.st,v 1.26 1999-02-04 15:37:46 cg Exp $'
! !
FontDescription initialize!
--- a/FontDescription.st Thu Feb 04 10:34:17 1999 +0100
+++ b/FontDescription.st Thu Feb 04 16:37:46 1999 +0100
@@ -503,21 +503,18 @@
!
fromLiteralArrayEncoding:encoding
- "read my contents from a aLiteralEncodedArray"
-
- |items groups values|
+ "read my contents from a aLiteralEncodedArray.
+ Must match to what is generated in #literalArrayEncoding"
family := encoding at:2.
face := encoding at:3.
style := encoding at:4.
size := encoding at:5.
-
-
-
!
literalArrayEncoding
- "return myself encoded as a literal array"
+ "return myself encoded as a literal array.
+ Must match to what is expected in #fromLiteralArrayEncoding:"
^ Array
with:self class name asSymbol
@@ -525,7 +522,6 @@
with:face
with:style
with:size
-
!
on:aDevice
@@ -729,6 +725,6 @@
!FontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.25 1998-06-20 15:04:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.26 1999-02-04 15:37:46 cg Exp $'
! !
FontDescription initialize!
--- a/GC.st Thu Feb 04 10:34:17 1999 +0100
+++ b/GC.st Thu Feb 04 16:37:46 1999 +0100
@@ -1382,7 +1382,7 @@
Here, a slow fallback is used, drawing into a
temporary bitmap first, which is then displayed"
- |deltaX deltaY dx dy px py destX destY P tempForm x0 y0
+ |deltaX deltaY dx dy px py destX destY p tempForm
xMin xMax yMin yMax x1 x2 y1 y2|
xStart < xEnd ifTrue:[
@@ -1437,23 +1437,23 @@
py > px ifTrue:[
"horizontal"
- P := py // 2.
+ p := py // 2.
py timesRepeat:[
destX := destX + dx.
- (P := P - px) < 0 ifTrue:[
+ (p := p - px) < 0 ifTrue:[
destY := destY + dy.
- P := P + py
+ p := p + py
].
tempForm displayForm:aForm x:destX y:destY.
]
] ifFalse:[
"vertical"
- P := px // 2.
+ p := px // 2.
px timesRepeat:[
destY := destY + dy.
- (P := P - py) < 0 ifTrue:[
+ (p := p - py) < 0 ifTrue:[
destX := destX + dx.
- P := P + px
+ p := p + px
].
tempForm displayForm:aForm x:destX y:destY
]
@@ -1663,7 +1663,7 @@
CAVEAT: if the string is not a real string (i.e. a LabelAndIcon),
this can (currently) only be done opaque"
- |angle tempForm tempImage w h asc desc a xN yN p r nBL nTL nB a1 a2
+ |angle tempForm tempImage w h asc desc a xN yN p r
dX dY sin cos m|
angle := drawAngle.
@@ -2117,6 +2117,6 @@
!GraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/GC.st,v 1.71 1998-10-28 14:42:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/GC.st,v 1.72 1999-02-04 15:37:45 cg Exp $'
! !
GraphicsContext initialize!
--- a/GraphicsContext.st Thu Feb 04 10:34:17 1999 +0100
+++ b/GraphicsContext.st Thu Feb 04 16:37:46 1999 +0100
@@ -1382,7 +1382,7 @@
Here, a slow fallback is used, drawing into a
temporary bitmap first, which is then displayed"
- |deltaX deltaY dx dy px py destX destY P tempForm x0 y0
+ |deltaX deltaY dx dy px py destX destY p tempForm
xMin xMax yMin yMax x1 x2 y1 y2|
xStart < xEnd ifTrue:[
@@ -1437,23 +1437,23 @@
py > px ifTrue:[
"horizontal"
- P := py // 2.
+ p := py // 2.
py timesRepeat:[
destX := destX + dx.
- (P := P - px) < 0 ifTrue:[
+ (p := p - px) < 0 ifTrue:[
destY := destY + dy.
- P := P + py
+ p := p + py
].
tempForm displayForm:aForm x:destX y:destY.
]
] ifFalse:[
"vertical"
- P := px // 2.
+ p := px // 2.
px timesRepeat:[
destY := destY + dy.
- (P := P - py) < 0 ifTrue:[
+ (p := p - py) < 0 ifTrue:[
destX := destX + dx.
- P := P + px
+ p := p + px
].
tempForm displayForm:aForm x:destX y:destY
]
@@ -1663,7 +1663,7 @@
CAVEAT: if the string is not a real string (i.e. a LabelAndIcon),
this can (currently) only be done opaque"
- |angle tempForm tempImage w h asc desc a xN yN p r nBL nTL nB a1 a2
+ |angle tempForm tempImage w h asc desc a xN yN p r
dX dY sin cos m|
angle := drawAngle.
@@ -2117,6 +2117,6 @@
!GraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.71 1998-10-28 14:42:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.72 1999-02-04 15:37:45 cg Exp $'
! !
GraphicsContext initialize!