# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 905424946 -7200
# Node ID 75a179c343cf2bc9b2ee26805cf92e7a2858a84d
# Parent  7f9a8969bb2fb1f810f2df33848b4ef3e51d6b23
try replacement forn first if nonnil in queries

diff -r 7f9a8969bb2f -r 75a179c343cf Font.st
--- a/Font.st	Thu Sep 10 12:28:50 1998 +0200
+++ b/Font.st	Thu Sep 10 12:55:46 1998 +0200
@@ -696,28 +696,31 @@
 ascentOn:aDevice
     "return the fonts ascent (average), if used on aDevice."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont ascentOn:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ ascent
     ].
     ^ (self on:aDevice) ascent
 
-    "Created: 30.4.1996 / 16:41:32 / cg"
-    "Modified: 30.4.1996 / 16:44:49 / cg"
+    "Created: / 30.4.1996 / 16:41:32 / cg"
+    "Modified: / 10.9.1998 / 12:09:06 / cg"
 !
 
 descentOn:aDevice
     "return the fonts descent (average), if used on aDevice."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont descentOn:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ descent
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont descentOn:aDevice
-    ].
     ^ (self on:aDevice) descent
 
-    "Created: 30.4.1996 / 16:41:43 / cg"
-    "Modified: 18.6.1997 / 10:11:02 / cg"
+    "Created: / 30.4.1996 / 16:41:43 / cg"
+    "Modified: / 10.9.1998 / 12:09:30 / cg"
 !
 
 existsOn:aDevice
@@ -734,31 +737,31 @@
     "return the height of aString, if displayed on aDevice.
      The argument must be a string-like object."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont heightOf:aString on:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ self heightOf:aString
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont heightOf:aString on:aDevice
-    ].
     ^ (self on:aDevice) heightOf:aString
 
-    "Created: 30.4.1996 / 17:14:18 / cg"
-    "Modified: 18.6.1997 / 10:10:15 / cg"
+    "Created: / 30.4.1996 / 17:14:18 / cg"
+    "Modified: / 10.9.1998 / 12:09:47 / cg"
 !
 
 heightOn:aDevice
     "return the fonts height (average), if used on aDevice."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont heightOn:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ descent + ascent
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont heightOn:aDevice
-    ].
     ^ (self on:aDevice) height
 
-    "Created: 30.4.1996 / 16:41:59 / cg"
-    "Modified: 18.6.1997 / 10:09:46 / cg"
+    "Created: / 30.4.1996 / 16:41:59 / cg"
+    "Modified: / 10.9.1998 / 12:08:18 / cg"
 !
 
 widthOf:aString from:startIndex to:endIndex on:aDevice
@@ -766,16 +769,16 @@
      The argument may be a Character, String or some Text;
      in the last case the width of the longest line in the text is returned."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont widthOf:aString from:startIndex to:endIndex on:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ self widthOf:aString from:startIndex to:endIndex
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont widthOf:aString from:startIndex to:endIndex on:aDevice
-    ].
     ^ (self on:aDevice) widthOf:aString from:startIndex to:endIndex
 
-    "Created: 30.4.1996 / 17:15:20 / cg"
-    "Modified: 18.6.1997 / 10:11:22 / cg"
+    "Created: / 30.4.1996 / 17:15:20 / cg"
+    "Modified: / 10.9.1998 / 12:10:11 / cg"
 !
 
 widthOf:aString on:aDevice
@@ -783,16 +786,16 @@
      The argument may be a Character, String or some Text;
      in the last case the width of the longest line in the text is returned."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont widthOf:aString on:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ self widthOf:aString
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont widthOf:aString on:aDevice
-    ].
     ^ (self on:aDevice) widthOf:aString
 
-    "Created: 30.4.1996 / 17:14:18 / cg"
-    "Modified: 18.6.1997 / 10:11:39 / cg"
+    "Created: / 30.4.1996 / 17:14:18 / cg"
+    "Modified: / 10.9.1998 / 12:10:26 / cg"
 !
 
 widthOn:aDevice
@@ -800,16 +803,16 @@
      For variable pitch fonts, the width of the space character is returned.
      For fixed fonts, this is the same as minWidth or maxWidth (or any character)."
 
+    replacementFont notNil ifTrue:[
+        ^ replacementFont widthOn:aDevice
+    ].
     device == aDevice ifTrue:[
         ^ self width
     ].
-    replacementFont notNil ifTrue:[
-        ^ replacementFont widthOn:aDevice
-    ].
     ^ (self on:aDevice) width
 
-    "Created: 30.4.1996 / 16:42:28 / cg"
-    "Modified: 18.6.1997 / 10:11:54 / cg"
+    "Created: / 30.4.1996 / 16:42:28 / cg"
+    "Modified: / 10.9.1998 / 12:11:33 / cg"
 ! !
 
 !Font methodsFor:'queries-deviceFonts'!
@@ -1090,6 +1093,6 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.63 1998-04-22 10:57:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.64 1998-09-10 10:55:46 cg Exp $'
 ! !
 Font initialize!