--- a/DeviceWorkstation.st	Sat Jun 28 20:26:31 1997 +0200
+++ b/DeviceWorkstation.st	Mon Jun 30 11:09:02 1997 +0200
@@ -3578,22 +3578,23 @@
 
     fonts := Set new.
     allFonts do:[:fntDescr |
-	(aFamilyName = fntDescr family) ifTrue:[
-	    (aFaceName = fntDescr face) ifTrue:[
-		(filter isNil or:[filter value:fntDescr]) ifTrue:[
-		    fonts add:fntDescr
-		]
-	    ]
-	]
+        (aFamilyName match:fntDescr family) ifTrue:[
+            (aFaceName match:fntDescr face) ifTrue:[
+                (filter isNil or:[filter value:fntDescr]) ifTrue:[
+                    fonts add:fntDescr
+                ]
+            ]
+        ]
     ].
     ^ fonts
 
     "
      Display fontsInFamily:'fixed' face:'medium' filtering:[:f |
-	f encoding notNil and:[f encoding startsWith:'jis']]
+        f encoding notNil and:[f encoding startsWith:'jis']]
     "
 
     "Created: 29.2.1996 / 04:32:56 / cg"
+    "Modified: 30.6.1997 / 11:07:21 / cg"
 !
 
 fontsInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filter
@@ -3608,24 +3609,29 @@
 
     fonts := Set new.
     allFonts do:[:fntDescr |
-	(aFamilyName = fntDescr family) ifTrue:[
-	    (aFaceName = fntDescr face) ifTrue:[
-		(aStyleName = fntDescr style) ifTrue:[
-		    (filter isNil or:[filter value:fntDescr]) ifTrue:[
-			fonts add:fntDescr
-		    ]    
-		]
-	    ]
-	]
+        (aFamilyName match:fntDescr family) ifTrue:[
+            (aFaceName match:fntDescr face) ifTrue:[
+                (aStyleName match:fntDescr style) ifTrue:[
+                    (filter isNil or:[filter value:fntDescr]) ifTrue:[
+                        fonts add:fntDescr
+                    ]    
+                ]
+            ]
+        ]
     ].
     ^ fonts
 
     "
      Display fontsInFamily:'fixed' face:'medium' style:'roman' filtering:[:f |
-	f encoding notNil and:[f encoding startsWith:'jis']]
+        f encoding notNil and:[f encoding startsWith:'jis']]
+    "
+    "
+     Display fontsInFamily:'fixed' face:'*' style:'roman' filtering:[:f |
+        f encoding notNil and:[f encoding startsWith:'jis']]  
     "
 
     "Created: 29.2.1996 / 04:25:30 / cg"
+    "Modified: 30.6.1997 / 11:07:08 / cg"
 !
 
 fontsInFamily:aFamilyName filtering:filterBlock
@@ -3639,21 +3645,25 @@
 
     fonts := Set new.
     allFonts do:[:fntDescr |
-	aFamilyName = fntDescr family ifTrue:[
-	    (filterBlock isNil or:[filterBlock value:fntDescr]) ifTrue:[
-		fonts add:fntDescr
-	    ]
-	]
+        (aFamilyName match:fntDescr family) ifTrue:[
+            (filterBlock isNil or:[filterBlock value:fntDescr]) ifTrue:[
+                fonts add:fntDescr
+            ]
+        ]
     ].
     ^ fonts
 
     "
      Display fontsInFamily:'fixed' filtering:[:f |
-	f encoding notNil and:[f encoding startsWith:'jis']]
-    "
-
-    "Modified: 27.2.1996 / 01:34:11 / cg"
+        f encoding notNil and:[f encoding startsWith:'jis']]
+    "
+    "
+     Display fontsInFamily:'*' filtering:[:f |
+        f encoding notNil and:[f encoding startsWith:'jis']] 
+    "
+
     "Created: 29.2.1996 / 04:27:49 / cg"
+    "Modified: 30.6.1997 / 11:06:36 / cg"
 !
 
 fullNameOf:aFontId
@@ -5645,6 +5655,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.232 1997-06-28 18:21:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.233 1997-06-30 09:09:02 cg Exp $'
 ! !
 DeviceWorkstation initialize!