Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	10 Oct 2005 14:15:41 -0000	1.25
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	10 Jan 2007 21:22:12 -0000	1.26
@@ -59,7 +59,7 @@
   }
 
   # default to the site-wide master
-  if {[empty_string_p $src]} {
+  if {$src eq ""} {
     set src "\[ad_parameter -package_id \[ad_conn subsite_id\]\
              DefaultMaster dummy \"/www/default-master\"\]"
   }
@@ -110,7 +110,7 @@
   for { set i 0 } { $i < [ns_set size $params] } { incr i } {
 
     set key [ns_set key $params $i]
-    if { [string equal $key src] } { continue }
+    if {$key eq "src"} { continue }
     
     set value [ns_set value $params $i]
 
@@ -165,10 +165,10 @@
       upvar 0 $name __${tag_id}_swap
   }
 
-  for { set $i [expr 1 + $startrow] } { \$$i <= \${$name:rowcount}"
+  for { set $i [expr {1 + $startrow}] } { \$$i <= \${$name:rowcount}"
 
   if {$maxrows >= 0} {
-    template::adp_append_code " && \$$i <= [expr $maxrows + $startrow]" \
+    template::adp_append_code " && \$$i <= [expr {$maxrows + $startrow}]" \
 	-nobreak
   }
   
@@ -177,11 +177,11 @@
   " -nobreak
   template::adp_compile_chunk $chunk
 
-  if { ![empty_string_p $delimiter] } {
+  if { $delimiter ne "" } {
       template::adp_append_code " if { \$$i < \${$name:rowcount}"
 
       if {$maxrows >= 0} {
-	  template::adp_append_code " && \$$i < [expr $maxrows + $startrow]" \
+	  template::adp_append_code " && \$$i < [expr {$maxrows + $startrow}]" \
 	      -nobreak
       }
 
@@ -211,7 +211,7 @@
   if { ![template::util::is_nil value] } {
 
     set name [ns_set iget $params name]
-    if { [empty_string_p $name] } {
+    if { $name eq "" } {
       set name "__ats_list_value"
     }
 
@@ -248,7 +248,7 @@
 
   set multiple_tag_id [template::enclosing_tag multiple]
 
-  if { [string equal $multiple_tag_id {}] } {
+  if {$multiple_tag_id eq {}} {
     error "No enclosing MULTIPLE tag for GROUP tag on column $column"
   }
 
@@ -266,7 +266,7 @@
   # for group tags that have other group tags inside them, since we can't know
   # if we're the last row until the inner group tag has eaten up all the 
   # rows between the start of this tag and the end.
-  if { ![empty_string_p $group_tag_id] } {
+  if { $group_tag_id ne "" } {
     template::adp_append_code "
       if { \[info exists ${name}(groupnum)\] } {
         set __${tag_id}_${group_tag_id}_groupnum \$${name}(groupnum)
@@ -303,7 +303,7 @@
       }
   "
 
-  if { ![empty_string_p $delimiter] } {
+  if { $delimiter ne "" } {
       template::adp_append_string $delimiter
   }
 
@@ -315,7 +315,7 @@
   "
 
   # Restore saved groupnum pseudocolumns
-  if { ![empty_string_p $group_tag_id] } {
+  if { $group_tag_id ne "" } {
     template::adp_append_code "
       if { \[info exists __${tag_id}_${group_tag_id}_groupnum\] } {
         set ${name}(groupnum) \$__${tag_id}_${group_tag_id}_groupnum 
@@ -336,18 +336,18 @@
   set orientation [template::get_attribute grid $params orientation vertical]
 
   template::adp_append_code "
-  set rows \[expr ceil(\${$name:rowcount} / $cols.0)\]
+  set rows \[expr {ceil(\${$name:rowcount} / $cols.0)}\]
   for { set __r 1 } { \$__r <= \$rows } { incr __r } {
     for { set __c 1 } { \$__c <= $cols } { incr __c } {
 "
 
-  if { [string equal $orientation vertical] } {
+  if {$orientation eq "vertical"} {
     template::adp_append_code "
-      set rownum \[expr 1 + int((\$__r - 1) + ((\$__c - 1) * \$rows))\]
+      set rownum \[expr {1 + int((\$__r - 1) + ((\$__c - 1) * \$rows))}\]
 "
   } else {
     template::adp_append_code "
-      set rownum \[expr 1 + int((\$__c - 1) + ((\$__r - 1) * $cols))\]
+      set rownum \[expr {1 + int((\$__c - 1) + ((\$__r - 1) * $cols))}\]
 " 
   }
 
@@ -431,7 +431,7 @@
   set id [template::get_attribute formwidget $params id]
   set type [ns_set get $params type]
 
-  if { [string equal $type {}] } {
+  if {$type eq {}} {
     set key $id
   } else {
     set key $id:$type
@@ -442,7 +442,7 @@
       set formerror($id) \$formerror($key)
     "
 
-  if { [string equal $chunk {}] } {
+  if {$chunk eq {}} {
 
     template::adp_append_string "\$formerror($key)"
 
@@ -516,7 +516,7 @@
   template::adp_append_string \
       "\[template::form render $id { $tag_attributes } \]"
 
-  if { [string equal [string trim $chunk] {}] } {
+  if {[string trim $chunk] eq {}} {
 
     # generate the form body dynamically if none specified.
     set style [ns_set iget $params style]
@@ -625,7 +625,7 @@
 
   for { set i 0 } { $i < [ns_set size $params] } { incr i } {
       set key [ns_set key $params $i]
-      if { [string equal $key src] } { 
+      if {$key eq "src"} { 
           continue 
       }
       set value [ns_set value $params $i]
@@ -757,9 +757,9 @@
         set key [ns_set key $params $i]
         set value [ns_set value $params $i]
 
-        if { [string equal $key $value] } {
+        if {$key eq $value} {
             set arg $key
-        } elseif [string equal $key flag] {
+        } elseif {$key eq "flag"} {
             append sw " -$value "            
         }
     }
@@ -782,7 +782,7 @@
     # Scan the parameter stack backward, looking for the tag name
 
     set tag_id [template::enclosing_tag switch]
-    if { [string equal $tag_id {}] } {
+    if {$tag_id eq {}} {
         error "No enclosing SWITCH tag for CASE tag on value $value"
     }    
 
@@ -792,7 +792,7 @@
 
     # insert the case statement and eval the chunk in between
 
-    if { ![string equal $value ""] } {
+    if { $value ne "" } {
 
         # processing <case value= ...> form
 
@@ -808,7 +808,7 @@
 
         set switches ""
         set size [ns_set size $params]
-        set size_1 [expr $size - 1]
+        set size_1 [expr {$size - 1}]
 
         for { set i 0 } { $i < $size } { incr i } {
 
@@ -818,13 +818,13 @@
             # pass over the first arg (syntax sugar), but check format
             if { $i == 0 } {
 
-                if ![string equal $key "in"] {
+                if {$key ne "in" } {
                     error "Format error: should be <case in \"foo\" \"bar\" ...>"
                 }
 
             } else {
 
-                if { [string equal $key $value] } {
+                if {$key eq $value} {
 
                     # last item in list so process the chunk
                     if { $i == $size_1 } {
@@ -856,7 +856,7 @@
     # Scan the parameter stack backward, looking for the tag name
 
     set tag_id [template::enclosing_tag switch]
-    if { [string equal $tag_id {}] } {
+    if {$tag_id eq {}} {
         error "No enclosing SWITCH tag for DEFAULT tag"
     }