Fail safe when fontname matches unexpected pattern.
authorStefan Vogel <sv@exept.de>
Tue, 31 Oct 1995 01:32:45 +0100
changeset 202 a92556521455
parent 201 df7c02a96a21
child 203 8e2a6e6462b1
Fail safe when fontname matches unexpected pattern.
XWorkstat.st
XWorkstation.st
--- a/XWorkstat.st	Mon Oct 30 17:22:42 1995 +0100
+++ b/XWorkstat.st	Tue Oct 31 01:32:45 1995 +0100
@@ -36,7 +36,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.63 1995-10-30 16:21:10 stefan Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.64 1995-10-31 00:32:45 stefan Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.63 1995-10-30 16:21:10 stefan Exp $
+$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.64 1995-10-31 00:32:45 stefan Exp $
 "
 !
 
@@ -2774,7 +2774,7 @@
 	    style := aString copyFrom:start to:(end - 1).
 	    start := end + 1.
 	    size := aString copyFrom:start.
-	    size := (Number readFromString:size).
+	    size := (Number readFromString:size onError:[^false]).
 	    aBlock value:family value:nil value:style value:size value:nil.
 	    ^ true.
 	].
@@ -2787,7 +2787,7 @@
 	    family := aString copyFrom:1 to:(end - 1).
 	    start := end + 1.
 	    size := aString copyFrom:start.
-	    size := (Number readFromString:size).
+	    size := (Number readFromString:size onError:[^false]).
 	    aBlock value:family value:nil value:nil value:size value:nil.
 	    ^ true.
 	].
@@ -2873,6 +2873,8 @@
 
     aBlock value:family value:face value:style value:size value:coding.
     ^ true
+
+    "Modified: 27.9.1995 / 10:46:52 / stefan"
 !
 
 listOfAvailableFonts
@@ -2930,7 +2932,7 @@
 	listOfXFonts := names collect:[:aName |
 				    |fntDescr|
 
-				    self decomposeXFontName:aName into:
+				    (self decomposeXFontName:aName into:
 					[:family :face :style :size :coding |
 					   family notNil ifTrue:[
 					       fntDescr := FontDescription
@@ -2943,7 +2945,10 @@
 					       fntDescr := FontDescription
 							       name:aName
 					   ]
-					].
+					]
+				    ) ifFalse:[
+					fntDescr := FontDescription name:aName.
+				    ].  
 				    fntDescr
 			    ].
 
@@ -2953,6 +2958,8 @@
     "
      Display listOfAvailableFonts
     "
+
+    "Modified: 27.9.1995 / 10:54:47 / stefan"
 !
 
 getAvailableFontsMatching:pattern
--- a/XWorkstation.st	Mon Oct 30 17:22:42 1995 +0100
+++ b/XWorkstation.st	Tue Oct 31 01:32:45 1995 +0100
@@ -36,7 +36,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.63 1995-10-30 16:21:10 stefan Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.64 1995-10-31 00:32:45 stefan Exp $
 '!
 
 !XWorkstation class methodsFor:'documentation'!
@@ -57,7 +57,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.63 1995-10-30 16:21:10 stefan Exp $
+$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.64 1995-10-31 00:32:45 stefan Exp $
 "
 !
 
@@ -2774,7 +2774,7 @@
 	    style := aString copyFrom:start to:(end - 1).
 	    start := end + 1.
 	    size := aString copyFrom:start.
-	    size := (Number readFromString:size).
+	    size := (Number readFromString:size onError:[^false]).
 	    aBlock value:family value:nil value:style value:size value:nil.
 	    ^ true.
 	].
@@ -2787,7 +2787,7 @@
 	    family := aString copyFrom:1 to:(end - 1).
 	    start := end + 1.
 	    size := aString copyFrom:start.
-	    size := (Number readFromString:size).
+	    size := (Number readFromString:size onError:[^false]).
 	    aBlock value:family value:nil value:nil value:size value:nil.
 	    ^ true.
 	].
@@ -2873,6 +2873,8 @@
 
     aBlock value:family value:face value:style value:size value:coding.
     ^ true
+
+    "Modified: 27.9.1995 / 10:46:52 / stefan"
 !
 
 listOfAvailableFonts
@@ -2930,7 +2932,7 @@
 	listOfXFonts := names collect:[:aName |
 				    |fntDescr|
 
-				    self decomposeXFontName:aName into:
+				    (self decomposeXFontName:aName into:
 					[:family :face :style :size :coding |
 					   family notNil ifTrue:[
 					       fntDescr := FontDescription
@@ -2943,7 +2945,10 @@
 					       fntDescr := FontDescription
 							       name:aName
 					   ]
-					].
+					]
+				    ) ifFalse:[
+					fntDescr := FontDescription name:aName.
+				    ].  
 				    fntDescr
 			    ].
 
@@ -2953,6 +2958,8 @@
     "
      Display listOfAvailableFonts
     "
+
+    "Modified: 27.9.1995 / 10:54:47 / stefan"
 !
 
 getAvailableFontsMatching:pattern