--- a/ResourcePack.st	Mon Oct 23 14:11:20 2006 +0200
+++ b/ResourcePack.st	Mon Oct 23 23:11:08 2006 +0200
@@ -455,7 +455,7 @@
     "process a single valid line (i.e. #ifdef & #include has already been processed)"
 
     |name decodedLine lineStream idx rest macroName value 
-     conditional hasError decoder oldValue ignoreTranslation|
+     conditional hasError decoder oldValue ignoreTranslation indirect|
 
     encodingSymbolOrEncoder notNil ifTrue:[
         encodingSymbolOrEncoder isSymbol ifTrue:[
@@ -513,11 +513,17 @@
         idx := lineStream position1Based + 1.
     ].
 
-    conditional := false.
+    conditional := indirect := false.
     lineStream peek == $? ifTrue:[
+        conditional := true.
         lineStream next.
         lineStream skipSeparators.
-        conditional := true.
+    ].
+
+    lineStream peek == $@ ifTrue:[
+        indirect := true.
+        lineStream next.
+        lineStream skipSeparators.
     ].
 
     lineStream peek == $= ifTrue:[
@@ -592,12 +598,15 @@
                         printError value:('duplicate resource: "' , name , '"').
                     ].
                 ].
+                indirect ifTrue:[
+                    value := aResourcePack string:value.
+                ].
                 aResourcePack at:name put:value.
             ]
         ]
     ]
 
-    "Modified: / 18-09-2006 / 20:33:49 / cg"
+    "Modified: / 23-10-2006 / 23:11:22 / cg"
 ! !
 
 !ResourcePack methodsFor:'accessing'!
@@ -1257,7 +1266,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.119 2006-10-20 10:15:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.120 2006-10-23 21:11:08 cg Exp $'
 ! !
 
 ResourcePack initialize!