--- a/XWorkstation.st	Fri Feb 13 01:14:13 2004 +0100
+++ b/XWorkstation.st	Fri Feb 13 01:38:00 2004 +0100
@@ -6061,7 +6061,9 @@
     ^ propValues
 
     "
-     Screen current fontProperties:#(#'PIXEL_SIZE' #'POINT_SIZE' #'RESOLUTION' notExistant) of:Screen current getDefaultFont
+     Screen current 
+        fontProperties:#(#'PIXEL_SIZE' #'POINT_SIZE' #'RESOLUTION' notExistant) 
+        of:Screen current getDefaultFont
     "
 !
 
@@ -6139,21 +6141,17 @@
      If the display/font does not provide that info, return nil."
 
     |props fullName|
-    props := self fontProperties:#(#'FULL_NAME' FONT)
-		  of:aFontId.
-
-    fullName := props at:1.
-    (fullName notNil and:[(fullName := self atomName:fullName) size ~~ 0]) ifTrue:[
-	^ fullName
-    ].
-    fullName := props at:2.
-    fullName notNil ifTrue:[
-	 ^ self atomName:fullName.
+
+    props := self fontProperties:#('FONT' 'FONT_NAME' 'FULL_NAME' 'FULLNAME' ) of:aFontId.
+    props do:[:eachFullNameID |
+        (eachFullNameID notNil and:[(fullName := self atomName:eachFullNameID) size ~~ 0]) ifTrue:[
+            ^ fullName
+        ].
     ].
     ^ nil.
 
     "
-      Screen current fullFontNameOf:(Screen current getDefaultFont)
+     Screen current fullFontNameOf:(Screen current getDefaultFont) 
     "
 !
 
@@ -11168,7 +11166,7 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.443 2004-02-09 13:31:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.444 2004-02-13 00:38:00 cg Exp $'
 ! !
 
 XWorkstation initialize!