--- a/FontDescription.st Fri Oct 01 10:37:20 2004 +0200
+++ b/FontDescription.st Fri Oct 01 13:21:08 2004 +0200
@@ -659,14 +659,17 @@
encoding:encoding
!
-fromLiteralArrayEncoding:encoding
+fromLiteralArrayEncoding:literalEncoding
"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.
+ family := literalEncoding at:2.
+ face := literalEncoding at:3.
+ style := literalEncoding at:4.
+ size := literalEncoding at:5.
+ literalEncoding size > 5 ifTrue:[
+ encoding := literalEncoding at:6
+ ].
!
literalArrayEncoding
@@ -679,6 +682,7 @@
with:face
with:style
with:size
+ with:encoding
!
on:aDevice
@@ -1130,7 +1134,7 @@
!FontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.56 2004-04-06 20:18:53 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.57 2004-10-01 11:21:08 cg Exp $'
! !
FontDescription initialize!