--- a/FontDescription.st Fri Feb 06 14:50:08 2004 +0100
+++ b/FontDescription.st Fri Feb 06 16:09:13 2004 +0100
@@ -160,7 +160,7 @@
face:'medium'
style:'roman'
size:12
- encoding:nil
+ encoding:(self defaultEncoding)
"
Font family:'helvetica'
@@ -179,7 +179,7 @@
face:faceString
style:'roman'
size:sizeNum
- encoding:nil
+ encoding:(self defaultEncoding)
"
Font family:'helvetica' face:'medium' size:10
@@ -196,10 +196,10 @@
The returned font is not associated to a specific device"
^ self family:familyString
- face:faceString
- style:styleString
- size:sizeNum
- encoding:nil
+ face:faceString
+ style:styleString
+ size:sizeNum
+ encoding:(self defaultEncoding)
"
Font family:'helvetica' face:'medium' style:'roman' size:10
@@ -209,7 +209,7 @@
"
!
-family:familyString face:faceString style:styleString size:sizeNum encoding:encodingSym
+family:familyString face:faceString style:styleString size:sizeNum encoding:encoding
"returns a font for given family, face, style, size and
the specified encoding.
The returned font is not associated to a specific device"
@@ -219,7 +219,7 @@
face:faceString
style:styleString
size:sizeNum
- encoding:encodingSym
+ encoding:encoding
"Modified: 20.4.1996 / 23:19:04 / cg"
!
@@ -233,7 +233,7 @@
face:'medium'
style:'roman'
size:sizeNum
- encoding:nil
+ encoding:(self defaultEncoding)
"
Font family:'helvetica' size:10
@@ -252,7 +252,7 @@
face:'medium'
style:aStyle
size:sizeNum
- encoding:nil
+ encoding:(self defaultEncoding)
"
Font family:'helvetica' style:#roman size:48
@@ -291,6 +291,12 @@
"Modified: 30.4.1996 / 17:23:09 / cg"
! !
+!FontDescription class methodsFor:'defaults'!
+
+defaultEncoding
+ ^ #'iso8859-1'
+! !
+
!FontDescription class methodsFor:'queries'!
characterSetForCharacterEncoding:encodingName
@@ -1074,7 +1080,7 @@
!FontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.49 2004-02-06 13:26:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.50 2004-02-06 15:09:13 cg Exp $'
! !
FontDescription initialize!