Font.st
changeset 5579 6b32c3679c7a
parent 5578 8b4715d3c62d
child 5582 c9401d8e2207
--- a/Font.st	Fri Jul 23 14:18:09 2010 +0200
+++ b/Font.st	Fri Jul 23 15:24:44 2010 +0200
@@ -609,9 +609,10 @@
         fetchedEncoding := device encodingOf:fontId.
     ].
     encoding notNil ifTrue:[
-        'Font [warning]: encoding should be ' infoPrint. encoding infoPrint.
-        ' is ' infoPrint. fetchedEncoding infoPrintCR.
-        "/ self assert:(encoding = fetchedEncoding).
+        (encoding = fetchedEncoding) ifFalse:[
+            'Font [warning]: encoding should be ' infoPrint. encoding infoPrint.
+            ' is ' infoPrint. fetchedEncoding infoPrintCR.
+        ]
     ] ifFalse:[
         encoding := fetchedEncoding.
     ].
@@ -630,7 +631,7 @@
     ].
     isFixedWidth := minWidth == maxWidth
 
-    "Modified: 22.5.1996 / 13:08:40 / cg"
+    "Modified: / 23-07-2010 / 15:24:36 / cg"
 !
 
 getFontMetrics
@@ -1230,11 +1231,11 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.121 2010-07-23 12:18:09 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.122 2010-07-23 13:24:44 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.121 2010-07-23 12:18:09 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.122 2010-07-23 13:24:44 cg Exp $'
 ! !
 
 Font initialize!