--- a/FontDescription.st Sun Feb 12 22:10:26 2017 +0100
+++ b/FontDescription.st Sun Feb 12 22:57:20 2017 +0100
@@ -985,7 +985,12 @@
] ifFalse:[
(pixelSize ~= aFont pixelSize) ifTrue:[ ^ false ].
].
+ (self isForcedNonXFTFont or:[aFont isForcedNonXFTFont]) ifTrue:[
+ (self isXftFont or:[aFont isXftFont]) ifTrue:[^ false].
+ ].
^ true
+
+ "Modified: / 12-02-2017 / 22:16:48 / cg"
! !
!FontDescription methodsFor:'converting'!
@@ -1233,6 +1238,7 @@
|newFont|
aDevice isNil ifTrue:[^ self].
+
newFont := Font
family:family
face:face
@@ -1243,7 +1249,8 @@
newFont flags:flags.
^ newFont onDevice:aDevice.
- "Created: 28.3.1997 / 16:09:30 / cg"
+ "Created: / 28-03-1997 / 16:09:30 / cg"
+ "Modified (format): / 12-02-2017 / 22:15:12 / cg"
!
scaled:factor
@@ -1351,12 +1358,22 @@
|prefs|
+ self isForcedNonXFTFont ifTrue:[
+ ^ self
+ onDevice:aDevice
+ xFontsOnly:true
+ xftFontsOnly:false
+ ifAbsent:exceptionBlock
+ ].
+
prefs := UserPreferences current.
^ self
onDevice:aDevice
xFontsOnly:(prefs useXFontsOnly)
xftFontsOnly:(prefs useXftFontsOnly)
- ifAbsent:exceptionBlock
+ ifAbsent:exceptionBlock
+
+ "Modified: / 12-02-2017 / 22:17:49 / cg"
!
onDevice:aDevice xFontsOnly:xFontsOnly xftFontsOnly:xftFontsOnly ifAbsent:exceptionBlock