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 -N -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/new-portal/www/template-place-element.adp	5 Aug 2016 13:55:53 -0000	1.21.2.1
+++ openacs-4/packages/new-portal/www/template-place-element.adp	20 Jan 2017 08:22:13 -0000	1.21.2.2
@@ -72,15 +72,15 @@
 
 <BR>
 
-<if @element_multi.hideable_p@ eq "t">
+<if @element_multi.hideable_p;literal@ true>
 User Hideable? Yes [<a href="@target_stub@-2?portal_id=@portal_id@&amp;op_toggle_hideable=1&amp;element_id=@element_multi.element_id@&amp;return_url=@return_url@&amp;anchor=@page_id@">don't allow hiding</a>]
 </if>
 <else>User Hideable? No [<a href="@target_stub@-2?portal_id=@portal_id@&amp;op_toggle_hideable=1&amp;element_id=@element_multi.element_id@&amp;return_url=@return_url@&amp;anchor=@page_id@">allow hiding</a>]
 </else>
 
 <BR>
 
-<if @element_multi.shadeable_p@ eq "t">
+<if @element_multi.shadeable_p;literal@ true>
 User Shadeable? Yes [<a href="@target_stub@-2?portal_id=@portal_id@&amp;op_toggle_shadeable=1&amp;element_id=@element_multi.element_id@&amp;return_url=@return_url@&amp;anchor=@page_id@&amp;anchor=@page_id@">don't allow shading</nobr></a>]
 </if>
 <else>User Shadeable? No [<a href="@target_stub@-2?portal_id=@portal_id@&amp;op_toggle_shadeable=1&amp;element_id=@element_multi.element_id@&amp;return_url=@return_url@&amp;anchor=@page_id@">allow shading</a>]
Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp	3 Jul 2015 11:04:09 -0000	1.8
+++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp	20 Jan 2017 08:22:13 -0000	1.8.2.1
@@ -18,7 +18,7 @@
 
 %>
 
-<if @empty_p@ eq 0>
+<if @empty_p;literal@ false>
 <master src="@element.filename@">
 <property name="name">@element.name;literal@</property>
 <property name="dir">@element.resource_dir;literal@</property>
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 -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/new-portal/www/themes/deco-theme.adp	5 Aug 2016 13:55:53 -0000	1.10.2.1
+++ openacs-4/packages/new-portal/www/themes/deco-theme.adp	20 Jan 2017 08:22:13 -0000	1.10.2.2
@@ -40,23 +40,23 @@
           <a style="text-decoration: none" href="@link@"><strong>@name;noquote@</strong></a>
         </else>
     </td>
-		<if @user_editable_p@ eq "t">	
+		<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@ eq "t">		
+		<if @shadeable_p;literal@ true>		
                   <td align="right" width="7%">
 		    <a href="configure-element?element_id=@element_id@&amp;op=shade">
-		    <if @shaded_p@ eq "f">	
+		    <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@ eq "t">		
+		<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 -N -r1.7 -r1.7.2.1
--- openacs-4/packages/new-portal/www/themes/nada-theme.adp	17 Jun 2015 07:28:08 -0000	1.7
+++ openacs-4/packages/new-portal/www/themes/nada-theme.adp	20 Jan 2017 08:22:13 -0000	1.7.2.1
@@ -43,21 +43,21 @@
 
     <td class="element-header-buttons-plain">
           
-      <if @user_editable_p@ eq "t">	
+      <if @user_editable_p;literal@ true>	
           <a href="configure-element?element_id=@element_id@&amp;op=edit">[edit]</a>
       </if>
   
-      <if @shadeable_p@ eq "t">		
+      <if @shadeable_p;literal@ true>		
         <a href="configure-element?element_id=@element_id@&amp;op=shade">
-          <if @shaded_p@ eq "f">
+          <if @shaded_p;literal@ false>
             [shade]</a>
           </if>
           <else>
             [unshade]</a>
           </else>
       </if>
   
-      <if @hideable_p@ eq "t">		
+      <if @hideable_p;literal@ true>		
         <a href="configure-element?element_id=@element_id@&amp;op=hide"> [hide]</a>
       </if>
   
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 -N -r1.21 -r1.21.2.1
--- openacs-4/packages/new-portal/www/themes/simple-theme.adp	17 Jun 2015 07:28:08 -0000	1.21
+++ openacs-4/packages/new-portal/www/themes/simple-theme.adp	20 Jan 2017 08:22:13 -0000	1.21.2.1
@@ -31,20 +31,20 @@
   </td>
   
   <td class="element-header-buttons" align="right">
-    <if @user_editable_p@ eq "t">   
+    <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@ eq "t">		
+    <if @shadeable_p;literal@ true>		
       <a href="configure-element?element_id=@element_id@&amp;op=shade">
-        <if @shaded_p@ eq "f">
+        <if @shaded_p;literal@ false>
           <img border="0" src="@dir@/shade.gif" alt="shade"></a>
 	</if>
 	<else>
           <img border="0" src="@dir@/unshade.gif" alt="shade"></a>
 	</else>
     </if>
-    <if @hideable_p@ eq "t">		
+    <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>
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/kelp-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/kelp-theme.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/new-portal/www/themes/kelp-theme/kelp-theme.adp	17 Jun 2015 07:28:08 -0000	1.3
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/kelp-theme.adp	20 Jan 2017 08:22:13 -0000	1.3.2.1
@@ -23,14 +23,14 @@
 		  <div id="scheda-container-top">
 			 <div id="scheda-titolo">@name@</div>		
 				<div id="scheda-valori">
-                    <if @user_editable_p@ eq "t"><a href="configure-element?element_id=@element_id@&amp;op=edit">&nbsp;<img borde	r=0 src="@dir@/00_headport_puls_edit.png" alt="edit"></a></if>
-                    <if @shadeable_p@ eq "t"><a href="configure-element?element_id=@element_id@&amp;op=shade">
-	                   <if @shaded_p@ eq "f">&nbsp;<img border="0" src="@dir@/00_headport_puls_min.png" alt="shade"></a></if> 	
+                    <if @user_editable_p;literal@ true><a href="configure-element?element_id=@element_id@&amp;op=edit">&nbsp;<img borde	r=0 src="@dir@/00_headport_puls_edit.png" alt="edit"></a></if>
+                    <if @shadeable_p;literal@ true><a href="configure-element?element_id=@element_id@&amp;op=shade">
+	                   <if @shaded_p;literal@ false>&nbsp;<img border="0" src="@dir@/00_headport_puls_min.png" alt="shade"></a></if> 	
 		               <else>
 		               &nbsp;<img border="0" src="@dir@/00_headport_puls_max.png" alt="unshade"></a>
 		               </else>
                   </if>
-                  <if @hideable_p@ eq "t"><a href="configure-element?element_id=@element_id@&amp;op=hide">&nbsp;<img border="0" src="@dir@/00_headport_puls_chiudi.png" alt="hide"></a></if>
+                  <if @hideable_p;literal@ true><a href="configure-element?element_id=@element_id@&amp;op=hide">&nbsp;<img border="0" src="@dir@/00_headport_puls_chiudi.png" alt="hide"></a></if>
 			</div>		 
 			</div>
 			<%	 
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	3 Jul 2015 11:04:09 -0000	1.5
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	20 Jan 2017 08:22:13 -0000	1.5.2.1
@@ -105,6 +105,6 @@
    </div> <!-- container-shadows-des -->
 <!--  [ CONTAINER ] Added by www.sii.it -->
 
-<if @curriculum_bar_p@ true>
+<if @curriculum_bar_p;literal@ true>
   <p><include src="/packages/curriculum/lib/bar" />
 </if>
\ No newline at end of file
Index: openacs-4/packages/news/lib/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/item.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/news/lib/item.adp	14 Jul 2015 22:22:27 -0000	1.5
+++ openacs-4/packages/news/lib/item.adp	20 Jan 2017 08:24:08 -0000	1.5.2.1
@@ -4,7 +4,7 @@
   <property name="doc(title)">@title;literal@</property>
 
 
-  <if @item_exist_p@ false>
+  <if @item_exist_p;literal@ false>
     <p>#news.lt_Could_not_find_the_re#</p>
   </if>
   <else>
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -N -r1.21 -r1.21.2.1
--- openacs-4/packages/news/www/preview.adp	14 Jul 2015 22:22:27 -0000	1.21
+++ openacs-4/packages/news/www/preview.adp	20 Jan 2017 08:24:08 -0000	1.21.2.1
@@ -9,7 +9,7 @@
 <p>
   <if @news_admin_p@ ne 0>
    #news.It_will_go_live_on# @publish_date_pretty@.   
-    <if @permanent_p@ eq "t">
+    <if @permanent_p;literal@ true>
       #news.lt_And_be_live_until_rev#
     </if>
     <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 -N -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/news-portlet/www/news-portlet.adp	7 Jun 2016 10:16:56 -0000	1.18.2.2
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	20 Jan 2017 08:24:08 -0000	1.18.2.3
@@ -51,17 +51,17 @@
       <else>
 
         <multiple name="news_items">
-          <if @one_instance_p@ false>
+          <if @one_instance_p;literal@ false>
             <h3 class="portlet">@news_items.parent_name@</h3>
           </if>
 
           <ul>
             <group column="package_id">
               <li>
                 <a href="@news_items.view_url@">@news_items.publish_title@</a>
-                (<if @display_item_attribution_p@ true>#news-portlet.Contributed_by# @news_items.item_creator@ - </if>@news_items.publish_date@)
-                <if @display_item_lead_p@ true> <br>@news_items.publish_lead@</if>
-                <if @display_item_content_p@ true> <br>@news_items.publish_body@</if>
+                (<if @display_item_attribution_p;literal@ true>#news-portlet.Contributed_by# @news_items.item_creator@ - </if>@news_items.publish_date@)
+                <if @display_item_lead_p;literal@ true> <br>@news_items.publish_lead@</if>
+                <if @display_item_content_p;literal@ true> <br>@news_items.publish_body@</if>
               </li>
             </group>
           </ul>
Index: openacs-4/packages/news-portlet/www/summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.adp,v
diff -u -N -r1.10 -r1.10.6.1
--- openacs-4/packages/news-portlet/www/summary.adp	9 Nov 2008 23:29:28 -0000	1.10
+++ openacs-4/packages/news-portlet/www/summary.adp	20 Jan 2017 08:24:08 -0000	1.10.6.1
@@ -4,6 +4,6 @@
 @publish_body;noquote@
 @more_link;noquote@
 
-<if @display_item_attribution_p@ eq "1">
+<if @display_item_attribution_p;literal@ true>
 <p>#news-portlet.Contributed_by# <a href="@creator_url@" title="#news-portlet.goto_item_creator_commpage#">@item_creator@</a></p>
 </if>
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/lists/inline-filters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/lists/inline-filters.adp,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/openacs-bootstrap3-theme/resources/lists/inline-filters.adp	8 Jul 2016 16:13:35 -0000	1.1
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/lists/inline-filters.adp	20 Jan 2017 08:25:46 -0000	1.1.2.1
@@ -8,7 +8,7 @@
     
             <group column="filter_name">
     
-              <if @filters.selected_p@ true>
+              <if @filters.selected_p;literal@ true>
                 <span class="btn btn-primary">@filters.label@</span>
               </if>
               <else>
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table-2third.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table-2third.adp,v
diff -u -N -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table-2third.adp	6 Nov 2016 15:14:59 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table-2third.adp	20 Jan 2017 08:25:47 -0000	1.1.2.5
@@ -103,7 +103,7 @@
               <group column="subrownum">
                 <th class="@elements.class@"@elements.cell_attributes;noquote@ id="@list_properties.name@_@elements.name@">
                   <if @elements.orderby_url@ not nil>
-                    <if @elements.ordering_p@ true>
+                    <if @elements.ordering_p;literal@ true>
                       <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label;noquote@</a>
                       <a href="@elements.orderby_url@" title="@elements.orderby_html_title@"><if @elements.orderby_direction@ eq "desc"><img src="/resources/acs-templating/sort-descending.png" alt="#acs-templating.descending_order#" style="border:0;" width="10" height="10"></if><else><img src="/resources/acs-templating/sort-ascending.png" alt="#acs-templating.ascending_order#" style="border:0;" width="10" height="10"></else></a>
                     </if>
@@ -125,7 +125,7 @@
             <multiple name="@list_properties.multirow@">
           </noparse>
               
-          <if @list_properties.aggregates_p@ true>
+          <if @list_properties.aggregates_p;literal@ true>
             <noparse><if \@@list_properties.multirow@.rownum@ eq \@@list_properties.multirow@:rowcount@></noparse>
               <multiple name="elements">
                 <tfoot>
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table.adp,v
diff -u -N -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table.adp	6 Nov 2016 15:14:59 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/lists/table.adp	20 Jan 2017 08:25:47 -0000	1.1.2.5
@@ -102,7 +102,7 @@
       <group column="subrownum">
         <th class="@elements.class@"@elements.cell_attributes;noquote@ id="@list_properties.name@_@elements.name@" nowrap>
           <if @elements.orderby_url@ not nil>
-            <if @elements.ordering_p@ true>
+            <if @elements.ordering_p;literal@ true>
               <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label;noquote@</a>
               <a href="@elements.orderby_url@" title="@elements.orderby_html_title@"><if @elements.orderby_direction@ eq "desc"><img src="/resources/acs-templating/sort-descending.png" alt="#acs-templating.descending_order#" style="border:0;" width="10" height="10"></if><else><img src="/resources/acs-templating/sort-ascending.png" alt="#acs-templating.ascending_order#" style="border:0;" width="10" height="10"></else></a>
             </if>
@@ -124,7 +124,7 @@
     <multiple name="@list_properties.multirow@">
   </noparse>
       
-  <if @list_properties.aggregates_p@ true>
+  <if @list_properties.aggregates_p;literal@ true>
     <noparse><if \@@list_properties.multirow@.rownum@ eq \@@list_properties.multirow@:rowcount@></noparse>
       <multiple name="elements">
         <tfoot>
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.adp,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.adp	8 Jul 2016 16:13:35 -0000	1.1
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.adp	20 Jan 2017 08:25:47 -0000	1.1.2.1
@@ -4,7 +4,7 @@
 <formtemplate id="login" role="form" class="form-horizontal" style="form-horizontal"></formtemplate>
 
 <if @forgotten_pwd_url@ not nil>
-  <if @email_forgotten_password_p@ true>
+  <if @email_forgotten_password_p;literal@ true>
   <a href="@forgotten_pwd_url@">#acs-subsite.Forgot_your_password#</a>
   <br>
   </if>
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/search/lib/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/search/lib/navbar.adp,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/search/lib/navbar.adp	8 Jul 2016 16:13:35 -0000	1.1
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/search/lib/navbar.adp	20 Jan 2017 08:25:47 -0000	1.1.2.1
@@ -15,7 +15,7 @@
         <li><a aria-label="Previous" href="@url_previous@" title="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
       </else>
       <multiple name="results_paginator">
-        <if @results_paginator.current_p@>
+        <if @results_paginator.current_p;literal@ true>
           <li class="active"><a href="#">@results_paginator.item@ <span class="sr-only">(current)</span></a></li>
         </if>
         <else>
Index: openacs-4/packages/openacs-default-theme/lib/plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/plain-master.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/openacs-default-theme/lib/plain-master.adp	3 Jul 2015 11:04:08 -0000	1.3
+++ openacs-4/packages/openacs-default-theme/lib/plain-master.adp	20 Jan 2017 08:27:23 -0000	1.3.2.1
@@ -80,7 +80,7 @@
        </div>
      </if>
 
-     <if @main_content_p@>
+     <if @main_content_p;literal@ true>
        <div id="main">
          <div id="main-content">
            <div class="main-content-padding">
@@ -100,7 +100,7 @@
     TODO: remove this and add a more systematic / package independent way 
     TODO  of getting this content here
   </comment>
-  <if @curriculum_bar_p@ true><include src="/packages/curriculum/lib/bar" /></if>
+  <if @curriculum_bar_p;literal@ true><include src="/packages/curriculum/lib/bar" /></if>
 
   <comment> empty UL gives a validation error for the W3C validator 
   </comment>