Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	8 Dec 2012 17:50:20 -0000	1.47
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	30 Mar 2013 17:53:58 -0000	1.48
@@ -551,12 +551,14 @@
   # variable references.
 
    # substitute array variable references
-  while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize $\2(\3)]]} code]} {}
   while {[regsub -all [template::adp_array_variable_regexp_noquote] $code {\1[lang::util::localize $\2(\3)]} code]} {}
+  while {[regsub -all [template::adp_array_variable_regexp_literal] $code {\1$\2(\3)} code]} {}
+  while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize $\2(\3)]]} code]} {}
 
   # substitute simple variable references
-  while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize ${\2}]]} code]} {}
   while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1[lang::util::localize ${\2}]} code]} {}
+  while {[regsub -all [template::adp_variable_regexp_literal] $code {\1${\2}} code]} {}
+  while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {}
 
   # unescape protected # references
   # unescape protected @ references
@@ -585,6 +587,15 @@
   return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:\.]+);noquote@}
 }
 
+ad_proc -public template::adp_array_variable_regexp_literal {} {
+  adp_array_variable_regexp's pattern augmented by "literal"
+
+  @author Gustaf Neumann
+  @creation-date December 2012
+} {
+  return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:\.]+);literal@}
+}
+
 ad_proc -public template::adp_variable_regexp {} {
   The regexp pattern used to find adp variables in
   a piece of text, i.e. occurenceis of @variable_name@. 
@@ -606,6 +617,15 @@
   return {(^|[^\\])@([a-zA-Z0-9_:]+);noquote@}
 }
 
+ad_proc -public template::adp_variable_regexp_literal {} {
+  adp_variable_regexp augmented by "literal"
+
+  @author Gustaf Neumann
+  @creation-date Dezember 2012
+} {
+  return {(^|[^\\])@([a-zA-Z0-9_:]+);literal@}
+}
+
 ad_proc -private template::adp_compile_chunk { chunk } {
     Parses a single chunk of a template.  A chunk is either the entire
     template or the portion of a template contained within a balanced
Index: openacs-4/packages/acs-templating/tcl/tag-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-templating/tcl/tag-procs.tcl	14 Feb 2013 15:15:04 -0000	1.17
+++ openacs-4/packages/acs-templating/tcl/tag-procs.tcl	30 Mar 2013 17:53:58 -0000	1.18
@@ -86,8 +86,8 @@
   # I'm not sure why we need to eval here at all, there ought to be another solution,
   # but it's not clear what the intention of below statement is.
 
-  set tokens [join $tokens " "]
   #set tokens [eval [concat list [join $tokens " "]]]
+  set tokens [join $tokens " "]
 
   return $tokens
 }
@@ -162,8 +162,8 @@
         append condition "$arg1 eq {}"
       } else {
         # substitute array variables
-        if {! ( [regsub {^"@([a-zA-Z0-9_]+)\.([a-zA-Z0-9_.]+)@"$} $arg1 {\1(\2)} arg1]
-                || [regsub {^"@([a-zA-Z0-9_:]+)@"$} $arg1 {\1} arg1] ) } {
+        if {! ( [regsub {^"@([a-zA-Z0-9_]+)\.([a-zA-Z0-9_.]+)(;\w+)?@"$} $arg1 {\1(\2)} arg1]
+		|| [regsub {^"@([a-zA-Z0-9_:]+)(;\w+)?@"$} $arg1 {\1} arg1] ) } {
           error "IF tag nil test uses string not variable for $arg1"
         }
         append condition "\[template::util::is_nil $arg1\]"