--- a/Font.st Tue Jan 15 17:29:03 2013 +0100
+++ b/Font.st Wed Jan 16 17:33:59 2013 +0100
@@ -480,7 +480,7 @@
size:(sizeUnit == #px ifTrue:[pixelSize] ifFalse:[trySize])
sizeUnit:sizeUnit
encoding:encoding.
- ] doWhile:[id isNil and:[trySize := trySize - 1. trySize > 4]].
+ ] doWhile:[id isNil and:[trySize := trySize - 1. trySize > 4. false]].
alternateFamilyName := eachAlternateFamilyName.
id notNil.
] ifNone:[].
@@ -488,8 +488,23 @@
id notNil ifTrue:[
('Font [info]: use alternative: ', alternateFamilyName , ' for: ' , (self userFriendlyName)) infoPrintCR.
] ifFalse:[
- id := aDevice getDefaultFontWithEncoding:encoding.
- ('Font [info]: use default for ' , (self userFriendlyName)) infoPrintCR.
+ encoding = #'iso10646-1' ifTrue:[
+ "/ try latin1 (for osx-X11)
+ id := aDevice
+ getFontWithFamily:family
+ face:face
+ style:style
+ size:(sizeUnit == #px ifTrue:[pixelSize] ifFalse:[size ? 0])
+ sizeUnit:sizeUnit
+ encoding:#'iso8859-1'.
+ id notNil ifTrue:[
+ ('Font [info]: use latin1 encoding for: ' , (self userFriendlyName)) infoPrintCR.
+ ].
+ ].
+ id isNil ifTrue:[
+ id := aDevice getDefaultFontWithEncoding:encoding.
+ ('Font [info]: use default for ' , (self userFriendlyName)) infoPrintCR.
+ ].
].
id isNil ifTrue:[
"oops did not work - this is a serious an error"
@@ -1257,11 +1272,11 @@
!Font class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.128 2013-01-07 15:50:23 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.129 2013-01-16 16:33:59 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.128 2013-01-07 15:50:23 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.129 2013-01-16 16:33:59 cg Exp $'
! !