Font.st
changeset 7346 a95e98332e78
parent 7269 4254121eadd0
child 7431 c6769fccedff
--- a/Font.st	Sun May 08 03:59:49 2016 +0200
+++ b/Font.st	Sun May 08 04:01:04 2016 +0200
@@ -62,7 +62,7 @@
     before doing the draw; so you do not have to care.
 
     However, some operations require explicit conversion to a device font
-    before being allowed. For example, a query for a fonts height (in device
+    before being allowed. For example, a query for a font's height (in device
     units) can only be done if the font being asked is associated to
     a device (which should be clear, since a 'courier-roman-12' font may
     have a different number of pixels on a 75dpi vs. a 120dpi display. And
@@ -105,18 +105,18 @@
 
     [Instance variables:]
 
-      family          <String>        the fonts family ('courier', 'helvetica' etc)
-      face            <String>        the fonts face ('bold', 'medium' etc)
-      style           <String>        the fonts style ('roman', 'italic', 'oblique')
-      size            <String>        the fonts size (not in pixels) 
-      encoding        <Symbol>        the fonts encoding (usually #iso8859)
+      family          <String>        the font's family ('courier', 'helvetica' etc)
+      face            <String>        the font's face ('bold', 'medium' etc)
+      style           <String>        the font's style ('roman', 'italic', 'oblique')
+      size            <String>        the font's size (not in pixels) 
+      encoding        <Symbol>        the font's encoding (usually #iso8859)
 
       device          <Object>        the device the font is associated to, or nil
       fontId          <Object>        the id of the font on that device, or nil
       replacement     <Font>          the replacement font or nil
 
-      ascent          <Integer>       the fonts ascent in device units on device
-      descent         <Integer>       the fonts descent in device units on device
+      ascent          <Integer>       the font's ascent in device units on device
+      descent         <Integer>       the font's descent in device units on device
       width           <Integer>       the character width in device units on device
                                       (for variable fonts, its the width of a space)
       isFixedWidth    <Boolean>       true if font is a fixed width font
@@ -597,7 +597,7 @@
 printOn:aStream
     "append a user printed representation of the receiver to aStream.
      The format is suitable for a human - not meant to be read back.
-     Redefined to print more about the fonts name"
+     Redefined to print more about the font's name"
 
     face isNil ifTrue:[
         family isNil ifTrue:[
@@ -896,7 +896,7 @@
 !
 
 ascentOn:aDevice
-    "return the fonts ascent (average), if used on aDevice."
+    "return the font's ascent (average), if used on aDevice."
 
     replacementFont notNil ifTrue:[
         ^ replacementFont ascentOn:aDevice
@@ -926,7 +926,7 @@
 !
 
 descentOn:aDevice
-    "return the fonts descent (average), if used on aDevice."
+    "return the font's descent (average), if used on aDevice."
 
     replacementFont notNil ifTrue:[
         ^ replacementFont descentOn:aDevice
@@ -941,16 +941,16 @@
 !
 
 height
-    "return the fonts characters normal (average) height;
+    "return the font's characters normal (average) height;
      That is the number of units (usually pixels) on the device.
      The receiver must be associated to a device,
      for this query to be legal."
 
     device isNil ifTrue:[
-	self errorNoDevice.
+        self errorNoDevice.
     ].
     replacementFont notNil ifTrue:[
-	^ replacementFont height
+        ^ replacementFont height
     ].
     ^ descent + ascent.
 !
@@ -1009,7 +1009,7 @@
 !
 
 heightOn:aDevice
-    "return the fonts height (average), if used on aDevice."
+    "return the font's height (average), if used on aDevice."
 
     replacementFont notNil ifTrue:[
         ^ replacementFont heightOn:aDevice
@@ -1024,16 +1024,16 @@
 !
 
 maxAscent
-    "return the fonts maximum-ascent (i.e. the maximum of all characters);
+    "return the font's maximum-ascent (i.e. the maximum of all characters);
      That is the number of units (usually pixels) above the baseline.
      The receiver must be associated to a device,
      for this query to be legal."
 
     device isNil ifTrue:[
-	self errorNoDevice
+        self errorNoDevice
     ].
     replacementFont notNil ifTrue:[
-	^ replacementFont maxAscent
+        ^ replacementFont maxAscent
     ].
     ^ maxAscent
 !
@@ -1054,16 +1054,16 @@
 !
 
 maxHeight
-    "return the fonts characters maximum height;
+    "return the font's characters maximum height;
      That is the number of units (usually pixels) on the device.
      The receiver must be associated to a device,
      for this query to be legal."
 
     device isNil ifTrue:[
-	self errorNoDevice.
+        self errorNoDevice.
     ].
     replacementFont notNil ifTrue:[
-	^ replacementFont maxHeight
+        ^ replacementFont maxHeight
     ].
     ^ maxDescent + maxAscent.
 !
@@ -1084,7 +1084,7 @@
 !
 
 width
-    "return the fonts characters width;
+    "return the font's characters width;
      That is the number of units (usually pixels) on the device.
      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).
@@ -1210,7 +1210,7 @@
 !
 
 widthOn:aDevice
-    "return the fonts width, if used on aDevice.
+    "return the font's width, if used on aDevice.
      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)."