--- a/Font.st	Thu Jul 22 18:54:52 2010 +0200
+++ b/Font.st	Fri Jul 23 14:18:09 2010 +0200
@@ -359,7 +359,6 @@
 
     aDevice deviceFonts do:[:aFont |
         (self sameDeviceFontAs:aFont) ifTrue:[
-            self assert:aFont encoding = encoding.
             ^ aFont
         ].
     ].
@@ -397,7 +396,6 @@
         aDevice registerFont:newFont.
         ^ newFont
     ].
-self assert:newFont encoding = encoding.
 
     ^ newFont
 
@@ -593,7 +591,7 @@
 getFontInfos
     "ask the device about all of my actual attributes"
 
-    |info|
+    |info fetchedEncoding|
 
     replacementFont notNil ifTrue:[
         replacementFont getFontInfos.
@@ -606,9 +604,16 @@
     maxCode := info maxCode.
     direction := info direction.
 
-    encoding := info encoding.
-    encoding isNil ifTrue:[
-        encoding := device encodingOf:fontId.
+    fetchedEncoding := info encoding.
+    fetchedEncoding isNil ifTrue:[
+        fetchedEncoding := device encodingOf:fontId.
+    ].
+    encoding notNil ifTrue:[
+        'Font [warning]: encoding should be ' infoPrint. encoding infoPrint.
+        ' is ' infoPrint. fetchedEncoding infoPrintCR.
+        "/ self assert:(encoding = fetchedEncoding).
+    ] ifFalse:[
+        encoding := fetchedEncoding.
     ].
     ascent := info ascent.
     descent := info descent.
@@ -1225,11 +1230,11 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.120 2010-02-10 21:19:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.121 2010-07-23 12:18:09 ca Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.120 2010-02-10 21:19:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.121 2010-07-23 12:18:09 ca Exp $'
 ! !
 
 Font initialize!