--- a/ResourcePack.st	Wed Feb 04 00:02:36 2004 +0100
+++ b/ResourcePack.st	Wed Feb 04 00:27:49 2004 +0100
@@ -613,6 +613,7 @@
     (lineString at:1) == $' ifTrue:[
         stream := ReadStream on:lineString.
         stream signalAtEnd:false.
+
         name := String 
                     readFrom:stream 
                     onError:[('ResourcePack [warning]: invalid line <'
@@ -620,14 +621,7 @@
                              ,'> in file:'
                              , fileName
                             ) errorPrintCR. nil].
-"/ OLD: l := stream position
         l := stream position1Based + 1.
-
-"/                          l := lineString indexOf:$' startingAt:2.
-"/                          l ~~ 0 ifTrue:[
-"/                              name := (lineString copyFrom:2 to:l-1).
-"/                              l := l + 1
-"/                          ]
     ] ifFalse:[
         l := lineString indexOfSeparatorStartingAt:1.
         l ~~ 0 ifTrue:[
@@ -891,7 +885,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.82 2004-02-03 17:13:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.83 2004-02-03 23:27:06 cg Exp $'
 ! !
 
 ResourcePack initialize!

--- a/XWorkstation.st	Wed Feb 04 00:02:36 2004 +0100
+++ b/XWorkstation.st	Wed Feb 04 00:27:49 2004 +0100
@@ -5917,17 +5917,23 @@
     "the fonts encoding - if the font does not provide that info,
      return nil (and assume #ascii, which is a subset of #iso8859)."
 
-    |info a|
-
-    info := self fontProperties:#(#'CHARSET_REGISTRY' #'CHARSET_ENCODING' 
-				  #'CHARSET_COLLECTIONS')
-
-		 of:aFontId.
+    |info reg enc coll|
+
+    info := self fontProperties:#(#'CHARSET_REGISTRY' 
+                                  #'CHARSET_ENCODING' 
+                                  #'CHARSET_COLLECTIONS'
+                                 )
+
+                 of:aFontId.
+
+    reg := info at:1.
+    enc := info at:2.
+    coll := info at:3.
 
     ^ self
-	extractEncodingFromRegistry:((a := info at:1) notNil ifTrue:[self atomName:a] ifFalse:[]) 
-	encoding:((a := info at:2) notNil ifTrue:[self atomName:a] ifFalse:[]) 
-	charSetCollections:((a := info at:3) notNil ifTrue:[self atomName:a] ifFalse:[])
+        extractEncodingFromRegistry:(reg notNil ifTrue:[self atomName:reg] ifFalse:[nil]) 
+        encoding:(enc notNil ifTrue:[self atomName:enc] ifFalse:[nil]) 
+        charSetCollections:(coll notNil ifTrue:[self atomName:coll] ifFalse:[nil])
 
      "
        Screen current encodingOf:Screen current getDefaultFont
@@ -6067,7 +6073,7 @@
     ^ 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
     "
 !
 
@@ -11135,7 +11141,7 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.439 2004-02-03 23:02:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.440 2004-02-03 23:27:49 cg Exp $'
 ! !
 
 XWorkstation initialize!