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 -N -r1.48.2.9 -r1.48.2.10 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 30 Jul 2014 11:55:01 -0000 1.48.2.9 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 9 Sep 2014 08:32:01 -0000 1.48.2.10 @@ -21,7 +21,7 @@ src varlist } { - return a the output of a tcl/adp pair as a string. adp_level is + return a the output of a Tcl/ADP pair as a string. adp_level is set to the calling procedure so that pass by reference works. and example of using this is in the search indexer for various content types: @@ -36,12 +36,12 @@ @param uplevel how far up the stack should the adp_level be set to (default is the calling procedures level) - @param src should be the path to the tcl/adp pair relative to the server root, as + @param src should be the path to the Tcl/ADP pair relative to the server root, as with the src attribute to the include tag. @param varlist a list of {key value key value ... } varlist can also be &var foo for things passed by reference (arrays and multirows) - @return the string generated by the tcl/adp pair. + @return the string generated by the Tcl/ADP pair. @author Jeff Davis davis@xarg.net @creation-date 2004-06-02 @@ -359,14 +359,14 @@ } ad_proc -private template::adp_init { type file_stub } { - Ensures that both data source tcl files and compiled adp templates + Ensures that both data source Tcl files and compiled ADP templates are wrapped in procedures in the current interpreter. Procedures are cached in byte code form in the interpreter, so this is more - efficient than sourcing a tcl file or parsing the template every + efficient than sourcing a Tcl file or parsing the template every time. Also checks the modification time on the source file to ensure that the procedure is up-to-date. - @param type Either adp (template) or tcl (code) + @param type Either ADP (template) or Tcl (code) @param file_stub The root (sans file extension) of the absolute path to the .adp or .tcl file to source. } { @@ -449,14 +449,14 @@ set quote_p 0 } - # Convert syntax to TCL syntax: - # It's either an array variable or a tcl variable + # Convert syntax to Tcl syntax: + # It's either an array variable or a Tcl variable # array variables # TODO: ad_quotehtml # TODO: lang::util::localize regsub -all {[\]\[\{\}\"]\\$} $substitution {\\&} substitution if { [regexp {^%([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)%$} $substitution match arr key] } { - # the array key name is substitured by the tcl parser s + # the array key name is substitured by the Tcl parser s regsub -all {[\]\[\{\}\"]\\$} $key {\\&} key set command "set ${arr}(${key})" set substitution [uplevel $command] @@ -504,7 +504,7 @@ regsub -all {([^0-9])%>} $chunk {\1} chunk # warn about the first ambiguity in the source if [regexp {[0-9]+%>} $chunk match] { - ns_log warning "ambiguous '$match'; write tcl escapes with a space like\ + ns_log warning "ambiguous '$match'; write Tcl escapes with a space like\ <% set x 50 %> and HTML tags with proper quoting, like
\ when compiling ADP source: template::adp_compile $source_type {$source}" }