Index: openacs-4/packages/acs-templating/resources/forms/grid.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/grid.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-templating/resources/forms/grid.adp	22 Sep 2003 17:42:56 -0000	1.5
+++ openacs-4/packages/acs-templating/resources/forms/grid.adp	25 Nov 2003 13:07:36 -0000	1.5.2.1
@@ -35,22 +35,26 @@
         <if @elements.widget@ in radio checkbox>
           <table cellpadding=4 cellspacing=0 border=0>
             <tr>
-            ~formgroup id=@elements.id@>
-              <td>+formgroup.widget+</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">+formgroup.label+</label></td>
-            </formgroup>
+              <noparse>
+                <formgroup id=@elements.id@>
+                  <td>\@formgroup.widget\@</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option\@">\@formgroup.label\@</label></td>
+                </formgroup>
+              </noparse>
             </tr>
           </table>
-          ~formerror id=@elements.id@><br><font color="red"><b>+formerror.@elements.id@+<b></font>~/formerror>
+          <noparse><formerror id=@elements.id@><br><font color="red"><b>\@formerror.@elements.id@\@<b></font></formerror></noparse>
         </if>
           
         <else>         
           <if @elements.widget@ eq inform>
-            ~formwidget id=@elements.id@>
+            <noparse><formwidget id=@elements.id@></noparse>
           </if>
           <else>
-            ~formwidget id=@elements.id@>
-            ~formerror id=@elements.id@><br><font color="red"><b>
-                +formerror.@elements.id@+<b></font>~/formerror>
+            <noparse>
+              <formwidget id=@elements.id@>
+              <formerror id=@elements.id@><br><font color="red"><b>
+                \@formerror.@elements.id@\@<b></font></formerror>
+            </noparse>
           </else>
         </else>
 
@@ -83,11 +87,6 @@
 
 <multiple name=elements>
   <if @elements.widget@ eq "hidden">
-     ~formwidget id=@elements.id@>
+     <noparse><formwidget id=@elements.id@></noparse>
   </if>
 </multiple> 
-
-
-
-
-
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	24 Nov 2003 23:29:58 -0000	1.25.2.1
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	25 Nov 2003 13:07:36 -0000	1.25.2.2
@@ -343,9 +343,6 @@
 
   template::code::adp::$file_stub
 
-  # unprotect registered tags and variable references
-  set __adp_output [string map { ~ < + @ } $__adp_output]
-
   return $__adp_output
 }