Index: openacs-4/packages/acs-admin/www/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/subsites.adp	7 Aug 2017 23:47:45 -0000	1.2
+++ openacs-4/packages/acs-admin/www/subsites.adp	22 May 2018 15:59:45 -0000	1.3
@@ -4,7 +4,7 @@
 
 <h1>@page_title@</h1>
 
-<if @too_many_subsites_p@ gt 0>
+<if @too_many_subsites_p;literal@ gt 0>
   <p>Too many subsites to display: @subsite_number@</p>
 </if>
 <else>
Index: openacs-4/packages/acs-admin/www/install/install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-2.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/install/install-2.adp	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/install/install-2.adp	22 May 2018 15:59:45 -0000	1.6
@@ -9,7 +9,7 @@
 
 </if>
 <else>
-  <if @extras_p@ true >
+  <if @extras_p;literal@ true >
     <p> The packages you want to install require some other
     packages. These have been added to the list, and are marked
     below. </p>
Index: openacs-4/packages/acs-admin/www/users/merge-final.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/merge-final.adp	3 Jul 2015 10:25:39 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/merge-final.adp	22 May 2018 15:59:45 -0000	1.5
@@ -1,12 +1,12 @@
   <master>
     <property name="doc(title)">Merging ... </property>
     <property name="context">@context;literal@</property>
-    
+
     <h2>Merging ...</h2>
 
-    <if @merge_p@ ne 0>
+    <if @merge_p;literal@ ne 0>
       <p/>
         @results;noquote@
       <p/>
         @msg@
-    </if>  
+    </if>
Index: openacs-4/packages/acs-reference/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-reference/www/index.adp	3 Jul 2015 10:25:43 -0000	1.6
+++ openacs-4/packages/acs-reference/www/index.adp	22 May 2018 15:59:45 -0000	1.7
@@ -9,9 +9,9 @@
 <hr>
 <h3>Reports</h3>
 Coming soon!
-<if @admin_p@ ne 0 >
+<if @admin_p;literal@ ne 0 >
 <hr>
 <h3>Admin</h3>
   None Yet
   <!--a href="admin/reference-list">Maintenance</a -->
-</if>
\ No newline at end of file
+</if>
Index: openacs-4/packages/acs-reference/www/view-one-reference.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/view-one-reference.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-reference/www/view-one-reference.adp	3 Jul 2015 10:25:43 -0000	1.5
+++ openacs-4/packages/acs-reference/www/view-one-reference.adp	22 May 2018 15:59:45 -0000	1.6
@@ -10,7 +10,7 @@
 <td> @table_info.package_name@ </td></tr>
 
 <tr><th valign="top" align="right">Internal Data?</th>
-<td> @table_info.internal_data_p@ </td></tr>
+<td> @table_info.internal_data_p;literal@ </td></tr>
 
 <tr><th valign="top" align="right">Source</th>
 <td> @table_info.source@ </td></tr>
Index: openacs-4/packages/acs-subsite/lib/user-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/lib/user-info.adp	3 Jul 2015 10:25:43 -0000	1.11
+++ openacs-4/packages/acs-subsite/lib/user-info.adp	22 May 2018 15:59:45 -0000	1.12
@@ -1,8 +1,8 @@
 <property name="focus">@focus;literal@</property>
 <formtemplate id="user_info"></formtemplate>
 
-<if @edit_mode_p@ true and @read_only_notice_p@ true>
-    <p style="color: #ff0000;">#acs-subsite.Notice#</p> 
+<if @edit_mode_p;literal@ true and @read_only_notice_p;literal@ true>
+    <p style="color: #ff0000;">#acs-subsite.Notice#</p>
     <p>#acs-subsite.Elements_not_editable# </p>
 </if>
 
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/relations/one.adp	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.adp	22 May 2018 15:59:45 -0000	1.9
@@ -1,7 +1,7 @@
 <master>
 <property name="context">@context;literal@</property>
 <property name="doc(title)">One relation</property>
-				   
+
 <h3>Attributes</h3>
 
 <ul>
@@ -10,14 +10,14 @@
  </if>
  <else>
   <multiple name="attributes">
-   <li> @attributes.pretty_name@: 
+   <li> @attributes.pretty_name@:
    <if @attributes.value@ nil>
      <em>(no value)</em>
    </if><else>
       @attributes.value@
    </else>
    <if @write_p;literal@ true>
-     (<a href="../attributes/edit-one?@attributes.export_vars@">edit</a>) 
+     (<a href="../attributes/edit-one?@attributes.export_vars@">edit</a>)
    </if>
    </li>
   </multiple>
@@ -29,21 +29,21 @@
 
 <ul>
  <li> Relationship type: <a href="../rel-types/one?rel_type=@rel.rel_type_enc@">@rel.rel_type_pretty_name@</a> </li>
- <li> Object 1 (@rel.role_one_pretty_name@): 
+ <li> Object 1 (@rel.role_one_pretty_name@):
       <if @subsite_group_id@ eq @rel.object_id_one@>
       <a href="../groups/index?view_by=rel_type">@rel.object_id_one_name@</a> </li>
       </if>
       <else>
       <a href="../groups/one?group_id=@rel.object_id_one@">@rel.object_id_one_name@</a> </li>
       </else>
- <li> Object 2 (@rel.role_two_pretty_name@): 
+ <li> Object 2 (@rel.role_two_pretty_name@):
       <a href="../parties/one?party_id=@rel.object_id_two@">@rel.object_id_two_name@</a> </li>
 </ul>
 
-<if @admin_p@ true or @delete_p@ true>
+<if @admin_p;literal@ true or @delete_p;literal@ true>
 <p><h3>Administration</h3>
  <ul>
-  <if @admin_p@ true and @member_state@ ne "">
+  <if @admin_p;literal@ true and @member_state@ ne "">
         <li> Member State:
       <form method="post" action="change-member-state">
     	<div>
@@ -70,21 +70,21 @@
 
 <if @object_two_read_p;literal@ true>
     <h3>About @rel.object_id_two_name@</h3>
-    
+
     <ul>
      <if @object_two_attributes:rowcount@ eq "0">
       <li> <em>There are no attributes for parties of this type</em> </li>
      </if>
      <else>
       <multiple name="object_two_attributes">
-       <li> @object_two_attributes.pretty_name@: 
+       <li> @object_two_attributes.pretty_name@:
        <if @object_two_attributes.value@ nil>
          <em>(no value)</em>
        </if><else>
           @object_two_attributes.value@
        </else>
        <if @object_two_write_p;literal@ true>
-         (<a href="../attributes/edit-one?@object_two_attributes.export_vars@">edit</a>) 
+         (<a href="../attributes/edit-one?@object_two_attributes.export_vars@">edit</a>)
        </if>
        </li>
       </multiple>
Index: openacs-4/packages/acs-tcl/lib/page-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/lib/page-error.adp	16 Jun 2015 08:42:32 -0000	1.8
+++ openacs-4/packages/acs-tcl/lib/page-error.adp	22 May 2018 15:59:45 -0000	1.9
@@ -13,17 +13,17 @@
  <a href="@prev_url@">#acs-tcl.Return_prev#</a>
 
  <if @bt_instance@ ne "">
-  <if @auto_submit_p@ gt 0>
-    <if @user_id@ gt 0> 
+  <if @auto_submit_p;literal@ gt 0>
+    <if @user_id@ gt 0>
       <br>
       <formtemplate id="bug_edit"></formtemplate>
       <br>
-	#acs-tcl.Bug_History#
-	<br><br>
-	  <formtemplate id="bug_history"></formtemplate>
+      #acs-tcl.Bug_History#
+      <br><br>
+      <formtemplate id="bug_history"></formtemplate>
       </if>
       <else>
-         
+
       </else>
     </if>
   </if>
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.23 -r1.24
--- openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:13:22 -0000	1.23
+++ openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:59:45 -0000	1.24
@@ -7,7 +7,7 @@
 <if @admin_p;literal@ true><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
 <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 @survey_p;literal@ 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>
       </if>
      </if>
@@ -20,7 +20,7 @@
 	</if>
 	    <group column=as_item_id>
 	      @items.description;noquote@
-		<if @survey_p@ ne t>
+		<if @survey_p;literal@ ne t>
 		  <if @items.as_item_id@ eq @items.next_as_item_id@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
 
@@ -84,7 +84,7 @@
   <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>
+  <if @feedback_only_p;literal@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
     <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
   </if>
 
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/lib/session.adp	7 Aug 2017 23:48:03 -0000	1.14
+++ openacs-4/packages/assessment/lib/session.adp	22 May 2018 15:59:45 -0000	1.15
@@ -3,7 +3,7 @@
 <th colspan="3" align="left">#assessment.Assessment#: <a href="assessment?assessment_id=@assessment_id@">@assessment_data.title@</a></th></tr>
 <tr><td><strong>#assessment.User_ID#:</strong> <span><if @show_username_p;literal@ true><a href="@session_user_url@">@first_names@ @last_name@</a><if @assessment_data.anonymous_p;literal@ true><br>#assessment.lt_bNoteb_This_assessmen#</if></if><else>#assessment.anonymous_name#</else></span></td>
 <td><strong>#assessment.Attempt#:</strong> <multiple name="session_attempts"><if @session_attempts.session_id@ eq @session_id@><strong>@session_attempts.rownum@</strong></if><else><a href="session?session_id=@session_attempts.session_id@">@session_attempts.rownum@</a></else>&nbsp;&nbsp; </multiple> <if @admin_p;literal@ true> (<a href="@delete_url@">#assessment.Delete_Attempts#</a>)</if></td>
-<td><if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1> <strong>#assessment.Percent_Score#:</strong>  <span>@percent_score@</span></if></if> </td></tr>
+<td><if @assessment_data.survey_p;literal@ ne t> <if @showpoints@ eq 1> <strong>#assessment.Percent_Score#:</strong>  <span>@percent_score@</span></if></if> </td></tr>
 
 <tr><td><strong>#assessment.Started#:</strong> <span>@session_start@</span></td>
 <td><strong>#assessment.Finished#:</strong> <span>@session_finish@</span></td>
@@ -19,11 +19,11 @@
 <multiple name="sections">
 
   <fieldset style="padding:10px;margin-bottom:10px"><!-- Section FieldSet -->
-    <legend>@sections.title@   <if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1 and @sections.max_points@ gt 0>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if></legend>
+    <legend>@sections.title@   <if @assessment_data.survey_p;literal@ ne t> <if @showpoints@ eq 1 and @sections.max_points@ gt 0>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if></legend>
 
   <if @sections.max_time_to_complete@ not nil><p>(#assessment.max_time# @sections.max_time_to_complete@)</p></if>
 
-    <if @sections.description@ not nil><p>@sections.description;noquote@</p></if>    
+    <if @sections.description@ not nil><p>@sections.description;noquote@</p></if>
     <if @assessment_data.show_feedback@ ne none><p>@sections.feedback_text@</p></if>
 
 
@@ -37,7 +37,7 @@
 
 
 <hr>
-<if @assessment_data.survey_p@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
+<if @assessment_data.survey_p;literal@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
 
 <if @comments_installed_p;literal@ true>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" >
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.32 -r1.33
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	22 May 2018 15:13:22 -0000	1.32
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	22 May 2018 15:59:45 -0000	1.33
@@ -4,7 +4,7 @@
 
 
 <!-- Pretty output starts here -->
-<if @show_title_p@ true and @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@</h2></if>
+<if @show_title_p;literal@ true and @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@</h2></if>
   <if @assessment_data.instructions@ not nil><p>@assessment_data.instructions;noquote@</p></if>
 
   <if @assessment_data.time_for_response@ not nil><br>#assessment.session_time_remaining#</if>
Index: openacs-4/packages/assessment/www/asm-admin/item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	7 Aug 2017 23:48:04 -0000	1.14
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	22 May 2018 15:59:45 -0000	1.15
@@ -7,27 +7,27 @@
 <legend>#assessment.Question#</legend>
   <formwidget id="__confirmed_p"><formwidget id="__refreshing_p"><formwidget id="assessment_id"><formwidget id="section_id"><formwidget id="after"><formwidget id="type"><formwidget id="__key_signature"><formwidget id="__new_p"><formwidget id="as_item_id"><formwidget id="num_choices">
       <br>
-        
+
               <if @formerror.question_text@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="question_text">
               #assessment.Item_Question#
             </label>
             <span class="form-required-mark">*</span>
           </span>
-          
+
             <if @formerror.question_text@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="question_text">
             </span>
               <formerror id="question_text">
@@ -36,114 +36,114 @@
                   @formerror.question_text;noquote@
               </span>
             </formerror>
-          
+
             <p class="form-help-text">
-              
+
                 <formhelp id="question_text">
-              
+
             </p>
-          
+
       <br>
-        
+
               <if @formerror.required_p@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="required_p">
               #assessment.Required#
             </label>
-            
+
           </span>
-          
+
             <if @formerror.required_p@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="required_p">
             </span>
             <formerror id="required_p">
               <br>
                   @formerror.required_p;noquote@
             </formerror>
-          
+
             <p class="form-help-text">
-              
+
                 <formhelp id="required_p">
-              
+
             </p>
-          
+
       <br>
-        
+
               <if @formerror.feedback_right@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="feedback_right">
               #assessment.Feedback_right#
             </label>
-            
+
           </span>
-          
+
             <if @formerror.feedback_right@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="feedback_right">
             </span>
             <formerror id="feedback_right">
               <br>
                   @formerror.feedback_right;noquote@
             </formerror>
-          
+
             <p class="form-help-text">
-              
+
                 <formhelp id="feedback_right">
-              
+
             </p>
-          
+
       <br>
-        
+
               <if @formerror.feedback_wrong@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="feedback_wrong">
               #assessment.Feedback_wrong#
             </label>
-            
+
           </span>
-          
+
             <if @formerror.feedback_wrong@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="feedback_wrong">
             </span>
             <formerror id="feedback_wrong">
               <br>
                   @formerror.feedback_wrong;noquote@
             </formerror>
-          
+
             <p class="form-help-text">
-              
+
                 <formhelp id="feedback_wrong">
             </p>
 
@@ -174,7 +174,7 @@
            </p>
           <br>
 
-</fieldset>        
+</fieldset>
 <fieldset>
         <legend>
               #assessment.Question_Type#
@@ -185,7 +185,7 @@
               <div class="form-widget-error">
             </if>
             <else>
-              <div class="form-widget">                  
+              <div class="form-widget">
             </else>
 
             <formerror id="item_type">
@@ -200,7 +200,7 @@
 <p class="form-help-text">       #assessment.item_type_multiple_choice_help#</p>
         <formgroup-widget id="item_type" row=2></formgroup-widget><br>
         <formgroup-widget id="item_type" row=5></formgroup-widget>
-           
+
        <p><span class="form-label">#assessment.Correct_Answer#</span><br>
         <multiple name="choice_elements">
        <formgroup id="correct.@choice_elements.id@">
@@ -218,7 +218,7 @@
 <formwidget id="add_existing_mc_id">
 </p></if>
 <br>
-</fieldset>        
+</fieldset>
 </div>
 <div>
 <fieldset>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	7 Aug 2017 23:48:04 -0000	1.11
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	22 May 2018 15:59:45 -0000	1.12
@@ -19,24 +19,24 @@
             </span>
 
             <span class="form-required-mark">*</span>
-          
+
             <if @formerror.question_text@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="question_text">
 
-            
+
             <formerror id="question_text">
               <br>
                   @formerror.question_text;noquote@
             </formerror>
          </span></div>
             <p class="form-help-text">
-              
+
                 <formhelp id="question_text">
             </p>
 
@@ -47,146 +47,146 @@
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="required_p">
               #assessment.Required#
             </label>
 
-            
+
           </span>
-          
+
             <if @formerror.required_p@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="required_p">
 
-            
+
             <formerror id="required_p">
               <br>
                   @formerror.required_p;noquote@
             </formerror>
         </span></div>
             <p class="form-help-text">
-              
+
                 <formhelp id="required_p">
             </p>
 
-        
+
       <div><br>
-        
+
               <if @formerror.points@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="points">
               #assessment.Points_for_Question_Optional#
             </label>
 
-            
+
           </span>
-          
+
             <if @formerror.points@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="points">
 
-            
+
             <formerror id="points">
               <br>
                   @formerror.points;noquote@
             </formerror>
           </span></div>
             <p class="form-help-text">
-              
+
                 <formhelp id="points">
             </p>
 
       <div><br>
-        
+
               <if @formerror.feedback_right@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="feedback_right">
 	     #assessment.Feedback_right_Optional#
             </label>
 
-            
+
           </span>
-          
+
             <if @formerror.feedback_right@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="feedback_right">
 
-            
+
             <formerror id="feedback_right">
               <br>
                   @formerror.feedback_right;noquote@
             </formerror>
         </span></div>
             <p class="form-help-text">
-              
+
                 <formhelp id="feedback_right">
             </p>
 
 
       <div><br>
-        
+
               <if @formerror.feedback_wrong@ not nil>
                 <span class="form-label-error">
               </if>
               <else>
                 <span class="form-label">
               </else>
-            
+
             <label for="feedback_wrong">
 	     #assessment.Feedback_wrong_Optional#
             </label>
 
-            
+
           </span>
-          
+
             <if @formerror.feedback_wrong@ not nil>
               <span class="form-widget-error">
             </if>
             <else>
-              <span class="form-widget">                  
+              <span class="form-widget">
             </else>
-          
+
               <formwidget id="feedback_wrong">
 
-            
+
             <formerror id="feedback_wrong">
               <br>
                   @formerror.feedback_wrong;noquote@
             </formerror>
         </span></div>
             <p class="form-help-text">
-              
+
                 <formhelp id="feedback_wrong">
             </p>
        <div><br></div>
 <if @item_type@ eq "mc">
-                      
+
             <div><br><formgroup-widget id="display_type" row=1></formgroup-widget></div>
             <div><br><formgroup-widget id="display_type" row=2></formgroup-widget></div>
 
@@ -197,24 +197,24 @@
               <div class="form-widget">
             </else>
             </div>
-                     
+
             <formerror id="display_type">
                   @formerror.data_type;noquote@
             </formerror>
 
             <p class="form-help-text">
-              
+
                 <formhelp id="display_type">
             </p>
-</if>                      
+</if>
 
 <switch @item_type@>
 <case value="mc">
 <div><formwidget id="num_choices"></div>
-         
+
        <p><span class="form-label">#assessment.Correct_Answer#</span><br>
         <multiple name="choice_elements">
-    
+
            <formgroup id="correct.@choice_elements.id@">
                 @formgroup.widget;noquote@
            </formgroup>
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	7 Aug 2017 23:48:04 -0000	1.25
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	22 May 2018 15:59:45 -0000	1.26
@@ -49,7 +49,7 @@
     <td>#assessment.Type#:</td>
     <td><if @assessment_data.type@ nil>#assessment.None#</if>
         <elseif @assessment_data.type@ eq "survey">#assessment.type_s#</elseif>
-        <elseif @assessment_data.type@ eq "test">#assessment.type_test#</elseif> 
+        <elseif @assessment_data.type@ eq "test">#assessment.type_test#</elseif>
         (<a href="@toggle_type_url@">#assessment.Change_type#</a>)
     </td>
   </tr>
@@ -107,12 +107,12 @@
 </tr>
 
 <tr class="even"><td valign="top">#assessment.Email_Options#</td><td >@notification_chunk;noquote@ <br><a href="send-mail?assessment_id=@assessment_id@">#assessment.Send_bulkmail#</a> #assessment.regarding_this_assess# </td></tr>
-	
+
 <tr class="odd">
 	<td>#assessment.Extreme_Actions# </td>
 	<td><a href="assessment-delete?assessment_id=@assessment_id@">#assessment.Delete_this_assess#</a> #assessment.Removes_all_questio#<br>
 	<a href="assessment-copy?assessment_id=@assessment_id@">#assessment.Copy_this_assess#</a> #assessment.Lets_you_use_this_a#
-	<if @admin_p;literal@ true>	
+	<if @admin_p;literal@ true>
 	 <if @anonymous_p;literal@ true>
 	   <if @read_p;literal@ true>
 	      <br><a href="@reg_url@/set-reg-assessment?assessment_id=@assessment_id@">#acs-subsite.set_reg_asm#</a>
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	14 Jul 2015 22:36:42 -0000	1.12
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	22 May 2018 15:59:45 -0000	1.13
@@ -18,17 +18,17 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
-  <include src="/packages/calendar/www/view-list-display" 
-  start_date="@start_date;literal@" 
-  end_date="@end_date;literal@" 
-  date="@current_date;literal@" 
+<if @config.shaded_p;literal@ ne "t">
+  <include src="/packages/calendar/www/view-list-display"
+  start_date="@start_date;literal@"
+  end_date="@end_date;literal@"
+  date="@current_date;literal@"
   period_days="@period_days;literal@"
   page_num="@page_num;literal@"
-  calendar_id_list="@list_of_calendar_ids;literal@" 
+  calendar_id_list="@list_of_calendar_ids;literal@"
   calendar_url="@calendar_url;literal@"
   return_url="@return_url;literal@"
-  sort_by="@sort_by;literal@"> 
+  sort_by="@sort_by;literal@">
 </if>
 <else>
   <small>
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	14 Jul 2015 22:36:42 -0000	1.20
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	22 May 2018 15:59:45 -0000	1.21
@@ -18,39 +18,39 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
+<if @config.shaded_p;literal@ ne "t">
 
  <switch @view@>
    <case value="day">
-     <include src="/packages/calendar/www/view-one-day-display" 
+     <include src="/packages/calendar/www/view-one-day-display"
      return_url="@return_url;literal@"
-     date="@date;literal@" 
-     start_display_hour=7 
+     date="@date;literal@"
+     start_display_hour=7
      end_display_hour=22
      page_num="@page_num;literal@"
      calendar_url="@calendar_url;literal@"
      calendar_id_list="@list_of_calendar_ids;literal@">
    </case>
 
     <case value="list">
-      <include src="/packages/calendar/www/view-list-display" 
+      <include src="/packages/calendar/www/view-list-display"
       return_url="@return_url;literal@"
-      start_date="@start_date;literal@" 
-      end_date="@end_date;literal@" 
-      date="@current_date;literal@" 
+      start_date="@start_date;literal@"
+      end_date="@end_date;literal@"
+      date="@current_date;literal@"
       period_days="@period_days;literal@"
       item_template="@item_template;literal@"
-      calendar_id_list="@list_of_calendar_ids;literal@" 
+      calendar_id_list="@list_of_calendar_ids;literal@"
       page_num="@page_num;literal@"
       calendar_url="@calendar_url;literal@"
-      sort_by="@sort_by;literal@"> 
+      sort_by="@sort_by;literal@">
     </case>
-   
+
     <case value="week">
-      <include src="/packages/calendar/www/view-week-display" 
+      <include src="/packages/calendar/www/view-week-display"
       return_url="@return_url;literal@"
       date="@current_date;literal@"
-      calendar_id_list="@list_of_calendar_ids;literal@" 
+      calendar_id_list="@list_of_calendar_ids;literal@"
       calendar_url="@calendar_url;literal@"
       page_num="@page_num;literal@"
     </case>
@@ -59,7 +59,7 @@
       <include src="/packages/calendar/www/view-month-display"
       return_url="@return_url;literal@"
       date="@current_date;literal@"
-      calendar_id_list="@list_of_calendar_ids;literal@" 
+      calendar_id_list="@list_of_calendar_ids;literal@"
       page_num="@page_num;literal@"
       calendar_url="@calendar_url;literal@"
     </case>
Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	7 Aug 2017 23:48:05 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	22 May 2018 15:59:45 -0000	1.8
@@ -21,7 +21,7 @@
   <p>
 </if>
 
-<if @instances_using_p@ ne t>
+<if @instances_using_p;literal@ ne t>
   #categories.lt_Are_you_sure_you_want_3#
   <p>
     <a href="@delete_url@" class="button">#categories.Delete#</a>
Index: openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	7 Aug 2017 23:48:12 -0000	1.8
+++ openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	22 May 2018 15:59:45 -0000	1.9
@@ -22,7 +22,7 @@
 <multiple name="forums">
   <li>
     <a href="@url@admin/forum-edit?forum_id=@forums.forum_id@">@forums.name@</a>
-<if @forums.enabled_p@ ne t><strong>(#forums-portlet.disabled#)</strong></if>
+<if @forums.enabled_p;literal@ ne t><strong>(#forums-portlet.disabled#)</strong></if>
   </li>
 </multiple>
 </ul>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	7 Aug 2017 23:48:12 -0000	1.16
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	22 May 2018 15:59:45 -0000	1.17
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
+<if @config.shaded_p;literal@ ne "t">
 
 <include src="@scope_fs_url;literal@" &="folder_id" &="root_folder_id" viewing_user_id="@user_id;literal@"
 	 &="n_past_days" fs_url="@url;literal@">
Index: openacs-4/packages/general-comments/lib/comments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/lib/comments.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/lib/comments.adp	16 May 2018 11:56:59 -0000	1.1
+++ openacs-4/packages/general-comments/lib/comments.adp	22 May 2018 15:59:45 -0000	1.2
@@ -5,7 +5,7 @@
   <if @print_content_p;literal@ true>
     <h4>@comments.title@</h4>
     @comments.content@
-    <if @print_attachments_p@ true and @comments.attachment_url;literal@ ne "">
+    <if @print_attachments_p;literal@ true and @comments.attachment_url;literal@ ne "">
       <h5>#general-comments.Attachments#</h5>
       <ul>
         <group column="comment_id">
Index: openacs-4/packages/new-portal/www/place-element-other-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/new-portal/www/place-element-other-page.adp	17 Jun 2015 07:28:07 -0000	1.12
+++ openacs-4/packages/new-portal/www/place-element-other-page.adp	22 May 2018 15:59:45 -0000	1.13
@@ -22,7 +22,7 @@
 <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
 <div><input type="hidden" name="return_url" value="@return_url@"></div>
 
-<if @other_page_avail_p@ ne 0>
+<if @other_page_avail_p;literal@ ne 0>
   <div><input type="hidden" name="element_id" value="@element_id@"></div>
   <div><input type="hidden" name="anchor" value="@page_id@"></div>
   <div><input type="submit" name="op_move_to_page" value="#new-portal.Move_to_page#"></div>
Index: openacs-4/packages/new-portal/www/show-here.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/show-here.adp	17 Jun 2015 07:28:07 -0000	1.7
+++ openacs-4/packages/new-portal/www/show-here.adp	22 May 2018 15:59:45 -0000	1.8
@@ -5,7 +5,7 @@
         </div>
     </div>
     <div class="portlet">
-<if @show_avail_p@ ne 0>
+<if @show_avail_p;literal@ ne 0>
     <form method="post" action="@action_string@">
         <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
         <div><input type="hidden" name="region" value="@region@"></div>
Index: openacs-4/packages/new-portal/www/template-place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/new-portal/www/template-place-element.adp	7 Aug 2017 23:48:12 -0000	1.22
+++ openacs-4/packages/new-portal/www/template-place-element.adp	22 May 2018 15:59:45 -0000	1.23
@@ -52,7 +52,7 @@
         <a href="@target_stub@-2?portal_id=@portal_id@&amp;op_move=1&amp;element_id=@element_multi.element_id@&amp;direction=left&amp;region=@region@&amp;return_url=@return_url@&amp;anchor=@page_id@"><img border="0" src="@dir@/arrow-left.gif" alt="move left"></a>
         <a href="@target_stub@-2?portal_id=@portal_id@&amp;op_move=1&amp;element_id=@element_multi.element_id@&amp;direction=right&amp;region=@region@&amp;return_url=@return_url@&amp;anchor=@page_id@"><img border="0" src="@dir@/arrow-right.gif" alt="move right"></a>
         </if>
-        <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&amp;op_move=1&amp;element_id=@element_multi.element_id@&amp;direction=left&amp;region=@region@&amp;return_url=@return_url@&amp;anchor=@page_id@"><img border="0" src="@dir@/arrow-left.gif" alt="move left"></a>     
+        <if @region@ eq @num_regions@><a href="@target_stub@-2?portal_id=@portal_id@&amp;op_move=1&amp;element_id=@element_multi.element_id@&amp;direction=left&amp;region=@region@&amp;return_url=@return_url@&amp;anchor=@page_id@"><img border="0" src="@dir@/arrow-left.gif" alt="move left"></a>
         </if>
     </if>
 
@@ -88,7 +88,7 @@
 
 </form>
 
-    <include src=place-element-other-page &="element_multi" 
+    <include src=place-element-other-page &="element_multi"
              target_stub="@target_stub;literal@"
              portal_id="@portal_id;literal@"
              page_id="@element_multi.page_id;literal@"
@@ -98,7 +98,7 @@
 
 </multiple>
 
-<if @show_avail_p@ ne 0>
+<if @show_avail_p;literal@ ne 0>
 <form method=post action=@action_string@>
 
 @show_html;noquote@
Index: openacs-4/packages/news/lib/latest-news.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/latest-news.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/lib/latest-news.adp	9 Nov 2008 23:29:27 -0000	1.2
+++ openacs-4/packages/news/lib/latest-news.adp	22 May 2018 15:59:45 -0000	1.3
@@ -1,23 +1,23 @@
-<if @news:rowcount@ gt 0 or @show_empty_p@ true>
-	<if @class@ eq "portalElement">
-			<h3><a href="@base_url@">News</a></h3>
-	</if>
-	<else>
-		<h2><a href="@base_url@">Latest News</a></h2>
-	</else>
-	<if @news:rowcount@ eq 0>
-	<p>No recent news</p>
-	</if><else>
-	<multiple name="news">
-	<if @class@ eq "portalElement">
-		<h4><a href="@news.url@">@news.title@</a></h4>
-	</if>
-	<else>
-		<h3><a href="@news.url@">@news.title@</a></h3>
-	</else>
-	
-	<p>@news.lead@<br>@news.date@</p>
-	</multiple>
-	<p><a href="@base_url@">More news...</a></p>
-	</else>
+<if @news:rowcount@ gt 0 or @show_empty_p;literal@ true>
+    <if @class@ eq "portalElement">
+        <h3><a href="@base_url@">News</a></h3>
+    </if>
+    <else>
+        <h2><a href="@base_url@">Latest News</a></h2>
+    </else>
+    <if @news:rowcount@ eq 0>
+        <p>No recent news</p>
+    </if><else>
+    <multiple name="news">
+    <if @class@ eq "portalElement">
+        <h4><a href="@news.url@">@news.title@</a></h4>
+    </if>
+    <else>
+        <h3><a href="@news.url@">@news.title@</a></h3>
+    </else>
+
+    <p>@news.lead@<br>@news.date@</p>
+    </multiple>
+    <p><a href="@base_url@">More news...</a></p>
+    </else>
 </if>
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/news/www/preview.adp	7 Aug 2017 23:48:12 -0000	1.22
+++ openacs-4/packages/news/www/preview.adp	22 May 2018 15:59:45 -0000	1.23
@@ -7,12 +7,12 @@
 
 <p>#news.lt_Your_news_item_will_b#</p>
 <p>
-  <if @news_admin_p@ ne 0>
-   #news.It_will_go_live_on# @publish_date_pretty@.   
+  <if @news_admin_p;literal@ ne 0>
+   #news.It_will_go_live_on# @publish_date_pretty@.
     <if @permanent_p;literal@ true>
       #news.lt_And_be_live_until_rev#
     </if>
-    <else>	
+    <else>
       #news.It_will_move_into_archive_on# @archive_date_pretty@.
     </else>
   </if>
@@ -39,7 +39,7 @@
      <div class="form-button"><input type="submit" value="#news.Confirm#"></div>
     </form>
 <if @action@ eq "News Item">
-  @edit_action;noquote@ 
+  @edit_action;noquote@
   <div>@image_vars;noquote@</div>
   <div class="form-button"><input type="submit" value="#news.Return_to_edit#"></div>
     </form>
Index: openacs-4/packages/news/www/admin/process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news/www/admin/process.adp	7 Aug 2017 23:48:12 -0000	1.12
+++ openacs-4/packages/news/www/admin/process.adp	22 May 2018 15:59:45 -0000	1.13
@@ -5,7 +5,7 @@
 <if @halt_p@ not nil and @unapproved:rowcount@ gt 0>
   <h3>#news.Error#</h3>
   #news.The_action# <span style="color:red">@action@</span> #news.lt_cannot_be_applied_to_#
-  <ul> 
+  <ul>
     <multiple name=unapproved>
      <li><strong>@unapproved.publish_title@</strong> - @unapproved.creation_date_pretty@
             contributed by @unapproved.item_creator@
@@ -14,13 +14,13 @@
   </ul>
   <br>
   #news.lt_Manage_the_items_indi#
-</if>	
+</if>
 <else>
   <strong>#news.lt_Do_you_really_want_to# <span style="color:red">@action_pretty@</span><br> #news.lt_on_the_following_news#</strong>
 
   <listtemplate name="news_items"></listtemplate>
 
-  <form method=post action=process-2>	
+  <form method=post action=process-2>
     @hidden_vars;noquote@
     <div><input type="submit" value="#news.Yes#"></div>
   </form>
Index: openacs-4/packages/news-aggregator/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/news-aggregator/www/index.adp	20 Jan 2018 23:00:54 -0000	1.13
+++ openacs-4/packages/news-aggregator/www/index.adp	22 May 2018 15:59:45 -0000	1.14
@@ -2,7 +2,7 @@
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
   <property name="header_stuff"><style type="text/css"><!-- .item_pub_date, .item_author { color: #777; padding-right: 1em; }
-.item_pub_date { font-size: 10px; }  
+.item_pub_date { font-size: 10px; }
  --></style></property>
 
 <if @write_p;literal@ true>
@@ -43,7 +43,7 @@
 	    <group column="sort_date">
               <tr bgcolor="#eeeeee">
                 <td colspan=2>
-                  <b><a href="@items.link@" title="@items.description@">@items.title@</a>#news-aggregator.updated_x_time_ago#</b>                   
+                  <b><a href="@items.link@" title="@items.description@">@items.title@</a>#news-aggregator.updated_x_time_ago#</b>
                   <a href="@items.technorati_url@"><img src="@graphics_url@technorati.png" width ="50" height="14" alt="Technorati Cosmos" border="0"></a>
                 </td>
               </tr>
@@ -56,7 +56,7 @@
 		    </if>
 		  </td>
                   <td valign="top" width="40" align="left">
-                    <if @public_p@ false and @write_p@ true>
+                    <if @public_p;literal@ false and @write_p;literal@ true>
        		      <if @items.save_url@ not nil>
 		        <a href="@items.save_url@"><img border="0" src="@graphics_url@save.gif" width="16" height="16" alt="Save" /></a>
 		      </if>
@@ -65,7 +65,7 @@
 		      </if>
                       <a href="@items.item_blog_url@"><img border="0" src="@graphics_url@post.gif" width="16" height="16" alt="Post this item to your Weblog" /></a>
                     </if>
-                    
+
                     <span class="item_pub_date">@items.pub_date@</span>
 		  </td>
                 </tr>
@@ -78,19 +78,19 @@
   </table>
 </else>
 
-<if @enable_purge_p@ true and @public_p@ false and @purge@ true and @purge_p@ true>
+<if @enable_purge_p;literal@ true and @public_p;literal@ false and @purge@ true and @purge_p;literal@ true>
   <formtemplate id="purge"></formtemplate>
 </if>
 
-    
-<if @enable_purge_p@ true and @public_p@ false and @purge_p@ true>
+
+<if @enable_purge_p;literal@ true and @public_p;literal@ false and @purge_p;literal@ true>
     <p>
         #news-aggregator.Purges# <b>#news-aggregator.On#</b> | <a href="@purge_off_url@">#news-aggregator.Off#</a>
     </p>
 </if>
-<if @enable_purge_p@ true and @public_p@ false and @purge_p@ false>
+<if @enable_purge_p;literal@ true and @public_p;literal@ false and @purge_p;literal@ false>
     <p>
-        #news-aggregator.Purges# <a href="@purge_on_url@">#news-aggregator.On#</a> | <b>#news-aggregator.Off#</b> 
-    </p>   
+        #news-aggregator.Purges# <a href="@purge_on_url@">#news-aggregator.On#</a> | <b>#news-aggregator.Off#</b>
+    </p>
 </if>
 
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	7 Apr 2018 11:05:34 -0000	1.5
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	22 May 2018 15:59:45 -0000	1.6
@@ -1,4 +1,4 @@
-<if @shaded_p@ ne "t">
+<if @shaded_p;literal@ ne "t">
 
   <if @items:rowcount@ gt 0>
 
@@ -43,7 +43,7 @@
 
 </if>
 <else>
-  <small> 
+  <small>
     #new-portal.when_portlet_shaded#
-  </small> 
+  </small>
 </else>
Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/news-portlet/www/news-portlet.adp	7 Aug 2017 23:48:12 -0000	1.19
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	22 May 2018 15:59:45 -0000	1.20
@@ -18,8 +18,8 @@
 
 %>
 
-  <if @shaded_p@ ne "t">
-    <if @inside_comm_p@ >
+  <if @shaded_p;literal@ ne "t">
+    <if @inside_comm_p;literal@ true>
       <div style="padding-top:0.2em; padding-bottom:0.3em;">
         <div style="float:right;">
           <a href="@news_url@item-create" title="#news-portlet.Add_a_News_Item#" class="button">#news-portlet.Add_a_News_Item#</a>
@@ -30,8 +30,8 @@
      object_id="@package_id;literal@"
      pretty_name="News"
      url="@news_url;literal@" >
-</if>    
-          <if @rss_exists@ eq 1>
+</if>
+          <if @rss_exists;literal@ eq 1>
             <br>
               <a href="@rss_url@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" style="border:0; padding-right:3px">#rss-support.Syndication_Feed#</a>
           </if>
@@ -42,11 +42,11 @@
       <if @news_items:rowcount@ eq 1>
 
         <multiple name="news_items">
-          <include src="summary" 
+          <include src="summary"
             item_id="@news_items.item_id;literal@"
             url="@news_items.view_url;literal@">
         </multiple>
-        
+
       </if>
       <else>
 
Index: openacs-4/packages/static-portlet/www/static-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/static-portlet/www/static-portlet.adp	7 Aug 2017 23:48:29 -0000	1.11
+++ openacs-4/packages/static-portlet/www/static-portlet.adp	22 May 2018 15:59:45 -0000	1.12
@@ -18,7 +18,7 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
+<if @config.shaded_p;literal@ ne "t">
 <if @success_p;literal@ true>
 @content;noquote@
 </if>