--- a/Font.st	Tue Jul 23 21:40:47 2002 +0200
+++ b/Font.st	Tue Jul 23 22:33:41 2002 +0200
@@ -308,7 +308,7 @@
 
 !Font methodsFor:'displaying'!
 
-displayOpaqueString:aString from:index1 to:index2 x:x y:y in:aGC
+displayString:aString from:index1 to:index2 x:x y:y in:aGC opaque:opaque
     "this is only called for fonts which have a nil fontId,
      and therefore use the replacementFont. Should never be called
      for non-replacement fonts."
@@ -319,37 +319,13 @@
     replacementFont isNil ifTrue:[
         fontId notNil ifTrue:[
             aGC basicFont:self.
-            aGC displayOpaqueString:aString from:index1 to:index2 x:x y:y.
+            aGC displayString:aString from:index1 to:index2 x:x y:y opaque:opaque.
         ] ifFalse:[
             'Font: [warning]: no replacementFont. should not happen' errorPrintCR.
         ].
     ] ifFalse:[
         aGC basicFont:replacementFont.
-        aGC displayOpaqueString:aString from:index1 to:index2 x:x y:y.
-    ].
-    aGC basicFont:prevFont
-
-    "Modified: 10.1.1997 / 17:51:10 / cg"
-!
-
-displayString:aString from:index1 to:index2 x:x y:y in:aGC
-    "this is only called for fonts which have a nil fontId,
-     and therefore use the replacementFont. Should never be called
-     for non-replacement fonts."
-
-    |prevFont|
-
-    prevFont := aGC font.
-    replacementFont isNil ifTrue:[
-        fontId notNil ifTrue:[
-            aGC basicFont:self.
-            aGC displayString:aString from:index1 to:index2 x:x y:y.
-        ] ifFalse:[
-            'Font: [warning]: no replacementFont. should not happen' errorPrintCR.
-        ].
-    ] ifFalse:[
-        aGC basicFont:replacementFont.
-        aGC displayString:aString from:index1 to:index2 x:x y:y.
+        aGC displayString:aString from:index1 to:index2 x:x y:y opaque:opaque.
     ].
     aGC basicFont:prevFont.
 
@@ -1107,6 +1083,6 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.84 2002-07-18 12:40:59 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.85 2002-07-23 20:33:05 mb Exp $'
 ! !
 Font initialize!