Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	14 Jul 2015 22:36:43 -0000	1.17
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	18 Jan 2017 08:26:36 -0000	1.17.2.1
@@ -24,12 +24,12 @@
         <div class="form-label">
           <strong>
             #calendar.Date_1#
-            <if @cal_item.no_time_p@ eq 0> #calendar.and_Time#</if>:
+            <if @cal_item.no_time_p;literal@ false> #calendar.and_Time#</if>:
           </strong>
         </div>
         <div class="form-widget">
           <a href="@view_url@">@cal_item.pretty_short_start_date@</a>
-          <if @cal_item.no_time_p@ eq 0>, #calendar.from# @cal_item.start_time@ #calendar.to# @cal_item.end_time@</if>
+          <if @cal_item.no_time_p;literal@ false>, #calendar.from# @cal_item.start_time@ #calendar.to# @cal_item.end_time@</if>
         </div>
       </div>
       <div class="form-item-wrapper">
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.40.2.1 -r1.40.2.2
--- openacs-4/packages/calendar/www/cal-item-view.adp	22 Jun 2016 07:43:59 -0000	1.40.2.1
+++ openacs-4/packages/calendar/www/cal-item-view.adp	18 Jan 2017 08:26:36 -0000	1.40.2.2
@@ -55,11 +55,11 @@
 		</div>
 		<div class="form-item-wrapper">
 			<div class="form-label">
-				<strong>#calendar.Date_1#<if @cal_item.no_time_p@ eq 0> #calendar.and_Time#</if>:</strong>
+				<strong>#calendar.Date_1#<if @cal_item.no_time_p;literal@ false> #calendar.and_Time#</if>:</strong>
 			</div>
 			<div class="form-widget">                  
 				<a href="@goto_date_url@" title="#calendar.goto_cal_item_start_date#">@cal_item.pretty_short_start_date@</a>
-			    <if @cal_item.no_time_p@ eq 0>, #calendar.from# @cal_item.start_time@ #calendar.to# @cal_item.end_time@</if>
+			    <if @cal_item.no_time_p;literal@ false>, #calendar.from# @cal_item.start_time@ #calendar.to# @cal_item.end_time@</if>
 			</div>  
 		</div>
 		
@@ -93,7 +93,7 @@
 		</if>
 		
 		<div class="form-button">
-			<if @write_p@ true>
+			<if @write_p;literal@ true>
 		        <a href="@cal_item_new_url@" title="#calendar.edit#" class="button">#calendar.edit#</a>
 		        <a href="@cal_item_delete_url@" title="#calendar.delete#" class="button">#calendar.delete#</a>
 				@attachment_options;noquote@ 
Index: openacs-4/packages/calendar/www/cal-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v
diff -u -r1.10 -r1.10.4.1
--- openacs-4/packages/calendar/www/cal-options.adp	10 Oct 2009 22:38:09 -0000	1.10
+++ openacs-4/packages/calendar/www/cal-options.adp	18 Jan 2017 08:26:36 -0000	1.10.4.1
@@ -3,7 +3,7 @@
   <ul>
     <multiple name="calendars">
       <li> @calendars.calendar_name@
-        <if @calendars.calendar_admin_p@ true>
+        <if @calendars.calendar_admin_p;literal@ true>
           [<a href="@base_url@calendar-item-types?calendar_id=@calendars.calendar_id@" title="#calendar.Manage_Item_Types#">#calendar.Manage_Item_Types#</a>]
         </if>
       </li>
Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.23.4.1 -r1.23.4.2
--- openacs-4/packages/calendar/www/mini-calendar.adp	27 Sep 2016 10:13:55 -0000	1.23.4.1
+++ openacs-4/packages/calendar/www/mini-calendar.adp	18 Jan 2017 08:26:36 -0000	1.23.4.2
@@ -17,7 +17,7 @@
        <multiple name="months">
          <tr>
          <group column="new_row_p">
-         <if @months.current_month_p@ true>
+         <if @months.current_month_p;literal@ true>
           <td class="months selected"><a href="@months.url@" title="#calendar.goto_months_name#">@months.name@</a></td>
          </if>
          <else>
@@ -39,11 +39,11 @@
 
       <tbody>
         <multiple name="days">
-          <if @days.beginning_of_week_p@ true>
+          <if @days.beginning_of_week_p;literal@ true>
             <tr>
           </if>
-          <if @days.active_p@ true>
-            <if @days.today_p@ true>
+          <if @days.active_p;literal@ true>
+            <if @days.today_p;literal@ true>
               <td headers="day_@days.day_num@" class="today" id="@days.id;literal@">
                 <a href="@days.url@#calendar" title="#calendar.goto_days_pretty_date#">@days.day_number@</a>
               </td>
@@ -60,7 +60,7 @@
             </td>
           </else>
     
-          <if @days.end_of_week_p@ true>
+          <if @days.end_of_week_p;literal@ true>
             </tr>
           </if>
         </multiple>
@@ -69,7 +69,7 @@
  </table>
 
   <p>
-  <if @today_p@ true>
+  <if @today_p;literal@ true>
     #acs-datetime.Today#
   </if>
   <else>
Index: openacs-4/packages/calendar/www/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.adp,v
diff -u -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/calendar/www/navbar.adp	2 Oct 2016 16:43:51 -0000	1.4.6.1
+++ openacs-4/packages/calendar/www/navbar.adp	18 Jan 2017 08:26:36 -0000	1.4.6.2
@@ -3,7 +3,7 @@
   <tr>
     <td>
       <multiple name="views">
-        <span<if @views.selected_p@ true> class="active"</if>>
+        <span<if @views.selected_p;literal@ true> class="active"</if>>
         <a href="@views.url@" title="#calendar.select_views_name#" class="cal-icons @views.text@-view">
         @views.name;noquote@</a></span>@views.spacer;noquote@
       </multiple>
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.23.6.1 -r1.23.6.2
--- openacs-4/packages/calendar/www/view-month-display.adp	28 Sep 2016 09:38:53 -0000	1.23.6.1
+++ openacs-4/packages/calendar/www/view-month-display.adp	18 Jan 2017 08:26:36 -0000	1.23.6.2
@@ -20,15 +20,15 @@
 
       <multiple name="items">
 
-        <if @items.beginning_of_week_p@ true>
+        <if @items.beginning_of_week_p;literal@ true>
           <tr>
         </if>
 
-        <if @items.outside_month_p@ true>
+        <if @items.outside_month_p;literal@ true>
           <td class="cal-month-day-inactive" style="width: 14%;">&nbsp;</td>
         </if>     
         <else>
-          <if @items.today_p@ true>
+          <if @items.today_p;literal@ true>
             <td headers="mday_@items.weekday_num@" class="cal-month-today" style="width: 14%;" id="@items.id;literal@">
           </if>
           <else>
@@ -40,10 +40,10 @@
             <if @items.event_name@ true>
               <div class="cal-month-event @items.style_class@">
                 <a href="@items.event_url@" title="#calendar.goto_items_event_name#">
-                  <if @items.time_p@ true>@items.start_time@</if>
+                  <if @items.time_p;literal@ true>@items.start_time@</if>
                   @items.event_name@
                   <if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt=""></if>
-                  <if @show_calendar_name_p@><span class="cal-text-grey-sml"> [@items.calendar_name@]</span></if>
+                  <if @show_calendar_name_p;literal@ true><span class="cal-text-grey-sml"> [@items.calendar_name@]</span></if>
                 </a>
               </div>
             </if>
@@ -52,7 +52,7 @@
         </td>
         </else>
 
-        <if @items.end_of_week_p@ true>
+        <if @items.end_of_week_p;literal@ true>
           </tr>
         </if>
 
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.38.2.2 -r1.38.2.3
--- openacs-4/packages/calendar/www/view.adp	10 Oct 2015 12:13:54 -0000	1.38.2.2
+++ openacs-4/packages/calendar/www/view.adp	18 Jan 2017 08:26:36 -0000	1.38.2.3
@@ -12,12 +12,12 @@
     </else>
     <p>
     <a href="@add_item_url@" title="#calendar.Add_Item#" class="button">#calendar.Add_Item#</a>
-    <if @admin_p@ true>
+    <if @admin_p;literal@ true>
       <a href="admin/" title="#calendar.lt_Calendar_Administrati#" class="button">#calendar.lt_Calendar_Administrati#</a>
     </if>
     </p>
   
-    <if @calendar_personal_p@ false>
+    <if @calendar_personal_p;literal@ false>
        <p><include src="/packages/notifications/lib/notification-widget" type="calendar_notif"
 	 	   object_id="@package_id;literal@"
 	 	   pretty_name="@instance_name@" >
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.33 -r1.33.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	14 Jul 2015 22:36:42 -0000	1.33
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	18 Jan 2017 08:27:26 -0000	1.33.2.1
@@ -17,7 +17,7 @@
     #
 
 %>
-<if @config.shaded_p@ false>
+<if @config.shaded_p;literal@ false>
 
   <include src="/packages/calendar/www/navbar"
     date="@date;literal@"
@@ -36,10 +36,10 @@
           page_num="@page_num;literal@">
  
        <p>
-		<if @create_p@> 
+		<if @create_p;literal@ true> 
 			<a href="@add_item_url@" title="#calendar-portlet.Add_an_item#" class="button">#calendar-portlet.Add_an_item#</a>
 		</if>
-		<if @admin_p@>
+		<if @admin_p;literal@ true>
 			<a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@" title="#calendar-portlet.Manage_Item_Types#" class="button">#calendar-portlet.Manage_Item_Types#</a>
 		</if>
        </p>
Index: openacs-4/packages/categories/www/categories-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/categories/www/categories-browse.adp	3 Jul 2015 10:33:40 -0000	1.8
+++ openacs-4/packages/categories/www/categories-browse.adp	18 Jan 2017 08:28:30 -0000	1.8.2.1
@@ -9,7 +9,7 @@
     @trees.tree_name@:
     <select name=category_ids multiple size="5">
     <group column=tree_id>
-      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
+      <option value="@trees.category_id@"<if @trees.selected_p;literal@ true> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
     </select>
   </multiple>
Index: openacs-4/packages/categories/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/categories/www/index.adp	3 Jul 2015 10:33:40 -0000	1.7
+++ openacs-4/packages/categories/www/index.adp	18 Jan 2017 08:28:30 -0000	1.7.2.1
@@ -2,7 +2,7 @@
 <property name="doc(title)">@page_title;literal@</property>
 <property name="context">@context_bar;literal@</property>
 
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
   <div style="float: right;">
     <a href="cadmin/" class="button">#categories.lt_Category_Administrati#</a>
   </div>
Index: openacs-4/packages/categories/www/cadmin/permission-manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/categories/www/cadmin/permission-manage.adp	3 Jul 2015 10:33:41 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/permission-manage.adp	18 Jan 2017 08:28:30 -0000	1.4.2.1
@@ -4,15 +4,15 @@
 <property name="change_locale">f</property>
 
 <p>
-<if @sw_tree_p@ eq 1>
+<if @sw_tree_p;literal@ true>
   #categories.lt_This_is_a_site_wide_c#<p>
-  <if @admin_p@ eq 1>
+  <if @admin_p;literal@ true>
     <a href="site-wide-status-change?action=0&@url_vars@" class="button">#categories.Make_it_Local#</a>
   </if>
 </if>
 <else>
   #categories.This_tree_is_local#<p>
-  <if @admin_p@ eq 1>
+  <if @admin_p;literal@ true>
     <a href="site-wide-status-change?action=1&@url_vars@" class="button">#categories.Make_it_Site-Wide#</a>
   </if>
 </else>  
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.6.2.1 -r1.6.2.2
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	5 Aug 2016 14:11:57 -0000	1.6.2.1
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	18 Jan 2017 08:28:30 -0000	1.6.2.2
@@ -10,7 +10,7 @@
 </table>
 </p>
 
-<if @instances_using_p@ eq t>
+<if @instances_using_p;literal@ true>
   #categories.lt_This_tree_is_still_us#
   <a href="@usage_url@">#categories.here#</a>.
 </if>
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.4 -r1.4.4.1
--- openacs-4/packages/categories/www/include/widget.adp	20 May 2011 10:41:12 -0000	1.4
+++ openacs-4/packages/categories/www/include/widget.adp	18 Jan 2017 08:28:30 -0000	1.4.4.1
@@ -1,10 +1,10 @@
 <if @trees:rowcount@ gt 0>
   <multiple name=trees>
     @trees.tree_name@:
-    <select name="@name@"<if @trees.assign_single_p@ eq f> #categories.multiple#</if>>
+    <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>
     <group column=tree_id>
-      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
+      <option value="@trees.category_id@"<if @trees.selected_p;literal@ true> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
     </select>
   </multiple>