--- a/Font.st Fri Sep 24 21:29:12 1999 +0200
+++ b/Font.st Sun Sep 26 15:30:19 1999 +0200
@@ -226,9 +226,9 @@
|family newFont|
(familyString at:1) isUppercase ifTrue:[
- family := familyString asLowercase
+ family := familyString asLowercase
] ifFalse:[
- family := familyString
+ family := familyString
].
"look if this font is already known on the default device
@@ -236,29 +236,32 @@
Display notNil ifTrue:[
Display deviceFonts do:[:aFont |
- (aFont family = family) ifTrue:[
- (aFont face = faceString) ifTrue:[
- (aFont style = styleString) ifTrue:[
- (aFont size == sizeNum) ifTrue:[
- (encodingSym isNil or:[aFont encoding == encodingSym]) ifTrue:[
- ^ aFont
- ]
- ]
- ]
- ]
- ]
- ]
+ (aFont family = family) ifTrue:[
+ (aFont face = faceString) ifTrue:[
+ (aFont style = styleString
+ or:[styleString = 'italic' and:[aFont style = 'oblique']]) ifTrue:[
+ (aFont size == sizeNum) ifTrue:[
+ (encodingSym isNil or:[aFont encoding == encodingSym]) ifTrue:[
+ ^ aFont
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
].
newFont := self basicNew
- setFamily:familyString
- face:faceString
- style:styleString
- size:sizeNum
- encoding:encodingSym
- device:nil.
+ setFamily:familyString
+ face:faceString
+ style:styleString
+ size:sizeNum
+ encoding:encodingSym
+ device:nil.
^ newFont
+
+ "Modified: / 26.9.1999 / 13:49:45 / cg"
! !
!Font methodsFor:'accessing'!
@@ -1099,6 +1102,6 @@
!Font class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.71 1999-08-18 19:13:05 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.72 1999-09-26 13:30:19 cg Exp $'
! !
Font initialize!