Index: openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/Attic/file-selector.adp,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp	12 Dec 2016 18:38:17 -0000	1.1.2.5
+++ openacs-4/packages/richtext-xinha/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp	21 Jan 2017 14:20:52 -0000	1.1.2.6
@@ -114,7 +114,7 @@
       </td>
 
       <td valign="top" width="50%" >
-	<if @write_p@ eq 1>
+	<if @write_p;literal@ true>
 	  <fieldset style="margin-top:10px;padding-top:10px;">
 	    <legend><strong>@HTML_UploadTitle@</strong></legend>
 	    <formtemplate id="upload_form">
Index: openacs-4/packages/search/lib/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/navbar.adp,v
diff -u -r1.2 -r1.2.12.1
--- openacs-4/packages/search/lib/navbar.adp	5 Jan 2008 17:52:40 -0000	1.2
+++ openacs-4/packages/search/lib/navbar.adp	21 Jan 2017 14:21:25 -0000	1.2.12.1
@@ -14,7 +14,7 @@
         <li><a href="@url_previous@">&lt;</a></li>
       </else>
       <multiple name="results_paginator">
-        <if @results_paginator.current_p@>
+        <if @results_paginator.current_p;literal@ true>
           <li class="current">@results_paginator.item@</li>
         </if>
         <else>
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.18.2.4 -r1.18.2.5
--- openacs-4/packages/search/www/search.adp	18 Oct 2016 10:29:34 -0000	1.18.2.4
+++ openacs-4/packages/search/www/search.adp	21 Jan 2017 14:21:25 -0000	1.18.2.5
@@ -2,7 +2,7 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">@page_title;literal@</property>
 
-<if @and_queries_notice_p@ eq 1>
+<if @and_queries_notice_p;literal@ true>
   <font color="6f6f6f">
     #search.The#
     [<a href="help/basics#and">#search.details#</a>]<br>
@@ -82,7 +82,7 @@
   </if>
 </if>
 
-<if @and_queries_notice_p@ eq 1>
+<if @and_queries_notice_p;literal@ true>
   <p class="hint">#search.and_not_needed# [<a href="help/basics#and">#search.details#</a>]</p>
 </if>
 <if @nstopwords@ eq 1>
@@ -92,7 +92,7 @@
   <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
 </if>
 
-<if @debug_p@>
+<if @debug_p;literal@ true>
   <p>#search.Searched_for_query#</p>
   <p>#search.Results_count#</p>
 </if>
Index: openacs-4/packages/static-portlet/www/element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.adp,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/static-portlet/www/element.adp	3 Jul 2015 10:45:21 -0000	1.12
+++ openacs-4/packages/static-portlet/www/element.adp	21 Jan 2017 14:22:14 -0000	1.12.2.1
@@ -25,7 +25,7 @@
 #static-portlet.Back_to# <a href="@referer@">@portal_name@</a>
 </p>
 
-<if @new_p@>
+<if @new_p;literal@ true>
 <p><big><strong>#static-portlet.Create_a_new#</strong></big></p>
 <p>#static-portlet.Use_this_form#</p>
 </if>
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.10 -r1.10.6.1
--- openacs-4/packages/static-portlet/www/static-portlet.adp	21 Apr 2009 10:14:43 -0000	1.10
+++ openacs-4/packages/static-portlet/www/static-portlet.adp	21 Jan 2017 14:22:14 -0000	1.10.6.1
@@ -19,7 +19,7 @@
 %>
 
 <if @config.shaded_p@ ne "t">
-<if @success_p@ eq 1>
+<if @success_p;literal@ true>
 @content;noquote@
 </if>
 </if>
Index: openacs-4/packages/survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.adp,v
diff -u -r1.9 -r1.9.6.1
--- openacs-4/packages/survey/www/index.adp	2 Apr 2009 13:48:21 -0000	1.9
+++ openacs-4/packages/survey/www/index.adp	21 Jan 2017 14:22:45 -0000	1.9.6.1
@@ -1,7 +1,7 @@
 <master>
 <property name="title">#survey.Surveys#</property>
 
-    <if @admin_p@ eq "1">
+    <if @admin_p;literal@ true>
       <p style="text-align: right;">
         <a href="admin/" class="button">#acs-kernel.common_Administration#</a>
       </p>
@@ -13,7 +13,7 @@
           <if @surveys.single_response_p@ eq "t" and @surveys.response_id@ nil> 
             (<a href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)
           </if>
-          <if @surveys.single_response_p@ eq "f">
+          <if @surveys.single_response_p;literal@ false>
             (<a	href="respond?survey_id=@surveys.survey_id@">#survey.Answer_Survey#</a>)
           </if>
           <if @surveys.response_id@ not nil>
@@ -23,7 +23,7 @@
             <ul>
               <group column="survey_id">
                 <li>#survey.lt_Previous_response_on_#
-                  <if @surveys.editable_p@ eq "t">
+                  <if @surveys.editable_p;literal@ true>
                     (<a href="respond?survey_id=@surveys.survey_id@&amp;response_id=@surveys.response_id@">#survey.Edit_Response#</a>)
                   </if>
                 </li>
Index: openacs-4/packages/survey/www/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.adp,v
diff -u -r1.9 -r1.9.8.1
--- openacs-4/packages/survey/www/one-respondent.adp	5 Mar 2008 21:20:39 -0000	1.9
+++ openacs-4/packages/survey/www/one-respondent.adp	21 Jan 2017 14:22:45 -0000	1.9.8.1
@@ -17,7 +17,7 @@
           <table width="100%" cellpadding="2" cellspacing="2" border="0">
             <tr class="table-header" style="background-color:#e6e6e6;">
               <td><a name="@responses.response_id@">#survey.lt_Your_response________#</a>
-                <if @editable_p@ eq "t">
+                <if @editable_p;literal@ true>
                   [<a href="@responses.respond_url@">#survey.edit_this_response#</a>]
                 </if>
 	      </td>
Index: openacs-4/packages/survey/www/one-survey.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-survey.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/survey/www/one-survey.adp	17 Jun 2015 07:43:56 -0000	1.7
+++ openacs-4/packages/survey/www/one-survey.adp	21 Jan 2017 14:22:45 -0000	1.7.2.1
@@ -1,14 +1,14 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming_1#</a></p></if>
+<if @admin_p;literal@ true><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming_1#</a></p></if>
     <ul>
       
       <multiple name="survey_details">
 	<li>@survey_details.name@
 	  <if @survey_details.single_response_p@ eq "t" and
 	@survey_details.response_id@ nil> <a
 	href="respond?survey_id=@survey_details.survey_id@">#survey.Answer_Survey#</a></if>
-	  <if @survey_details.single_response_p@ eq "f"><a
+	  <if @survey_details.single_response_p;literal@ false><a
 	href="respond?survey_id=@survey_details.survey_id@">#survey.Answer_Survey#</a></if>
 	</li>
 	<if @survey_details.response_id@ not nil>
@@ -17,7 +17,7 @@
 	<ul>
 	    <li>#survey.lt_Previous_response_on__1#
 	    <a href="one-respondent?survey_id=@survey_details.survey_id@&amp;#@survey_details.response_id@">#survey.View_Response#</a>
-	    <if @survey_details.editable_p@ eq "t">
+	    <if @survey_details.editable_p;literal@ true>
 	    <a href="respond?survey_id=@survey_details.survey_id@&amp;response_id=@survey_details.response_id@">#survey.Edit_Response#</a></if>
 	    </li>
 	 </ul>
Index: openacs-4/packages/survey/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/index.adp,v
diff -u -r1.5 -r1.5.8.1
--- openacs-4/packages/survey/www/admin/index.adp	5 Mar 2008 21:43:07 -0000	1.5
+++ openacs-4/packages/survey/www/admin/index.adp	21 Jan 2017 14:22:45 -0000	1.5.8.1
@@ -6,7 +6,7 @@
 <multiple name=surveys>
 <group column="enabled_p">
 <li> <a href="one?survey_id=@surveys.survey_id@">@surveys.name@</a> 
-<if @surveys.enabled_p@ eq "f"><span style="color: #f00">#survey.disabled#</span></if>
+<if @surveys.enabled_p;literal@ false><span style="color: #f00">#survey.disabled#</span></if>
 </group>
 </multiple>
 <p>
Index: openacs-4/packages/survey/www/admin/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/survey/www/admin/one-respondent.adp	17 Jun 2015 07:43:56 -0000	1.9
+++ openacs-4/packages/survey/www/admin/one-respondent.adp	21 Jan 2017 14:22:45 -0000	1.9.2.1
@@ -22,7 +22,7 @@
 
 <group column="initial_response">
 
-<if @responses.original_p@><a href="response-delete?response_id=@response_id@">
+<if @responses.original_p;literal@ true><a href="response-delete?response_id=@response_id@">
 <img src="../graphics/delete.gif" style="float:right; vertical-align:top; border: 0;" alt="#survey.Delete#"></a>
 </if>
  <strong>[<if
Index: openacs-4/packages/survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.adp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/survey/www/admin/one.adp	5 Aug 2016 13:55:53 -0000	1.13.2.1
+++ openacs-4/packages/survey/www/admin/one.adp	21 Jan 2017 14:22:45 -0000	1.13.2.2
@@ -6,7 +6,7 @@
 <p><a href=".">#survey.lt_Main_Survey_Administr#</a></p>
 <h2><strong style="font-size: large">@survey_info.name@</strong> #survey.-__Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</h2>
 <table class="table-display" cellpadding="2" cellspacing="0">
-	<tr class="even"><td> </td><td> #survey.This_survey_is# <if @survey_info.enabled_p@ eq t><%= [lang::util::localize @survey_info.enabled_display@]%></if><else><span style="color: #f00;"><%=[lang::util::localize @survey_info.enabled_display@]%></span></else>. - <a href="@toggle_enabled_url@">@toggle_enabled_text@</a></td></tr>
+	<tr class="even"><td> </td><td> #survey.This_survey_is# <if @survey_info.enabled_p;literal@ true><%= [lang::util::localize @survey_info.enabled_display@]%></if><else><span style="color: #f00;"><%=[lang::util::localize @survey_info.enabled_display@]%></span></else>. - <a href="@toggle_enabled_url@">@toggle_enabled_text@</a></td></tr>
 
 	<tr class="odd"> 
 <td valign="top">#survey.Survey_Name#<p>
@@ -29,7 +29,7 @@
 	]</td></tr>
 	
       
-	<tr class="odd"><td><if @survey_info.editable_p@> #survey.lt_Users_may_edit_their_#</if><else>#survey.lt_Users_may_not_edit_th#</else> - [ <a
+	<tr class="odd"><td><if @survey_info.editable_p;literal@ true> #survey.lt_Users_may_edit_their_#</if><else>#survey.lt_Users_may_not_edit_th#</else> - [ <a
 	href="response-editable-toggle?survey_id=@survey_id@">#survey.make# <if
 	@survey_info.editable_p@>#survey.non-#</if>#survey.editable#</a> ]</td></tr>
 
@@ -78,7 +78,7 @@
 <td valign="top">@questions.rownum@.  <a name="@questions.sort_order@"></a></td>
 
 <td><a	href="@questions.question_modify_url@">#survey.Edit#</a>
-<if @questions.active_p@ eq "f"><span style="color: #f00;">#survey.inactive#</span></if>
+<if @questions.active_p;literal@ false><span style="color: #f00;">#survey.inactive#</span></if>
 <a href="@questions.question_copy_url@">#survey.Copy#</a>
 <a href="@questions.question_add_url@">#survey.Add_New#</a><img src="../graphics/spacer.gif" style="border:0;" alt="" width="10">
 <if @questions.rownum@ lt @questions:rowcount@ ><a
Index: openacs-4/packages/theme-zen/lib/themes/zen-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/themes/zen-theme.adp,v
diff -u -r1.5 -r1.5.6.1
--- openacs-4/packages/theme-zen/lib/themes/zen-theme.adp	10 Jul 2009 10:58:39 -0000	1.5
+++ openacs-4/packages/theme-zen/lib/themes/zen-theme.adp	21 Jan 2017 14:23:29 -0000	1.5.6.1
@@ -3,10 +3,10 @@
     <div class="portlet-title">
       <h1>@name;noquote@</h1>
     </div>
-    <if @shadeable_p@ eq "t">     
+    <if @shadeable_p;literal@ true>     
       <div class="portlet-controls">
         <a href="@configure_element_url@">
-          <if @shaded_p@ eq "t">
+          <if @shaded_p;literal@ true>
             <img src="/resources/theme-zen/images/portlets/max.gif" alt="#theme-zen.maximize_portlet#"  width="19" height="16">
           </if>
           <else>