Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/assessment/lib/session-items.adp	7 Aug 2017 23:48:03 -0000	1.22
+++ openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:13:22 -0000	1.23
@@ -5,7 +5,7 @@
 
     <multiple name="items">
 <if @admin_p;literal@ true><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
-<if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
+<if @feedback_only_p;literal@ eq 0 or @items.has_feedback_p;literal@ eq 1>
      <if @show_item_name_p;literal@ true><p style="font-weight:bold;">@items.name@:</p></if>
       <if @survey_p@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
@@ -32,17 +32,17 @@
 			<if @items.answered_p;literal@ true><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
-		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
+		      <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		    </if>
 		    <else>
 		      <if @items.answered_p;literal@ true><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
-		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+		    <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
               <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
-		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@"> 
+		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		  </if>
 		</if>
 	      <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -64,7 +64,7 @@
         </else>
 	</if>
 	  <elseif @items.presentation_type@ eq fitb>
-	    @items.html;noquote@ 
+	    @items.html;noquote@
 	  </elseif>
 	  <elseif @items.presentation_type@ eq f>
   	    <a href="@items.view@" id="p-type-f-@items.as_item_id"><formwidget id="response_to_item.@items.as_item_id@"></a>
@@ -80,8 +80,8 @@
 	  </if>
     </group>
 
-  <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>    
-  <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+  <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>
+  <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
     <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
   <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	7 Aug 2017 23:48:03 -0000	1.31
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	22 May 2018 15:13:22 -0000	1.32
@@ -19,7 +19,7 @@
   </if>
 
 <if @show_title_p;literal@ true><h2>@section.title@</h2></if>
-    <if @section.description@ not nil><p>@section.description;noquote@</p></if>    
+    <if @section.description@ not nil><p>@section.description;noquote@</p></if>
     <if @section.instructions@ not nil><p>@section.instructions;noquote@</p></if>
 
 
@@ -30,8 +30,8 @@
        <div class="question-container" style="margin-bottom:25px">
          <if @items.description@ not nil><p>@items.description;noquote@</p></if>
          <if @items.content@ not nil><p>@items.content;noquote@</p></if>
-         <if @items.presentation_type@ ne fitb><strong>@items.question_text;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></strong></if>
-     
+         <if @items.presentation_type@ ne fitb><strong>@items.question_text;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></strong></if>
+
 <group column=as_item_id>
          <div class="form-widget">
 
@@ -48,7 +48,7 @@
            <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
                <if @items.choice_orientation@ ne horizontal>
                  <formgroup id="response_to_item.@items.as_item_id@">
-                   @formgroup.widget;noquote@ 
+                   @formgroup.widget;noquote@
 <label for="show_item_form:elements:response_to_item.@items.as_item_id@:@formgroup.option@">
 @formgroup.label;noquote@<br>
 </label>
@@ -93,4 +93,4 @@
     <div><input type="submit" value="#assessment.Submit#"></div>
   </formtemplate>
 
-<!--<div style="clear: both;" />-->
\ No newline at end of file
+<!--<div style="clear: both;" />-->
Index: openacs-4/packages/assessment/www/assessment-single-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/www/assessment-single-submit.adp	7 Aug 2017 23:48:03 -0000	1.14
+++ openacs-4/packages/assessment/www/assessment-single-submit.adp	22 May 2018 15:13:22 -0000	1.15
@@ -33,7 +33,7 @@
       <input type="hidden" name="as_item_id" value="@items.as_item_id@">
       <tr>
       <tr bgcolor="#e4eaef"><if @assessment_data.show_item_name_p;literal@ true><td colspan="2" nowrap><strong>@items.name@:<if @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></strong></td></if>
-        <td><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></if></strong></td></tr>
+        <td><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></if></strong></td></tr>
       <if @items.content@ not nil><tr><if @assessment_data.show_item_name_p;literal@ true><td colspan="4"></if><else><td colspan="3"></else>@items.content;noquote@</td></tr></if>
 
       <tr><if @assessment_data.show_item_name_p;literal@ true><td colspan="4"></if><else><td colspan="3"></else>
Index: openacs-4/packages/assessment/www/asm-admin/section-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-preview.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/www/asm-admin/section-preview.adp	7 Aug 2017 23:48:04 -0000	1.10
+++ openacs-4/packages/assessment/www/asm-admin/section-preview.adp	22 May 2018 15:13:22 -0000	1.11
@@ -24,7 +24,7 @@
       <multiple name="items">
       <tr>
       <tr><if @assessment_data.show_item_name_p;literal@ true><td bgcolor="#e4eaef" colspan="2" nowrap><strong>@items.name@:</strong><if @items.required_p;literal@ true> <span style="color: #f00;">*</span></if></td></if>
-        <td bgcolor="#e4eaef"><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></if></strong>
+        <td bgcolor="#e4eaef"><strong><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p;literal@ eq f and @items.required_p;literal@ eq t> <span style="color: #f00;">*</span></if></if></strong>
       <if @items.content@ not nil><tr><td bgcolor="#e4eaef" colspan="4"><br>@items.content;noquote@</if>
       <if @items.title@ ne @items.next_title@>
         </td></tr>
Index: openacs-4/packages/categories/www/include/widget.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/include/widget.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/include/widget.adp	7 Aug 2017 23:48:05 -0000	1.5
+++ openacs-4/packages/categories/www/include/widget.adp	22 May 2018 15:13:22 -0000	1.6
@@ -2,7 +2,7 @@
   <multiple name=trees>
     @trees.tree_name@:
     <select name="@name@"<if @trees.assign_single_p;literal@ false> #categories.multiple#</if>>
-    <if @trees.assign_single_p@ eq t and @trees.require_category_p@ eq f><option value=""></if>
+    <if @trees.assign_single_p;literal@ eq t and @trees.require_category_p;literal@ eq f><option value=""></if>
     <group column=tree_id>
       <option value="@trees.category_id@"<if @trees.selected_p;literal@ true> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
Index: openacs-4/packages/general-comments/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/general-comments/www/test.adp	7 Aug 2017 23:48:12 -0000	1.9
+++ openacs-4/packages/general-comments/www/test.adp	22 May 2018 15:13:22 -0000	1.10
@@ -28,7 +28,7 @@
 <tr>
   <td>AutoApproveCommentsP</td>
   <td>
-    <if @auto_approve_comments_p@ eq "">
+    <if @auto_approve_comments_p;literal@ eq "">
       <em>#general-comments.not_set#</em>
     </if>
     <else>
@@ -38,7 +38,7 @@
 <tr>
   <td>AllowFileAttachmentsP</td>
   <td>
-    <if @allow_file_attachments_p@ eq "">
+    <if @allow_file_attachments_p;literal@ eq "">
       <em>#general-comments.not_set#</em>
     </if>
     <else>
@@ -48,7 +48,7 @@
 <tr>
   <td>AllowLinkAttachmentsP</td>
   <td>
-    <if @allow_link_attachments_p@ eq "">
+    <if @allow_link_attachments_p;literal@ eq "">
       <em>#general-comments.not_set#</em>
     </if>
     <else>
Index: openacs-4/packages/general-comments/www/view-comment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/general-comments/www/view-comment.adp	7 Aug 2017 23:48:12 -0000	1.11
+++ openacs-4/packages/general-comments/www/view-comment.adp	22 May 2018 15:13:22 -0000	1.12
@@ -27,17 +27,17 @@
 <ul>
   <% set counter 0 %>
   <multiple name=attachments>
-    <% incr counter %>  
+    <% incr counter %>
     <li>
     <if @is_creator_p;literal@ true>
       ( <a href="@attachments.file_edit_url@">#general-comments.edit#</a> | <a href="@attachments.delete_attachment_url@">#general-comments.delete#</a> )
     </if>
     <if @attachments.mime_type@ eq image/gif or @attachments.mime_type@ eq image/jpeg>
-      @attachments.title@ 
+      @attachments.title@
       (<a href="@attachments.view_image_url@">@attachments.name@</a>)
     </if>
     <else>
-      @attachments.title@ 
+      @attachments.title@
       (<a href="file-download?item_id=@attachments.item_id@">@attachments.name@</a>)
     </else>
   </multiple>
@@ -46,22 +46,22 @@
     <li>
     <if @is_creator_p;literal@ true>
         ( <a href="links.url_edit_url@">#general-comments.edit#</a> | <a href="@links.delete_attachment_url@">#general-comments.delete#</a> )
-    </if>      
+    </if>
     <a href="@links.url@">@links.label@</a>
   </multiple>
   <if @counter@ eq 0>
     <li>#general-comments.no_attachments#
   </if>
 </ul>
 
-<if @is_creator_p@ eq t and @allow_attach_p@ eq t>
+<if @is_creator_p;literal@ eq t and @allow_attach_p;literal@ eq t>
   <h2>#general-comments.Actions#</h2>
   <ul>
     <if @allow_file_p;literal@ true>
       <li><a href="@action_file_add_url@">#general-comments.lt_Attach_a_file_or_pict#</a><br>
     </if>
     <if @allow_link_p;literal@ true>
-      <li><a href="@action_url_add_url@">#general-comments.Attach_a_web_link#</a><br>  
+      <li><a href="@action_url_add_url@">#general-comments.Attach_a_web_link#</a><br>
     </if>
   </ul>
 </if>
Index: openacs-4/packages/new-portal/www/themes/deco-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/deco-theme.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/new-portal/www/themes/deco-theme.adp	7 Aug 2017 23:48:12 -0000	1.11
+++ openacs-4/packages/new-portal/www/themes/deco-theme.adp	22 May 2018 15:13:22 -0000	1.12
@@ -34,29 +34,29 @@
     <tbody>
     <tr>
     <td align="left" valign="middle" width="88%"  bgcolor="#eeeee7">
-	<if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+	<if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
           <strong>@name;noquote@</strong>
         </if><else>
           <a style="text-decoration: none" href="@link@"><strong>@name;noquote@</strong></a>
         </else>
     </td>
-		<if @user_editable_p;literal@ true>	
+		<if @user_editable_p;literal@ true>
                   <td align="right" width="7%">
 
 			<a href="configure-element?element_id=@element_id@&amp;op=edit"><img border="0" src="@dir@/edit.gif" alt="edit"></a></td>
 		</if>
 
-		<if @shadeable_p;literal@ true>		
+		<if @shadeable_p;literal@ true>
                   <td align="right" width="7%">
 		    <a href="configure-element?element_id=@element_id@&amp;op=shade">
-		    <if @shaded_p;literal@ false>	
+		    <if @shaded_p;literal@ false>
 		    <img border="0" src="@dir@/shade.gif" alt="shade"></a></td>
 		    </if><else>
 		    <img border="0" src="@dir@/unshade.gif" alt="unshade"></a></td>
 		    </else>
 		</if>
 
-		<if @hideable_p;literal@ true>		
+		<if @hideable_p;literal@ true>
                   <td align="right" width="7%">
 			<a href="configure-element?element_id=@element_id@&amp;op=hide"><img border="0" src="@dir@/x.gif" alt="hide"></a></td>
 		</if>
Index: openacs-4/packages/new-portal/www/themes/nada-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/nada-theme.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/www/themes/nada-theme.adp	7 Aug 2017 23:48:12 -0000	1.8
+++ openacs-4/packages/new-portal/www/themes/nada-theme.adp	22 May 2018 15:13:22 -0000	1.9
@@ -32,7 +32,7 @@
     <tr>
     <td class="element-header-text-plain">
       <big>
-	<if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+        <if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
           <strong>@name;noquote@</strong>
         </if>
         <else>
@@ -42,12 +42,12 @@
     </td>
 
     <td class="element-header-buttons-plain">
-          
-      <if @user_editable_p;literal@ true>	
+
+      <if @user_editable_p;literal@ true>
           <a href="configure-element?element_id=@element_id@&amp;op=edit">[edit]</a>
       </if>
-  
-      <if @shadeable_p;literal@ true>		
+
+      <if @shadeable_p;literal@ true>
         <a href="configure-element?element_id=@element_id@&amp;op=shade">
           <if @shaded_p;literal@ false>
             [shade]</a>
@@ -56,17 +56,17 @@
             [unshade]</a>
           </else>
       </if>
-  
-      <if @hideable_p;literal@ true>		
+
+      <if @hideable_p;literal@ true>
         <a href="configure-element?element_id=@element_id@&amp;op=hide"> [hide]</a>
       </if>
-  
+
     </td>
 
     </tr>
 
     </tbody>
-        
+
   </table>
 
 </td>
Index: openacs-4/packages/new-portal/www/themes/simple-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/simple-theme.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	7 Aug 2017 23:48:12 -0000	1.22
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	22 May 2018 15:13:22 -0000	1.23
@@ -19,37 +19,37 @@
 %>
 
 <table class="element" border="0" cellpadding="1" cellspacing="0" width="100%">
-<tr> 
+<tr>
   <td class="element-header-text">
-    <if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">	
+    <if @link_hideable_p;literal@ eq "t" and @hide_links_p;literal@ eq "t">
       <big><strong>@name;noquote@</strong></big>
     </if>
     <else>
       <!-- set up the link; a workaround for now-->
       <big><strong>@name@</strong></big>
     </else>
   </td>
-  
+
   <td class="element-header-buttons" align="right">
-    <if @user_editable_p;literal@ true>   
+    <if @user_editable_p;literal@ true>
       <a href="configure-element?element_id=@element_id@&amp;op=edit">
         <img border="0" src="@dir@/e.gif" alt="edit"></a>
     </if>
-    <if @shadeable_p;literal@ true>		
+    <if @shadeable_p;literal@ true>
       <a href="configure-element?element_id=@element_id@&amp;op=shade">
         <if @shaded_p;literal@ false>
           <img border="0" src="@dir@/shade.gif" alt="shade"></a>
-	</if>
-	<else>
+    </if>
+    <else>
           <img border="0" src="@dir@/unshade.gif" alt="shade"></a>
-	</else>
+    </else>
     </if>
-    <if @hideable_p;literal@ true>		
+    <if @hideable_p;literal@ true>
       <a href="configure-element?element_id=@element_id@&amp;op=hide">
       <img border="0"  src="@dir@/x.gif" alt="hide"></a>
     </if>
-    <if @user_editable_p@ eq "f" and @shadeable_p@ eq "f" and 
-     @hideable_p@ eq "f">
+    <if @user_editable_p;literal@ eq "f" and @shadeable_p;literal@ eq "f" and
+     @hideable_p;literal@ eq "f">
      &nbsp;
     </if>
   </td>