Font.st
changeset 89 ea2bf46eb669
parent 86 032006651226
child 99 c40b8a508283
--- a/Font.st	Mon Feb 06 01:30:10 1995 +0100
+++ b/Font.st	Mon Feb 06 01:38:04 1995 +0100
@@ -24,7 +24,7 @@
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Font.st,v 1.12 1994-11-28 21:00:49 claus Exp $
+$Header: /cvs/stx/stx/libview/Font.st,v 1.13 1995-02-06 00:36:10 claus Exp $
 '!
 
 !Font class methodsFor:'documentation'!
@@ -45,7 +45,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Font.st,v 1.12 1994-11-28 21:00:49 claus Exp $
+$Header: /cvs/stx/stx/libview/Font.st,v 1.13 1995-02-06 00:36:10 claus Exp $
 "
 !
 
@@ -179,14 +179,15 @@
 !Font class methodsFor:'instance creation'!
 
 family:familyString face:faceString style:styleString size:sizeNum
-    "returns a font for given family, face, style and size. 
+    "returns a font for given family, face, style and size with
+     unspecified encoding. 
      The returned font is not associated to a specific device"
 
     ^ self family:familyString
 	   face:faceString
 	   style:styleString
 	   size:sizeNum
-	   encoding:#iso8859
+	   encoding:nil
 !
 
 family:familyString face:faceString style:styleString size:sizeNum encoding:encodingSym
@@ -262,7 +263,7 @@
 		(family = aFont family) ifTrue:[
 		    (face = aFont face) ifTrue:[
 			(style = aFont style) ifTrue:[
-			    (encoding == aFont encoding) ifTrue:[
+			    (encoding isNil or:[encoding == aFont encoding]) ifTrue:[
 				^ aFont
 			    ]
 			]