--- loncom/xml/run.pm	2004/01/29 18:46:25	1.43
+++ loncom/xml/run.pm	2004/02/26 22:08:54	1.44
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.43 2004/01/29 18:46:25 albertel Exp $
+# $Id: run.pm,v 1.44 2004/02/26 22:08:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@ $Apache::run::EVALUATE_STRING=<<'ENDEVAL
   my %_LONCAPA_INTERNAL_oldexpressions=();
   while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {
     $_LONCAPA_INTERNAL_oldexpressions{$_}=1;
-    $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
+    $_ =~s/((?:\$|\&)(?:(?:\#\$|\#)?[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
     if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
   }
 ENDEVALUATE