--- a/Font.st Wed Jun 05 15:24:28 2013 +0200
+++ b/Font.st Wed Jun 05 16:36:14 2013 +0200
@@ -623,16 +623,16 @@
fetchedEncoding isNil ifTrue:[
fetchedEncoding := device encodingOf:fontId.
].
+
encoding notNil ifTrue:[
- (encoding ~= fetchedEncoding
- and:[encoding ~= #'ms-default'
- and:[encoding ~= #'ms-ansi'
- and:[encoding ~= #'ms-oem'
- and:[encoding ~= #*]]]]) ifTrue:[
- ('Font [warning]: encoding for %1 should be %2; is %3 '
- bindWith:self
- with: encoding
- with: fetchedEncoding) infoPrintCR.
+ (encoding ~= fetchedEncoding) ifTrue:[
+ (( #( #'iso10646-1' #'ms-default' #'ms-ansi' #'ms-oem' ) includes:encoding)
+ and:[ ( #( #'iso10646-1' #'ms-default' #'ms-ansi' #'ms-oem' ) includes:fetchedEncoding)]) ifFalse:[
+ encoding ~= #* ifTrue:[
+ ('Font [warning]: encoding for "%1" should be %2; is %3 '
+ bindWith:self with: encoding with: fetchedEncoding) infoPrintCR.
+ ].
+ ].
].
] ifFalse:[
encoding := fetchedEncoding.
@@ -1276,11 +1276,11 @@
!Font class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.130 2013-06-05 10:56:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.131 2013-06-05 14:36:14 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.130 2013-06-05 10:56:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.131 2013-06-05 14:36:14 cg Exp $'
! !