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.26 -r1.26.2.1 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 27 Feb 2004 19:39:25 -0000 1.26 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 18 Mar 2004 09:07:44 -0000 1.26.2.1 @@ -357,11 +357,20 @@ set substitution "%" } else { # An embedded variable - + + # Remove any noquote instruction + set quote_p 1 + if { [regsub {;noquote} $percent_match {} substitution] } { + # We removed a noquote instruction so don't quote + set quote_p 0 + } + # Convert syntax to TCL syntax: # It's either an array variable or a tcl variable # array variables - regsub {^%([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)%$} $percent_match {$\1(\2)} substitution + # TODO: ad_quotehtml + # TODO: lang::util::localize + regsub {^%([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)%$} $substitution {$\1(\2)} substitution # ordinary variables regsub {^%([a-zA-Z0-9_:]+)%$} $substitution {$\1} substitution