Index: openacs-4/packages/acs-admin/www/users/become.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/become.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/become.adp	13 Jan 2005 13:54:41 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/become.adp	14 Jul 2015 22:26:55 -0000	1.3
@@ -1,2 +1,2 @@
 
-<include src="/packages/acs-admin/lib/become" user_id=@user_id@>
+<include src="/packages/acs-admin/lib/become" user_id="@user_id;literal@">
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-admin/www/users/one.adp	3 Jul 2015 10:25:39 -0000	1.24
+++ openacs-4/packages/acs-admin/www/users/one.adp	14 Jul 2015 22:26:55 -0000	1.25
@@ -4,7 +4,7 @@
 
 <h2>Basic Information</h2>
 
-<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id@" return_url="@return_url;noquote@">
+<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id;literal@" return_url="@return_url;literal@">
 
 <ul>
 <li>User ID:  @user_id@</li>
Index: openacs-4/packages/acs-admin/www/users/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-update.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/password-update.adp	3 Jul 2015 10:25:39 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/password-update.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -2,5 +2,5 @@
 <property name="doc(title)">Update Password</property>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-admin/lib/password-update" return_url=@return_url@ user_id=@user_id@ >
+<include src="/packages/acs-admin/lib/password-update" return_url="@return_url;literal@" user_id="@user_id;literal@" >
 
Index: openacs-4/packages/acs-admin/www/users/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/users/user-add.adp	3 Jul 2015 10:25:40 -0000	1.11
+++ openacs-4/packages/acs-admin/www/users/user-add.adp	14 Jul 2015 22:26:55 -0000	1.12
@@ -3,5 +3,5 @@
 <property name="focus">register.email</property>
 <property name="context">@context;literal@</property>
 
-<include src="@user_new_template@" next_url="@next_url;noquote@" self_register_p="0"/>
+<include src="@user_new_template;literal@" next_url="@next_url;literal@" self_register_p="0"/>
 
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	3 Jul 2015 10:25:40 -0000	1.14
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	14 Jul 2015 22:26:55 -0000	1.15
@@ -3,7 +3,7 @@
 <property name="context">@context;literal@</property>
 
 <div style="float: right;">
-  <include src="/packages/acs-api-browser/lib/search" query_string="@query_string@">
+  <include src="/packages/acs-api-browser/lib/search" query_string="@query_string;literal@">
 </div>
 
 <div style="float: left; width: 60%;">
Index: openacs-4/packages/acs-authentication/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/lib/search.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-authentication/lib/search.adp	8 Sep 2008 20:15:50 -0000	1.1
+++ openacs-4/packages/acs-authentication/lib/search.adp	14 Jul 2015 22:26:55 -0000	1.2
@@ -59,7 +59,7 @@
 </style>
 <multiple name="authorities">
 <if @authorities.authority_id@ eq @selected_authority_id@>
-<include src="@authorities.form_include@" authority_id="@authorities.authority_id@" search_text="@search_text@" return_url="@return_url@" orderby="@orderby@" member_url="@member_url@" group_id="@group_id@" &="rel_type" &="object_id" &="privilege"></if>
+<include src="@authorities.form_include;literal@" authority_id="@authorities.authority_id;literal@" search_text="@search_text;literal@" return_url="@return_url;literal@" orderby="@orderby;literal@" member_url="@member_url;literal@" group_id="@group_id;literal@" &="rel_type" &="object_id" &="privilege"></if>
 </multiple>
 
 <div id="navbar-div">
Index: openacs-4/packages/acs-content-repository/www/doc/package.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/package.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-content-repository/www/doc/package.adp	22 May 2003 14:02:53 -0000	1.2
+++ openacs-4/packages/acs-content-repository/www/doc/package.adp	14 Jul 2015 22:26:55 -0000	1.3
@@ -35,7 +35,7 @@
 
 <a name="api"><h3>API</h3></a>
 <multiple name=methods>
-  <include src=method package=@package_name;noquote@ method=@methods.name;noquote@>
+  <include src=method package="@package_name;literal@" method="@methods.name;literal@">
   <p>&nbsp;</p>
 </multiple>
 
Index: openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.tcl	27 Oct 2014 16:39:33 -0000	1.3
+++ openacs-4/packages/acs-datetime/www/doc/examples/calendar-navigation.tcl	14 Jul 2015 22:26:55 -0000	1.4
@@ -8,7 +8,7 @@
     @creation-date 2000-12-08
     @cvs-id  $Id$
 } {
-    {view ""}
+    {view:word ""}
     {date ""}
 } -properties {
     title:onevalue
Index: openacs-4/packages/acs-lang/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/index.adp	3 Jul 2015 10:25:42 -0000	1.11
+++ openacs-4/packages/acs-lang/www/index.adp	14 Jul 2015 22:26:55 -0000	1.12
@@ -8,4 +8,4 @@
   </div>
 </if>
 
-<include src="/packages/acs-lang/www/change-locale-include" return_url="@return_url;noquote@" return_p="@return_p;noquote@">
\ No newline at end of file
+<include src="/packages/acs-lang/www/change-locale-include" return_url="@return_url;literal@" return_p="@return_p;literal@">
\ No newline at end of file
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	3 Jul 2015 10:25:42 -0000	1.16
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	14 Jul 2015 22:26:55 -0000	1.17
@@ -10,14 +10,14 @@
 
 @first_translated_message;noquote@
 
-<include src="audit-include" current_locale="@current_locale;noquote@" message_key="@message_key;noquote@" package_key="@package_key;noquote@">
+<include src="audit-include" current_locale="@current_locale;literal@" message_key="@message_key;literal@" package_key="@package_key;literal@">
 
 <h2>Files that use this message</h2>
 <if @usage_p@ true>
   <p>
     <b>Show</b> | <a href="@usage_hide_url@">Hide</a> files that use this message.
   </p>
-  <include src="message-usage-include" message_key="@message_key;noquote@" package_key="@package_key;noquote@">
+  <include src="message-usage-include" message_key="@message_key;literal@" package_key="@package_key;literal@">
 </if>
 <else>
   <p>
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	3 Jul 2015 10:25:43 -0000	1.15
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	14 Jul 2015 22:26:55 -0000	1.16
@@ -22,7 +22,7 @@
   </multiple>
 </p>
 
-<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" package_key="@package_key@"/>
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" package_key="@package_key;literal@"/>
 
 <ul class="action-links">
   <if @create_p@ true>
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	3 Jul 2015 10:25:43 -0000	1.12
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	14 Jul 2015 22:26:55 -0000	1.13
@@ -6,7 +6,7 @@
 <p>Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
-<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" />
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" />
 
 <if @locale_enabled_p@ and @site_wide_admin_p@>
   <ul class="action-links">
Index: openacs-4/packages/acs-subsite/lib/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/lib/home.adp	7 Jan 2010 11:41:35 -0000	1.7
+++ openacs-4/packages/acs-subsite/lib/home.adp	14 Jul 2015 22:26:55 -0000	1.8
@@ -60,7 +60,7 @@
           </div>
         </div>
         <div class="portlet">
-          <include src="@user_info_template@" />
+          <include src="@user_info_template;literal@" />
           <if @account_status@ eq "closed">
             #acs-subsite.Account_closed_workspace_msg#
            </if>
Index: openacs-4/packages/acs-subsite/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/permissions.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/permissions.adp	3 Jul 2015 10:25:44 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/permissions.adp	14 Jul 2015 22:26:55 -0000	1.5
@@ -2,4 +2,4 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@subsite_id@" user_add_url="permissions-user-add">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@subsite_id;literal@" user_add_url="permissions-user-add">
Index: openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp	3 Jul 2015 10:25:44 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/applications/permissions.adp	14 Jul 2015 22:26:55 -0000	1.4
@@ -2,4 +2,4 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@package_id@" user_add_url="permissions-user-add">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@package_id;literal@" user_add_url="permissions-user-add">
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	3 Jul 2015 10:25:44 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -8,5 +8,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this attribute">
+<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this attribute">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -7,5 +7,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="value-delete-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this attribute value">
+<include src="../confirm-delete-form" action="value-delete-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this attribute value">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -18,5 +18,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this group type">
+<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this group type">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -4,7 +4,7 @@
 
 <ul>
 
-   <include src="groups-list" group_type=@group_type;noquote@>
+   <include src="groups-list" group_type="@group_type;literal@">
   <p>
   <li><a href="../groups/new?group_type=@group_type_enc@">Add a group</a> </li>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -7,6 +7,6 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="rel-type-remove-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to remove this relationship type">
+<include src="../confirm-delete-form" action="rel-type-remove-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to remove this relationship type">
 </center>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	14 Jul 2015 22:26:55 -0000	1.6
@@ -20,5 +20,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="constraints-create-2" export_vars="@export_vars;noquote@" no_button=" No " yes_button=" Yes ">
+<include src="../confirm-delete-form" action="constraints-create-2" export_vars="@export_vars;literal@" no_button=" No " yes_button=" Yes ">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	3 Jul 2015 10:25:45 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	14 Jul 2015 22:26:55 -0000	1.7
@@ -21,5 +21,5 @@
 <p>
 
 <div>
-<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this group">
+<include src="../confirm-delete-form" action="delete-2" export_vars="@export_form_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this group">
 </div>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	2 Jul 2015 19:24:06 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -10,7 +10,7 @@
  <li><a href="../group-types/one?group_type=@group_types.group_type_enc@">@group_types.type_pretty_name@</a>
  <ul>
  <if @group_types.number_groups@ lt 25>
-   <include src="../group-types/groups-list" group_type=@group_types.group_type;noquote@>
+   <include src="../group-types/groups-list" group_type="@group_types.group_type;literal@">
  </if>
  <else>
    <li> <a href="../group-types/groups-display?group_type=@group_types.group_type_enc@">View all @group_types.number_groups@ groups</a></li>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	15 Jun 2015 11:14:17 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	14 Jul 2015 22:26:56 -0000	1.8
@@ -23,7 +23,7 @@
           </if>
           <else>
             <br>
-	        <include src="elements-display-list" group_id="@group_id;noquote@" rel_type="@rels.rel_type;noquote@" return_url_enc="@return_url_enc;noquote@" member_state="approved">
+	        <include src="elements-display-list" group_id="@group_id;literal@" rel_type="@rels.rel_type;literal@" return_url_enc="@return_url_enc;literal@" member_state="approved">
           </else>
         </else>
       </group>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	3 Jul 2015 10:25:45 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	14 Jul 2015 22:26:56 -0000	1.8
@@ -2,7 +2,7 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">@role_pretty_plural;noquote@ of @group_name;noquote@</property>
 
-<include src="elements-display-list" group_id="@group_id;noquote@" rel_type="@rel_type;noquote@" member_state="@member_state;noquote@">
+<include src="elements-display-list" group_id="@group_id;literal@" rel_type="@rel_type;literal@" member_state="@member_state;literal@">
 
 <if @member_state@ eq approved or @member_state@ eq "">
     <if @create_p@ eq 1>
Index: openacs-4/packages/acs-subsite/www/admin/groups/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/index.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/index.adp	3 Jul 2015 10:25:45 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/index.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -13,7 +13,7 @@
     <a href="@this_url@?view_by=rel_type">#acs-subsite.relationship_to_site#</a>
     </strong>
 
-    <include src="elements-by-group-type" group_id=@subsite_group_id;noquote@>
+    <include src="elements-by-group-type" group_id="@subsite_group_id;literal@">
 </if>
 <else>
     <strong>
@@ -22,7 +22,7 @@
     #acs-subsite.relationship_to_site#
     </strong>
 
-    <include src="elements-by-rel-type" group_id=@subsite_group_id;noquote@>
+    <include src="elements-by-rel-type" group_id="@subsite_group_id;literal@">
 </else>
 
 <p>#acs-subsite.To_add_a_group_first_select_a_group_type_above_or_go_to_the#</p>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	3 Jul 2015 10:25:45 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	14 Jul 2015 22:26:56 -0000	1.11
@@ -35,7 +35,7 @@
 
  
 <h3>Permissible relationship types</h3>
-<include src="elements-by-rel-type" group_id=@group_id;noquote@>
+<include src="elements-by-rel-type" group_id="@group_id;literal@">
 
 <if @admin_p@ eq 1>
   <h3>Extreme Actions</h3>
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	3 Jul 2015 10:25:45 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	14 Jul 2015 22:26:56 -0000	1.7
@@ -14,5 +14,5 @@
 </ul>
 
 <div>
-<include src="../confirm-delete-form" action="rel-type-remove-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this relationship type">
+<include src="../confirm-delete-form" action="rel-type-remove-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this relationship type">
 </div>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	3 Jul 2015 10:25:46 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -9,7 +9,7 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="delete-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this segment">
+<include src="../confirm-delete-form" action="delete-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this segment">
 </center>
 
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	3 Jul 2015 10:25:46 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -2,4 +2,4 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">@segment_name;literal@</property>
 
-<include src="elements-display" segment_id="@segment_id;noquote@" segment_name="@segment_name;noquote@" group_id=@group_id;noquote@ role="@role_pretty_plural;noquote@">
+<include src="elements-display" segment_id="@segment_id;literal@" segment_name="@segment_name;literal@" group_id="@group_id;literal@" role="@role_pretty_plural;literal@">
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	3 Jul 2015 10:25:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -13,5 +13,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="constraints-redirect" export_vars="@export_vars;noquote@" no_button=" No " yes_button=" Yes ">
+<include src="../confirm-delete-form" action="constraints-redirect" export_vars="@export_vars;literal@" no_button=" No " yes_button=" Yes ">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -8,5 +8,5 @@
 <p>
 
 <center>
-<include src="../../confirm-delete-form" action="delete-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this constraint">
+<include src="../../confirm-delete-form" action="delete-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this constraint">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -22,5 +22,5 @@
 <p>
 
 <center>
-<include src="../confirm-delete-form" action="delete-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this relationship type">
+<include src="../confirm-delete-form" action="delete-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this relationship type">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	3 Jul 2015 10:25:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	14 Jul 2015 22:26:56 -0000	1.6
@@ -7,5 +7,5 @@
 <p>
 
 <center>
-<include src="../../confirm-delete-form" action="delete-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this role">
+<include src="../../confirm-delete-form" action="delete-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to delete this role">
 </center>
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	3 Jul 2015 10:25:48 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	14 Jul 2015 22:26:56 -0000	1.7
@@ -8,6 +8,6 @@
 <p>
 
 <div>
-<include src="../confirm-delete-form" action="remove-2" export_vars="@export_vars;noquote@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to remove this relation">
+<include src="../confirm-delete-form" action="remove-2" export_vars="@export_vars;literal@" no_button="No, I want to cancel my request" yes_button="Yes, I really want to remove this relation">
 </div>
 
Index: openacs-4/packages/acs-subsite/www/members/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/members/user-new.adp	3 Jul 2015 10:25:48 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/members/user-new.adp	14 Jul 2015 22:26:56 -0000	1.9
@@ -3,8 +3,8 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="focus">register.first_names</property>
 
-<include src="@user_new_template@"
+<include src="@user_new_template;literal@"
     self_register_p="0" 
-    email="@email@" 
+    email="@email;literal@" 
     return_url="." 
-    rel_group_id="@rel_group_id@" />
+    rel_group_id="@rel_group_id;literal@" />
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	3 Jul 2015 11:04:09 -0000	1.28
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	14 Jul 2015 22:26:56 -0000	1.29
@@ -4,4 +4,4 @@
   <property name="focus">user_info.first_names</property>
   <property name="displayed_object_id">@user_id;literal@</property>
 
- <include src="@user_home_template@" user_id="@user_id@"/>
+ <include src="@user_home_template;literal@" user_id="@user_id;literal@"/>
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp	29 May 2007 05:40:54 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp	14 Jul 2015 22:26:56 -0000	1.11
@@ -1,4 +1,4 @@
 <master>
   <property name="context">{#acs-subsite.Email_Confirmation#}</property>
 
-<include src="@email_confirm_template@" user_id="@user_id@" token="@token;noquote@" return_url="@return_url;noquote@" />
+<include src="@email_confirm_template;literal@" user_id="@user_id;literal@" token="@token;literal@" return_url="@return_url;literal@" />
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/register/index.adp	27 Oct 2014 16:40:01 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/register/index.adp	14 Jul 2015 22:26:56 -0000	1.22
@@ -2,5 +2,5 @@
   <property name="doc(title)">#acs-subsite.Log_In#</property>
   <property name="context">{#acs-subsite.Log_In#}</property>
 
-<include src="@login_template@" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
+<include src="@login_template;literal@" return_url="@return_url;literal@" no_frame_p="1" authority_id="@authority_id;literal@" username="@username;literal@" email="@email;literal@" &="__adp_properties">
 
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	27 Oct 2014 16:40:01 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	14 Jul 2015 22:26:56 -0000	1.19
@@ -3,4 +3,4 @@
   <property name="context">{#acs-subsite.Register#}</property>
   <property name="focus">register.email</property>
 
-<include src="@user_new_template@" email="@email@" return_url="@return_url;noquote@" />
+<include src="@user_new_template;literal@" email="@email;literal@" return_url="@return_url;literal@" />
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	3 Jul 2015 10:25:50 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	14 Jul 2015 22:26:56 -0000	1.18
@@ -8,4 +8,4 @@
   <div class="general-message">@message@</div>
 </if>
 
-<include src="@user_info_template@" user_id="@user_id@" return_url="@return_url;noquote@" &="__adp_properties" edit_p="@edit_p@" message="@message;noquote@">
+<include src="@user_info_template;literal@" user_id="@user_id;literal@" return_url="@return_url;literal@" &="__adp_properties" edit_p="@edit_p;literal@" message="@message;literal@">
Index: openacs-4/packages/acs-templating/www/admin/test/include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/admin/test/include.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/admin/test/include.adp	22 May 2003 14:16:00 -0000	1.2
+++ openacs-4/packages/acs-templating/www/admin/test/include.adp	14 Jul 2015 22:26:56 -0000	1.3
@@ -3,7 +3,7 @@
 @indent@ @lt@if @false_condition@>
 @indent@   fail '@false_label@' should be false
 @indent@ @lt@/if>@lt@else>
-<include src=include l="@cdr;noquote@" indent="@indent;noquote@  "
+<include src=include l="@cdr;literal@" indent="@indent;noquote@  "
 >@indent;noquote@ @lt;noquote@/else>
 @indent@@lt@/if>@lt@else>
 @indent@ fail '@true_label@' should be true
Index: openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp	11 Jul 2015 16:45:23 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp	14 Jul 2015 22:26:56 -0000	1.4
@@ -1,5 +1,5 @@
 <html>
   <body>
-    <include src="fibo" n=@m;noquote@ >
+    <include src="fibo" n="@m;literal@" >
   </body>
 </html>
Index: openacs-4/packages/acs-templating/www/doc/demo/fibo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/fibo.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/fibo.adp	22 May 2003 14:16:37 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/fibo.adp	14 Jul 2015 22:26:56 -0000	1.3
@@ -2,8 +2,8 @@
 <property name=level>@n;noquote@</property>
 
 <if @n@ ge 2>
-  <td><include src=fibo n=@one_less;noquote@></td>
-  <td><include src=fibo n=@two_less;noquote@></td>
+  <td><include src=fibo n="@one_less;literal@"></td>
+  <td><include src=fibo n="@two_less;literal@"></td>
 </if><else>
   <td>*</td>
 </else>
Index: openacs-4/packages/acs-templating/www/doc/demo/include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/include.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/include.adp	22 May 2003 14:16:37 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/include.adp	14 Jul 2015 22:26:56 -0000	1.3
@@ -2,7 +2,7 @@
   <body>
   <h1>Included Template</h1>
 
-  relative:<include src="included" name="@name;noquote@">
+  relative:<include src="included" name="@name;literal@">
   <br>
   absolute:<include src="/packages/acs-templating/www/doc/demo/included"
                       name="Anders">
Index: openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	16 Jun 2015 08:53:39 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	14 Jul 2015 22:26:56 -0000	1.4
@@ -47,7 +47,7 @@
 </if>
 
 <multiple name=public>
-<include src=proc-template data=@public.data;noquote@>
+<include src=proc-template data="@public.data;literal@">
 <p>
 </multiple>
 
@@ -57,7 +57,7 @@
 <b>Private Methods</b>:<br>
 </if>
 <multiple name=private>
-<include src=proc-template data=@private.data;noquote@>
+<include src=proc-template data="@private.data;literal@">
 <p>
 </multiple>
 
Index: openacs-4/packages/acs-templating/www/doc/gen/package-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/package-template.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/gen/package-template.adp	16 Jun 2015 08:53:39 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/gen/package-template.adp	14 Jul 2015 22:26:57 -0000	1.4
@@ -17,7 +17,7 @@
 <list name=info_list>
   <tr bgcolor=white>
     <td>
-      <include src="namespace_block" data="@info_list:item;noquote@">
+      <include src="namespace_block" data="@info_list:item;literal@">
     </td>
 </tr>
 </list>
Index: openacs-4/packages/assessment/lib/feedback.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/lib/feedback.adp	3 Jul 2015 10:40:00 -0000	1.6
+++ openacs-4/packages/assessment/lib/feedback.adp	14 Jul 2015 22:36:43 -0000	1.7
@@ -4,12 +4,12 @@
 <if @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@: Feedback</h2></if>
 
 <if @total_pages@ defined>
-  <include src="/packages/assessment/lib/progress-bar" total="@total_pages@" current="@current_page@" finished_page="@finished_page@"/>
+  <include src="/packages/assessment/lib/progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finished_page="@finished_page;literal@"/>
 </if>
 
   <h2>@section_title@</h2>
 
-  <include src="/packages/assessment/lib/session-items" section_id="@section_id@" subject_id="@subject_id@" session_id="@session_id@" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@" feedback_only_p="1" next_url="@next_url;noquote@" item_id_list=@item_id_list@ return_p=@return_p@  &=assessment_data>
+  <include src="/packages/assessment/lib/session-items" section_id="@section_id;literal@" subject_id="@subject_id;literal@" session_id="@session_id;literal@" show_item_name_p="@assessment_data.show_item_name_p;literal@" show_feedback="@assessment_data.show_feedback;literal@" survey_p="@assessment_data.survey_p;literal@" feedback_only_p="1" next_url="@next_url;literal@" item_id_list="@item_id_list;literal@" return_p="@return_p;literal@"  &=assessment_data>
 
   <p />
 
Index: openacs-4/packages/assessment/lib/include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/include.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/include.adp	12 Jun 2006 03:30:09 -0000	1.1
+++ openacs-4/packages/assessment/lib/include.adp	14 Jul 2015 22:36:43 -0000	1.2
@@ -1,2 +1,2 @@
 <master>
-<include src="@include@">
\ No newline at end of file
+<include src="@include;literal@">
\ No newline at end of file
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 -N -r1.20 -r1.21
--- openacs-4/packages/assessment/lib/session-items.adp	16 Jun 2015 09:26:24 -0000	1.20
+++ openacs-4/packages/assessment/lib/session-items.adp	14 Jul 2015 22:36:43 -0000	1.21
@@ -33,7 +33,7 @@
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
 		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
-		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
+		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		    </if>
 		    <else>
 		      <if @items.answered_p@ eq t><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
@@ -42,7 +42,7 @@
 		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
               <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
-		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@"> 
+		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@"> 
 		  </if>
 		</if>
 	      <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -80,7 +80,7 @@
 	  </if>
     </group>
 
-  <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    
+  <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>    
   <if @edit_p@ eq 1 and @items.answered_p@ eq t>
     <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></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 -N -r1.12 -r1.13
--- openacs-4/packages/assessment/lib/session.adp	16 Jun 2015 09:26:24 -0000	1.12
+++ openacs-4/packages/assessment/lib/session.adp	14 Jul 2015 22:36:43 -0000	1.13
@@ -27,7 +27,7 @@
     <if @assessment_data.show_feedback@ ne none><p>@sections.feedback_text@</p></if>
 
 
-  <include src="/packages/assessment/lib/session-items" section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@" &=assessment_data>
+  <include src="/packages/assessment/lib/session-items" section_id="@sections.section_id;literal@" subject_id="@subject_id;literal@" session_id="@session_id;literal@" show_item_name_p="@assessment_data.show_item_name_p;literal@" show_feedback="@assessment_data.show_feedback;literal@" survey_p="@assessment_data.survey_p;literal@" &=assessment_data>
 
 
       </fieldset><!-- End Section FieldSet -->
@@ -40,5 +40,5 @@
 <if @assessment_data.survey_p@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
 
 <if @comments_installed_p@>
-<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
+<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" />
 </if>
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 -N -r1.29 -r1.30
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	3 Jul 2015 10:40:00 -0000	1.29
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	14 Jul 2015 22:36:43 -0000	1.30
@@ -11,7 +11,7 @@
   <if @section.max_time_to_complete@ not nil><br>#assessment.section_time_remaining#</if>
 
   <if @progress_bar_list@ defined>
-  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages@" current="@current_page@" />
+  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" />
   </if>
 
   <if @form_is_submit@ true and @form_is_valid@ false>
Index: openacs-4/packages/assessment/www/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/www/finish.adp	3 Jul 2015 10:40:00 -0000	1.8
+++ openacs-4/packages/assessment/www/finish.adp	14 Jul 2015 22:36:43 -0000	1.9
@@ -3,7 +3,7 @@
 <property name="context">@context;literal@</property>
 
 <if @total_pages@ defined>
-  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages@" current="@current_page@" finish="1" />
+  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finish="1" />
 </if>
 
 @assessment_data.exit_page;noquote@
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -N -r1.35 -r1.36
--- openacs-4/packages/assessment/www/session.adp	3 Jul 2015 10:40:00 -0000	1.35
+++ openacs-4/packages/assessment/www/session.adp	14 Jul 2015 22:36:43 -0000	1.36
@@ -1,4 +1,4 @@
 <master>
 <property name="doc(title)">@page_title;literal@</property>
 <property name="context">@context;literal@</property>
-<include src="/packages/assessment/lib/session" session_id="@session_id@">
+<include src="/packages/assessment/lib/session" session_id="@session_id;literal@">
Index: openacs-4/packages/assessment/www/admin/asm-action-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment/www/admin/asm-action-new.adp	3 Jul 2015 10:40:00 -0000	1.8
+++ openacs-4/packages/assessment/www/admin/asm-action-new.adp	14 Jul 2015 22:36:43 -0000	1.9
@@ -5,6 +5,6 @@
   <formtemplate id="action_admin"></formtemplate>
 
 <if @parameter_exist@ eq "y">
-	<include src=asm-action-param-list action_id=@action_id@>
+	<include src=asm-action-param-list action_id="@action_id;literal@">
 </if>
 
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	3 Jul 2015 10:40:00 -0000	1.10
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	14 Jul 2015 22:36:43 -0000	1.11
@@ -5,6 +5,6 @@
   <formtemplate id="parameter_admin"></formtemplate>
 
 
-<include src=asm-action-param-list action_id=@action_id@> &nbsp;
+<include src=asm-action-param-list action_id="@action_id;literal@"> &nbsp;
 
 <p><a href="/assessment/admin">#assessment.return#</a></p>
Index: openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp	3 Jul 2015 10:40:01 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/bulk-mail.adp	14 Jul 2015 22:36:43 -0000	1.4
@@ -1,7 +1,7 @@
 
 <master>
 <property name="doc(title)">@spam_name;literal@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;literal@</property>
 <formtemplate id="spam_message"></formtemplate>
 
 
Index: openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	3 Jul 2015 10:40:01 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	14 Jul 2015 22:36:43 -0000	1.7
@@ -25,7 +25,7 @@
 </td></tr>
 </table>      
 
-  <include src="/packages/assessment/lib/section-show" assessment_id="@assessment_id@" section_id="@sections.section_id@">
+  <include src="/packages/assessment/lib/section-show" assessment_id="@assessment_id;literal@" section_id="@sections.section_id;literal@">
 
 </multiple>
 
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/item-edit.adp	3 Jul 2015 10:40:02 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.adp	14 Jul 2015 22:36:43 -0000	1.7
@@ -4,8 +4,8 @@
 
   <formtemplate id="item_edit"></formtemplate>
 
-<include src="/packages/assessment/lib/item-show-@item_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
+<include src="/packages/assessment/lib/item-show-@item_type@" assessment_id="@assessment_id;literal@" section_id="@section_id;literal@" as_item_id="@as_item_id;literal@">
 
-<include src="/packages/assessment/lib/item-show-display-@display_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
+<include src="/packages/assessment/lib/item-show-display-@display_type@" assessment_id="@assessment_id;literal@" section_id="@section_id;literal@" as_item_id="@as_item_id;literal@">
 
 <p><a href="one-a?assessment_id=@assessment_id@">@assessment_data.title@</a></p>
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 -N -r1.23 -r1.24
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	3 Jul 2015 10:40:02 -0000	1.23
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	14 Jul 2015 22:36:43 -0000	1.24
@@ -2,7 +2,7 @@
 <property name="doc(title)">@p_title;literal@</property>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="front">
+<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id;literal@" tab="front">
 
 <table width="100%">
 <tr>
Index: openacs-4/packages/assessment/www/asm-admin/one-section.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-section.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/asm-admin/one-section.adp	3 Jul 2015 10:40:02 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/one-section.adp	14 Jul 2015 22:36:43 -0000	1.7
@@ -2,7 +2,7 @@
 <property name="doc(title)">@title;literal@</property>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@section_id@">
+<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id;literal@" tab="@section_id;literal@">
 
 <h3>#assessment.Sections#</h3>
 
@@ -49,6 +49,6 @@
 </td></tr>
 </table>      
 
-  <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@section_id@">
+  <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id;literal@" section_id="@section_id;literal@">
 
 </multiple>
Index: openacs-4/packages/assessment/www/asm-admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/permissions.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/permissions.adp	3 Jul 2015 10:40:02 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/permissions.adp	14 Jul 2015 22:36:43 -0000	1.4
@@ -2,4 +2,4 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" return_url="@return_url@" user_add_url="permissions-user-add">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" return_url="@return_url;literal@" user_add_url="permissions-user-add">
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	3 Jul 2015 10:40:02 -0000	1.9
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	14 Jul 2015 22:36:43 -0000	1.10
@@ -2,7 +2,7 @@
 <property name="doc(title)">@title;literal@</property>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@tab@">
+<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id;literal@" tab="@tab;literal@">
 
 <if @sections:rowcount@ eq 0><br><a class="button" href="section-form?assessment_id=@assessment_id@">#assessment.add_new_section#</a></if>
 
@@ -34,7 +34,7 @@
   <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
  <fieldset> 
    <legend>#assessment.Items#</legend>
-   <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@sections.section_id@" admin_trigger_p="@admin_trigger_p@">
+   <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id;literal@" section_id="@sections.section_id;literal@" admin_trigger_p="@admin_trigger_p;literal@">
  </fieldset>
 </multiple>
 
Index: openacs-4/packages/assessment/www/asm-admin/results-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-edit.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/results-edit.adp	3 Jul 2015 10:40:03 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/results-edit.adp	14 Jul 2015 22:36:43 -0000	1.6
@@ -5,12 +5,12 @@
 <h1>#assessment.Add_Comment#</h1>
 <h2>#assessment.item_Title#: @item_title;noquote@</h2>
 
-<p><include src="/packages/assessment/lib/results-edit-@item_type@" item_data_id="@item_data_id@">
+<p><include src="/packages/assessment/lib/results-edit-@item_type@" item_data_id="@item_data_id;literal@">
 
 <p>#assessment.currently# <if @result_points@ not nil><b>@result_points@ / @max_points@ #assessment.points#</b></if>
 <else><b>#assessment.not_yet_reviewed#</b></else>
 <p>
 
-<include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@as_item_id@">
+<include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@as_item_id;literal@">
 
 <formtemplate id="results-edit"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/results-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/assessment/www/asm-admin/results-session.adp	3 Jul 2015 10:40:03 -0000	1.13
+++ openacs-4/packages/assessment/www/asm-admin/results-session.adp	14 Jul 2015 22:36:43 -0000	1.14
@@ -18,12 +18,12 @@
 <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
 <if @sections.description@ not nil><p>@sections.description@</p></if>
 <if @sections.feedback_text@ not nil><p>@sections.feedback_text@</p></if>
-<include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@">
+<include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id;literal@" subject_id="@subject_id;literal@" session_id="@session_id;literal@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p;literal@" show_feedback="@assessment_data.show_feedback;literal@" survey_p="@assessment_data.survey_p;literal@">
 </div> <!-- section -->
 </multiple>
 <hr>
 <if @assessment_data.type@ ne survey><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
 <if @comments_installed_p@>
-<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
+<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" />
 </if>
 </div> <!-- result -->
Index: openacs-4/packages/assessment/www/asm-admin/results-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/assessment/www/asm-admin/results-users.adp	3 Jul 2015 10:40:03 -0000	1.10
+++ openacs-4/packages/assessment/www/asm-admin/results-users.adp	14 Jul 2015 22:36:43 -0000	1.11
@@ -2,7 +2,7 @@
 <property name="doc(title)">@page_title;literal@</property>
 <property name="context">@context;literal@</property>
 
-<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="results">
+<include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id;literal@" tab="results">
 
 <if @status_p@ eq 0>
 <p>@count_all_users@ #assessment.users_in_community#, @count_complete@ #assessment.complete_responses#, @count_incomplete@ #assessment.incomplete_responses#</p>
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 -N -r1.16 -r1.17
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	27 Oct 2014 16:41:08 -0000	1.16
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	14 Jul 2015 22:36:43 -0000	1.17
@@ -3,7 +3,7 @@
     <property name="context">#calendar.Delete#</property>
 
     <div id="viewadp-mini-calendar">
-      <include src="mini-calendar" base_url="view" view="day" date="@date@">
+      <include src="mini-calendar" base_url="view" view="day" date="@date;literal@">
     </div>	
 
     <div id="viewadp-cal-table" class="margin-form margin-form-div">
Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/calendar/www/cal-item-new.adp	27 Oct 2014 16:41:08 -0000	1.24
+++ openacs-4/packages/calendar/www/cal-item-new.adp	14 Jul 2015 22:36:43 -0000	1.25
@@ -37,7 +37,7 @@
 </script>
 
   <div id="viewadp-mini-calendar">
-    <include src="mini-calendar" base_url="view" view="@view@" date="@ansi_date@">
+    <include src="mini-calendar" base_url="view" view="@view;literal@" date="@ansi_date;literal@">
     <include src="cal-options">	
   </div>
         
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 -N -r1.39 -r1.40
--- openacs-4/packages/calendar/www/cal-item-view.adp	3 Jul 2015 11:04:09 -0000	1.39
+++ openacs-4/packages/calendar/www/cal-item-view.adp	14 Jul 2015 22:36:43 -0000	1.40
@@ -7,7 +7,7 @@
 
 
 <div id="viewadp-mini-calendar">
-  <include src="mini-calendar" base_url="view" view="day" date="@date@">
+  <include src="mini-calendar" base_url="view" view="day" date="@date;literal@">
   <include src="cal-options">	
 </div>	
 
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/calendar/www/view.adp	27 Oct 2014 16:41:09 -0000	1.37
+++ openacs-4/packages/calendar/www/view.adp	14 Jul 2015 22:36:43 -0000	1.38
@@ -1,14 +1,14 @@
 <master>
 <property name="doc(title)">#calendar.Calendars#</property>
 
-<include src="/packages/calendar/www/navbar" view="@view@" base_url="@ad_conn_url@" date="@date@">
+<include src="/packages/calendar/www/navbar" view="@view;literal@" base_url="@ad_conn_url;literal@" date="@date;literal@">
 
   <div id="viewadp-mini-calendar">
     <if @view@ eq "list">
-      <include src="mini-calendar" base_url="view" view="@view@" date="@date@" period_days="@period_days@">
+      <include src="mini-calendar" base_url="view" view="@view;literal@" date="@date;literal@" period_days="@period_days;literal@">
     </if>
     <else>
-      <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
+      <include src="mini-calendar" base_url="view" view="@view;literal@" date="@date;literal@">
     </else>
     <p>
     <a href="@add_item_url@" title="#calendar.Add_Item#" class="button">#calendar.Add_Item#</a>
@@ -28,40 +28,40 @@
     <if @view@ eq "list">
       <include src="view-list-display"
         portlet_p="0"
-        start_date="@start_date@"
-        return_url="@return_url@"
-        end_date="@end_date@"
-        date="@date@"
-        period_days="@period_days@"
-        sort_by="@sort_by@"
-        show_calendar_name_p="@show_calendar_name_p@"
-        export="@export@"> 
+        start_date="@start_date;literal@"
+        return_url="@return_url;literal@"
+        end_date="@end_date;literal@"
+        date="@date;literal@"
+        period_days="@period_days;literal@"
+        sort_by="@sort_by;literal@"
+        show_calendar_name_p="@show_calendar_name_p;literal@"
+        export="@export;literal@"> 
     </if>
 
     <if @view@ eq "day">
       <include src="view-one-day-display"
-        date="@date@" 
+        date="@date;literal@" 
         start_display_hour="7"
         end_display_hour="22"
-        return_url="@return_url@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
     
     <if @view@ eq "week">
       <include src="view-week-display"
-        date="@date@"
-        return_url="@return_url@"
+        date="@date;literal@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
     
     
     <if @view@ eq "month">
       <include src="view-month-display"
-        date="@date@"
-        return_url="@return_url@"
+        date="@date;literal@"
+        return_url="@return_url;literal@"
         calendar_url=""
-        show_calendar_name_p="@show_calendar_name_p@">
+        show_calendar_name_p="@show_calendar_name_p;literal@">
     </if>
    </div>
Index: openacs-4/packages/calendar/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/permissions.adp	3 Jul 2015 11:04:09 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/permissions.adp	14 Jul 2015 22:36:43 -0000	1.5
@@ -2,4 +2,4 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add">
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" user_add_url="permissions-user-add">
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 -N -r1.32 -r1.33
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	16 Jun 2015 20:47:29 -0000	1.32
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	14 Jul 2015 22:36:42 -0000	1.33
@@ -20,20 +20,20 @@
 <if @config.shaded_p@ false>
 
   <include src="/packages/calendar/www/navbar"
-    date="@date@"
-    period_days="@period_days@"
-    base_url="@ad_conn_url@"
-    page_num="@page_num@"
-    view="@view@">
+    date="@date;literal@"
+    period_days="@period_days;literal@"
+    base_url="@ad_conn_url;literal@"
+    page_num="@page_num;literal@"
+    view="@view;literal@">
 
   <table id="valign-hack" border="0" width="100%">
     <tr>
       <td valign="top" style="width: 200px">
 
 	<include src="/packages/calendar/www/mini-calendar" 
-          view="@view@" 
-          date="@date@" 
-          page_num="@page_num@">
+          view="@view;literal@" 
+          date="@date;literal@" 
+          page_num="@page_num;literal@">
  
        <p>
 		<if @create_p@> 
@@ -51,46 +51,46 @@
  <switch @view@>
    <case value="day">
      <include src="/packages/calendar/www/view-one-day-display" 
-     date="@date@" 
+     date="@date;literal@" 
      start_display_hour=7 
      end_display_hour=22
-     page_num=@page_num@
-     calendar_id_list=@list_of_calendar_ids@ 
-     calendar_url="@calendar_url@"
-     return_url="@return_url;noquote@">
+     page_num="@page_num;literal@"
+     calendar_id_list="@list_of_calendar_ids;literal@" 
+     calendar_url="@calendar_url;literal@"
+     return_url="@return_url;literal@">
    </case>
 
   <case value="list">
      <include src="/packages/calendar/www/view-list-display" 
-     start_date=@start_date@ 
-     end_date=@end_date@ 
-     date=@current_date@ 
-     period_days=@period_days@
-     calendar_id_list=@list_of_calendar_ids@ 
-     page_num=@page_num@
-     calendar_url="@calendar_url@"
-     return_url="@return_url;noquote@">
+     start_date="@start_date;literal@" 
+     end_date="@end_date;literal@" 
+     date="@current_date;literal@" 
+     period_days="@period_days;literal@"
+     calendar_id_list="@list_of_calendar_ids;literal@" 
+     page_num="@page_num;literal@"
+     calendar_url="@calendar_url;literal@"
+     return_url="@return_url;literal@">
   </case>
   
   <case value="week">
      <include src="/packages/calendar/www/view-week-display" 
-     date="@current_date@"
-     calendar_id_list=@list_of_calendar_ids@ 
-     page_num=@page_num@
-     return_url="@return_url;noquote@"
-     calendar_url="@calendar_url@"
-     export=@export@>
+     date="@current_date;literal@"
+     calendar_id_list="@list_of_calendar_ids;literal@" 
+     page_num="@page_num;literal@"
+     return_url="@return_url;literal@"
+     calendar_url="@calendar_url;literal@"
+     export="@export;literal@">
  </case>
 
   <case value="month">
      <include src="/packages/calendar/www/view-month-display"
-     date=@current_date@
-     calendar_id_list=@list_of_calendar_ids@ 
-     page_num=@page_num@
-     show_calendar_name_p="@show_calendar_name_p;noquote@"
-     return_url="@return_url;noquote@"
-     calendar_url="@calendar_url@"
-     export=@export@>
+     date="@current_date;literal@"
+     calendar_id_list="@list_of_calendar_ids;literal@" 
+     page_num="@page_num;literal@"
+     show_calendar_name_p="@show_calendar_name_p;literal@"
+     return_url="@return_url;literal@"
+     calendar_url="@calendar_url;literal@"
+     export="@export;literal@">
   </case>
  </switch>
       </td>
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 -N -r1.11 -r1.12
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	12 Sep 2008 16:13:01 -0000	1.11
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	14 Jul 2015 22:36:42 -0000	1.12
@@ -20,15 +20,15 @@
 
 <if @config.shaded_p@ ne "t">
   <include src="/packages/calendar/www/view-list-display" 
-  start_date=@start_date@ 
-  end_date=@end_date@ 
-  date=@current_date@ 
-  period_days=@period_days@
-  page_num=@page_num@
-  calendar_id_list=@list_of_calendar_ids@ 
-  calendar_url="@calendar_url@"
-  return_url="@return_url@"
-  sort_by=@sort_by@> 
+  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_url="@calendar_url;literal@"
+  return_url="@return_url;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 -N -r1.19 -r1.20
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	12 Sep 2008 16:13:01 -0000	1.19
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	14 Jul 2015 22:36:42 -0000	1.20
@@ -23,45 +23,45 @@
  <switch @view@>
    <case value="day">
      <include src="/packages/calendar/www/view-one-day-display" 
-     return_url="@return_url;noquote@"
-     date="@date@" 
+     return_url="@return_url;literal@"
+     date="@date;literal@" 
      start_display_hour=7 
      end_display_hour=22
-     page_num=@page_num@
-     calendar_url="@calendar_url@"
-     calendar_id_list="@list_of_calendar_ids@">
+     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" 
-      return_url="@return_url;noquote@"
-      start_date=@start_date@ 
-      end_date=@end_date@ 
-      date=@current_date@ 
-      period_days=@period_days@
-      item_template="@item_template;noquote@"
-      calendar_id_list=@list_of_calendar_ids@ 
-      page_num=@page_num@
-      calendar_url="@calendar_url@"
-      sort_by=@sort_by@> 
+      return_url="@return_url;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@" 
+      page_num="@page_num;literal@"
+      calendar_url="@calendar_url;literal@"
+      sort_by="@sort_by;literal@"> 
     </case>
    
     <case value="week">
       <include src="/packages/calendar/www/view-week-display" 
-      return_url="@return_url;noquote@"
-      date="@current_date@"
-      calendar_id_list=@list_of_calendar_ids@ 
-      calendar_url="@calendar_url@"
-      page_num=@page_num@
+      return_url="@return_url;literal@"
+      date="@current_date;literal@"
+      calendar_id_list="@list_of_calendar_ids;literal@" 
+      calendar_url="@calendar_url;literal@"
+      page_num="@page_num;literal@"
     </case>
 
     <case value="month">
       <include src="/packages/calendar/www/view-month-display"
-      return_url="@return_url;noquote@"
-      date=@current_date@
-      calendar_id_list=@list_of_calendar_ids@ 
-      page_num=@page_num@
-      calendar_url="@calendar_url@"
+      return_url="@return_url;literal@"
+      date="@current_date;literal@"
+      calendar_id_list="@list_of_calendar_ids;literal@" 
+      page_num="@page_num;literal@"
+      calendar_url="@calendar_url;literal@"
     </case>
   </switch>
 </if>
Index: openacs-4/packages/categories/lib/list-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/list-categories.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/categories/lib/list-categories.adp	19 Mar 2007 15:20:53 -0000	1.3
+++ openacs-4/packages/categories/lib/list-categories.adp	14 Jul 2015 22:36:42 -0000	1.4
@@ -16,6 +16,6 @@
       </multiple>
     </div>
     <div>
-      <if @cat@ not nil><include src="/packages/categories/lib/contributions" orderby="@orderby@" category="@cat@" root_node_id="@node_id@"></if>
+      <if @cat@ not nil><include src="/packages/categories/lib/contributions" orderby="@orderby;literal@" category="@cat;literal@" root_node_id="@node_id;literal@"></if>
     </div>
   </div>
Index: openacs-4/packages/categories/www/cadmin/trees-code.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/trees-code.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/trees-code.adp	3 Jul 2015 10:33:42 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/trees-code.adp	14 Jul 2015 22:36:42 -0000	1.3
@@ -7,6 +7,6 @@
 <pre style="border: 1px solid #CCC; background-color: #EEE; padding: 10px;">
 set default_locale [lang::system::site_wide_locale]
 <multiple name=trees>
-<include src="/packages/categories/lib/tree-code" tree_id="@trees.tree_id@">
+<include src="/packages/categories/lib/tree-code" tree_id="@trees.tree_id;literal@">
 </multiple>
 </pre>
Index: openacs-4/packages/dotlrn/www/communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/communities.adp	11 Jul 2015 16:45:24 -0000	1.16
+++ openacs-4/packages/dotlrn/www/communities.adp	14 Jul 2015 22:36:42 -0000	1.17
@@ -30,6 +30,6 @@
     </div> <!-- portlet-title -->
   </div>
   <div class="portlet">
-    <include src="/packages/dotlrn/www/dotlrn-main-portlet" show_buttons_p="0" show_archived_p=0 title="Groups" referer="@referer@" community_filter="communities">
+    <include src="/packages/dotlrn/www/dotlrn-main-portlet" show_buttons_p="0" show_archived_p=0 title="Groups" referer="@referer;literal@" community_filter="communities">
    </div> <!-- portlet -->
 </div>
Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/dotlrn/www/control-panel.adp	3 Jul 2015 10:43:55 -0000	1.26
+++ openacs-4/packages/dotlrn/www/control-panel.adp	14 Jul 2015 22:36:42 -0000	1.27
@@ -42,7 +42,7 @@
             </div>
           </if>
 
-          <include src="@user_info_template@" />
+          <include src="@user_info_template;literal@" />
 
           <div style="clear: both;">
             <ul>
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/dotlrn/www/one-community-type.adp	3 Jul 2015 10:43:56 -0000	1.28
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	14 Jul 2015 22:36:42 -0000	1.29
@@ -26,9 +26,9 @@
   @description@
 </p>
 
-  <include src="community-types-chunk" title="@community_type_title@">
+  <include src="community-types-chunk" title="@community_type_title;literal@">
 
 <if @self_registration_p@>
-  <include src="communities-chunk" title="@communities_title@" community_type="@community_type@">
+  <include src="communities-chunk" title="@communities_title;literal@" community_type="@community_type;literal@">
 </if>
 
Index: openacs-4/packages/dotlrn/www/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/user-add.adp	3 Jul 2015 10:43:57 -0000	1.18
+++ openacs-4/packages/dotlrn/www/user-add.adp	14 Jul 2015 22:36:42 -0000	1.19
@@ -47,4 +47,4 @@
 </ol>
 </if>
 
-<include src="/packages/acs-subsite/lib/user-new" next_url="@next_url;noquote@" self_register_p="0"/>
+<include src="/packages/acs-subsite/lib/user-new" next_url="@next_url;literal@" self_register_p="0"/>
Index: openacs-4/packages/dotlrn/www/admin/become.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/become.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/become.adp	13 Jan 2005 13:57:21 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/become.adp	14 Jul 2015 22:36:42 -0000	1.3
@@ -1,3 +1,3 @@
 
-<include src="/packages/acs-admin/lib/become" user_id=@user_id@>
+<include src="/packages/acs-admin/lib/become" user_id="@user_id;literal@">
 
Index: openacs-4/packages/dotlrn/www/admin/classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/admin/classes.adp	3 Jul 2015 10:43:57 -0000	1.15
+++ openacs-4/packages/dotlrn/www/admin/classes.adp	14 Jul 2015 22:36:42 -0000	1.16
@@ -22,7 +22,7 @@
     <property name="doc(title)">@title;literal@</property>
     <property name="context_bar">@context_bar;literal@</property>
    
-    <include src="classes-chunk" page=@page@ keyword=@keyword@ department_key=@department_key@>
+    <include src="classes-chunk" page="@page;literal@" keyword="@keyword;literal@" department_key="@department_key;literal@">
 
 
 
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/department.adp	3 Jul 2015 10:43:57 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/department.adp	14 Jul 2015 22:36:42 -0000	1.17
@@ -55,4 +55,4 @@
 
 <br>
 
-<include src="classes-chunk" page="@page@" department_key="@department_key@">
+<include src="classes-chunk" page="@page;literal@" department_key="@department_key;literal@">
Index: openacs-4/packages/dotlrn/www/admin/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/password-update.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/password-update.adp	3 Jul 2015 10:43:58 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/password-update.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -2,5 +2,5 @@
 <property name="doc(title)">#dotlrn.Update_Password#</property>
 <property name="context_bar">@context_bar;literal@</property>
 
-<include src="/packages/acs-admin/lib/password-update" return_url=@return_url@ user_id=@user_id@ >
+<include src="/packages/acs-admin/lib/password-update" return_url="@return_url;literal@" user_id="@user_id;literal@" >
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	15 May 2007 20:14:25 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	14 Jul 2015 22:36:42 -0000	1.10
@@ -34,7 +34,7 @@
 
 </formtemplate>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
+<include src="users-chunk" type="@type;literal@" &users="users" referer="@referer;literal@">
 
 
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	15 May 2007 20:14:25 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	14 Jul 2015 22:36:42 -0000	1.10
@@ -20,6 +20,6 @@
 
 <p>@control_bar;noquote@</p>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
+<include src="users-chunk" type="@type;literal@" &users="users" referer="@referer;literal@">
 
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	15 May 2007 20:14:25 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	14 Jul 2015 22:36:42 -0000	1.10
@@ -18,4 +18,4 @@
 
 %>
 
-<include src="users-chunk" type=@type@ &users="users" referer=@referer;noquote@>
+<include src="users-chunk" type="@type;literal@" &users="users" referer="@referer;literal@">
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/dotlrn/www/admin/users.adp	3 Jul 2015 10:43:58 -0000	1.33
+++ openacs-4/packages/dotlrn/www/admin/users.adp	14 Jul 2015 22:36:42 -0000	1.34
@@ -46,13 +46,13 @@
 @control_bar;noquote@
 
 <if @n_users@ gt 500>
-  <include src="users-chunk-large" type=@type@ referer="@referer;noquote@">
+  <include src="users-chunk-large" type="@type;literal@" referer="@referer;literal@">
 </if>
 <else>
   <if @n_users@ gt 50>
-    <include src="users-chunk-medium" type=@type@ referer="@referer;noquote@">
+    <include src="users-chunk-medium" type="@type;literal@" referer="@referer;literal@">
   </if>
   <else>
-    <include src="users-chunk-small" type=@type@ referer="@referer;noquote@">
+    <include src="users-chunk-small" type="@type;literal@" referer="@referer;literal@">
   </else>
 </else>
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp	17 Feb 2003 20:56:16 -0000	1.1
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.adp	14 Jul 2015 22:36:42 -0000	1.2
@@ -2,6 +2,6 @@
   <br>
 </if>
 <else>
-  <include src="folder-chunk" admin_actions_p=@admin_actions_p@ show_upload_url_p="@show_upload_url_p@" show_header_p="0"
-           admin_p="@admin_p@" min_level="@min_level@" max_level="@max_level@" list_of_folder_ids="@list_of_folder_ids@" package_id="@package_id@">
+  <include src="folder-chunk" admin_actions_p="@admin_actions_p;literal@" show_upload_url_p="@show_upload_url_p;literal@" show_header_p="0"
+           admin_p="@admin_p;literal@" min_level="@min_level;literal@" max_level="@max_level;literal@" list_of_folder_ids="@list_of_folder_ids;literal@" package_id="@package_id;literal@">
 </else>
Index: openacs-4/packages/dotlrn-homework/www/file-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-copy.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-homework/www/file-copy.adp	3 Jul 2015 10:44:00 -0000	1.3
+++ openacs-4/packages/dotlrn-homework/www/file-copy.adp	14 Jul 2015 22:36:42 -0000	1.4
@@ -7,7 +7,7 @@
 <form method=GET action="file-copy-2">
 <input type=hidden name=file_id value="@file_id@">
 
-<include src="/packages/file-storage/www/folder-list" file_id="@file_id@">
+<include src="/packages/file-storage/www/folder-list" file_id="@file_id;literal@">
 <p>
 <input type=submit value="#dotlrn-homework.Copy#">
 </form>
Index: openacs-4/packages/dotlrn-homework/www/file-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-move.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn-homework/www/file-move.adp	3 Jul 2015 10:44:00 -0000	1.4
+++ openacs-4/packages/dotlrn-homework/www/file-move.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -7,7 +7,7 @@
 <form method=GET action="file-move-2">
 <input type=hidden name=file_id value="@file_id@">
 
-<include src="/packages/file-storage/www/folder-list" file_id="@file_id@" base_url="file-move-2">
+<include src="/packages/file-storage/www/folder-list" file_id="@file_id;literal@" base_url="file-move-2">
 <p>
 <input type=submit value="#dotlrn-homework.Move#">
 </form>
Index: openacs-4/packages/dotlrn-homework/www/folder-contents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-contents.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn-homework/www/folder-contents.adp	3 Jul 2015 10:44:00 -0000	1.4
+++ openacs-4/packages/dotlrn-homework/www/folder-contents.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -3,8 +3,8 @@
   <property name="context_bar">@context_bar;literal@</property>
 
 <table border="0" cellpadding="2" cellspacing="2" width="100%">
-  <include src="folder-chunk" admin_actions_p="@admin_actions_p@" show_upload_url_p="@show_upload_url_p@" show_header_p="1"
-           admin_p="@admin_p@" min_level="@min_level@" max_level="@max_level@" list_of_folder_ids="@list_of_folder_ids@"
-           package_id="@package_id@">
+  <include src="folder-chunk" admin_actions_p="@admin_actions_p;literal@" show_upload_url_p="@show_upload_url_p;literal@" show_header_p="1"
+           admin_p="@admin_p;literal@" min_level="@min_level;literal@" max_level="@max_level;literal@" list_of_folder_ids="@list_of_folder_ids;literal@"
+           package_id="@package_id;literal@">
 </table>
 
Index: openacs-4/packages/evaluation/www/evaluation-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-list.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/evaluation-list.adp	3 Jul 2015 10:47:35 -0000	1.6
+++ openacs-4/packages/evaluation/www/evaluation-list.adp	14 Jul 2015 22:36:41 -0000	1.7
@@ -6,7 +6,7 @@
 <ul>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name@</strong> <br>
-	<include src="/packages/evaluation/lib/evaluations-chunk" grade_id=@grades.grade_id@>
+	<include src="/packages/evaluation/lib/evaluations-chunk" grade_id="@grades.grade_id;literal@">
 	</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/evaluation/www/index.adp	3 Jul 2015 10:47:35 -0000	1.15
+++ openacs-4/packages/evaluation/www/index.adp	14 Jul 2015 22:36:41 -0000	1.16
@@ -18,7 +18,7 @@
     <else>
       <multiple name="grades">
         <h2>@grades.grade_plural_name;noquote@</h2>
-        <include src="/packages/evaluation/lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
+        <include src="/packages/evaluation/lib/tasks-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" assignments_orderby="@assignments_orderby;literal@">
       </multiple>
     </else>
 
@@ -30,7 +30,7 @@
     <else>
       <multiple name="grades">
         <h2>@grades.grade_plural_name;noquote@</h2>
-        <include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
+        <include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" evaluations_orderby="@evaluations_orderby;literal@">
       </multiple>
       <if @admin_p@ eq "0">
         <p>
Index: openacs-4/packages/evaluation/www/task-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-list.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/task-list.adp	3 Jul 2015 10:47:35 -0000	1.6
+++ openacs-4/packages/evaluation/www/task-list.adp	14 Jul 2015 22:36:41 -0000	1.7
@@ -6,7 +6,7 @@
 <ul>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name@</strong> <br>
-	<include src="/packages/evaluation/lib/tasks-chunk" grade_id=@grades.grade_id@>
+	<include src="/packages/evaluation/lib/tasks-chunk" grade_id="@grades.grade_id;literal@">
 	</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/evaluation/www/admin/index.adp	3 Jul 2015 10:47:35 -0000	1.13
+++ openacs-4/packages/evaluation/www/admin/index.adp	14 Jul 2015 22:36:41 -0000	1.14
@@ -18,7 +18,7 @@
 </if><else>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
-	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
+	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" assignments_orderby="@assignments_orderby;literal@">
         <br><br>
 	</li>
 </multiple>
@@ -33,7 +33,7 @@
 </if><else>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
-	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
+	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" evaluations_orderby="@evaluations_orderby;literal@">
         <br><br>
 	</li>
 </multiple>
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	3 Jul 2015 10:47:36 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp	14 Jul 2015 22:36:41 -0000	1.10
@@ -8,7 +8,7 @@
 <ul>
 <multiple name="parties">
  		<li><strong>@parties.party_name@</strong>
-		<include src="/packages/evaluation/lib/audit-chunk" task_item_id=@task_item_id@ task_id=@task_id@ party_id=@parties.party_id@ orderby=@orderby@>
+		<include src="/packages/evaluation/lib/audit-chunk" task_item_id="@task_item_id;literal@" task_id="@task_id;literal@" party_id="@parties.party_id;literal@" orderby="@orderby;literal@">
 		</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp	3 Jul 2015 10:47:36 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp	14 Jul 2015 22:36:41 -0000	1.6
@@ -6,7 +6,7 @@
 
 <p>
 
-<include src="/packages/evaluation/lib/confirm-delete-form" action="evaluation-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to_#">
+<include src="/packages/evaluation/lib/confirm-delete-form" action="evaluation-delete-2" export_vars="@export_vars;literal@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to_#">
 
 </p>
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp	3 Jul 2015 10:47:36 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp	14 Jul 2015 22:36:41 -0000	1.6
@@ -6,4 +6,4 @@
 
 <p>
 
-<include src="/packages/evaluation/lib/confirm-delete-form" action="grades-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__1#">
+<include src="/packages/evaluation/lib/confirm-delete-form" action="grades-delete-2" export_vars="@export_vars;literal@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__1#">
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	3 Jul 2015 10:47:36 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	14 Jul 2015 22:36:41 -0000	1.5
@@ -18,7 +18,7 @@
 <ul>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name@</strong> <br>
-	<include src="/packages/evaluation/lib/student-grades-report-chunk" grade_id=@grades.grade_id@ orderby=@orderby@ student_id=@student_id@>
+	<include src="/packages/evaluation/lib/student-grades-report-chunk" grade_id="@grades.grade_id;literal@" orderby="@orderby;literal@" student_id="@student_id;literal@">
 	</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/admin/groups/group-delete.adp	3 Jul 2015 10:47:36 -0000	1.5
+++ openacs-4/packages/evaluation/www/admin/groups/group-delete.adp	14 Jul 2015 22:36:42 -0000	1.6
@@ -6,6 +6,6 @@
 
 <p>
 
-<include src="/packages/evaluation/lib/confirm-delete-form" action="group-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__2#">
+<include src="/packages/evaluation/lib/confirm-delete-form" action="group-delete-2" export_vars="@export_vars;literal@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__2#">
 
 </p>
Index: openacs-4/packages/evaluation/www/admin/tasks/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/index.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/tasks/index.adp	3 Jul 2015 10:47:37 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/tasks/index.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -34,7 +34,7 @@
 </if><else>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
-	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
+	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" assignments_orderby="@assignments_orderby;literal@">
         <br><br>
 	</li>
 </multiple>
@@ -52,7 +52,7 @@
 	<if @simple_p@ eq 0>
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
 	</if>
-	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
+	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" evaluations_orderby="@evaluations_orderby;literal@">
         <br><br>
 	</li>
 </multiple>
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp	3 Jul 2015 10:47:37 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp	14 Jul 2015 22:36:42 -0000	1.7
@@ -4,6 +4,6 @@
 
 <p>#evaluation.lt_Are_you_sure_you_want_2#</p>
 
-<include src="/packages/evaluation/lib/confirm-delete-form" action="task-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__3#">
+<include src="/packages/evaluation/lib/confirm-delete-form" action="task-delete-2" export_vars="@export_vars;literal@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__3#">
 
 
Index: openacs-4/packages/evaluation/www/view/evaluation-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-list.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/view/evaluation-list.adp	3 Jul 2015 10:47:38 -0000	1.4
+++ openacs-4/packages/evaluation/www/view/evaluation-list.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -5,7 +5,7 @@
 <ul>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name@</strong> <br>
-	<include src="/packages/evaluation/lib/evaluations-chunk" grade_id=@grades.grade_id@>
+	<include src="/packages/evaluation/lib/evaluations-chunk" grade_id="@grades.grade_id;literal@">
 	</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation/www/view/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/index.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/evaluation/www/view/index.adp	3 Jul 2015 10:47:38 -0000	1.5
+++ openacs-4/packages/evaluation/www/view/index.adp	14 Jul 2015 22:36:42 -0000	1.6
@@ -14,7 +14,7 @@
 </if><else>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
-	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ assignments_orderby=@assignments_orderby@>
+	<include src="/packages/evaluation/lib/tasks-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" assignments_orderby="@assignments_orderby;literal@">
         <br><br>
 	</li>
 </multiple>
@@ -41,7 +41,7 @@
 	<if @simple_p@ eq 0>
 	<li><strong>@grades.grade_plural_name;noquote@</strong> <br>
 	</if>
-	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id=@grades.grade_item_id@ grade_id=@grades.grade_id@ evaluations_orderby=@evaluations_orderby@>
+	<include src="/packages/evaluation/lib/evaluations-chunk" grade_item_id="@grades.grade_item_id;literal@" grade_id="@grades.grade_id;literal@" evaluations_orderby="@evaluations_orderby;literal@">
         <br><br>
 	</li>
  </multiple>
Index: openacs-4/packages/evaluation/www/view/task-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-list.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/view/task-list.adp	3 Jul 2015 10:47:38 -0000	1.4
+++ openacs-4/packages/evaluation/www/view/task-list.adp	14 Jul 2015 22:36:42 -0000	1.5
@@ -6,7 +6,7 @@
 <ul>
 <multiple name="grades">
 	<li><strong>@grades.grade_plural_name@</strong> <br>
-	<include src="/packages/evaluation/lib/tasks-chunk" grade_id=@grades.grade_id@>
+	<include src="/packages/evaluation/lib/tasks-chunk" grade_id="@grades.grade_id;literal@">
 	</li>
 </multiple>
 </ul>
Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp	13 Jul 2009 12:55:03 -0000	1.8
+++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp	14 Jul 2015 22:36:41 -0000	1.9
@@ -8,7 +8,7 @@
     <else>
        <multiple name="grades">
         <h2>@grades.grade_plural_name@</h2>
-        <include src="../lib/tasks-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ assignments_orderby=@assignments_orderby@ page_num=@page_num@>
+        <include src="../lib/tasks-chunk" grade_id="@grades.grade_id;literal@" grade_item_id="@grades.grade_item_id;literal@" assignments_orderby="@assignments_orderby;literal@" page_num="@page_num;literal@">
       </multiple>
     </else>
   </if>
Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp	13 Jul 2009 12:57:56 -0000	1.11
+++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp	14 Jul 2015 22:36:41 -0000	1.12
@@ -21,7 +21,7 @@
        <if @simple_p@ eq 0>
         <h2>@grades.grade_plural_name;noquote@</h2>
        </if> 
-       <include src="../lib/evaluations-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ evaluations_orderby=@evaluations_orderby@ page_num=@page_num@>
+       <include src="../lib/evaluations-chunk" grade_id="@grades.grade_id;literal@" grade_item_id="@grades.grade_item_id;literal@" evaluations_orderby="@evaluations_orderby;literal@" page_num="@page_num;literal@">
       </multiple>
 
      <if @admin_p@ eq "0" and @one_instance_p@ eq "1">
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 -N -r1.14 -r1.15
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	15 May 2007 20:14:42 -0000	1.14
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	14 Jul 2015 22:36:41 -0000	1.15
@@ -20,7 +20,7 @@
 
 <if @config.shaded_p@ ne "t">
 
-<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
+<include src="@scope_fs_url;literal@" folder_id="@folder_id;literal@" root_folder_id="@root_folder_id;literal@" viewing_user_id="@user_id;literal@" n_past_days="@n_past_days;literal@" fs_url="@url;literal@">
 <p>@notification_chunk;noquote@</p>
 <if @webdav_url@ not nil>
       <p>#file-storage.Folder_available_via_WebDAV_at#</p>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -N -r1.35 -r1.36
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	9 Nov 2008 23:29:27 -0000	1.35
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	14 Jul 2015 22:36:41 -0000	1.36
@@ -20,12 +20,12 @@
 
 <if @config.shaded_p@ false>
 <if @use_ajaxfs_p@ eq 1>
-<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id@" folder_id="@folder_id@" layoutdiv="fscontainer">
+<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id;literal@" folder_id="@folder_id;literal@" layoutdiv="fscontainer">
 </if>
 
 <div id="fscontainer">
 <if @scoped_p@ eq 1>
-<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ allow_bulk_actions="1" fs_url="@url@" page_num="@page_num@">
+<include src="@scope_fs_url;literal@" folder_id="@folder_id;literal@" root_folder_id="@folder_id;literal@" viewing_user_id="@user_id;literal@" n_past_days="@n_past_days;literal@" allow_bulk_actions="1" fs_url="@url;literal@" page_num="@page_num;literal@">
 </if>
 
 <else>
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/new-portal/www/place-element.adp	17 Jun 2015 07:28:07 -0000	1.47
+++ openacs-4/packages/new-portal/www/place-element.adp	14 Jul 2015 22:36:41 -0000	1.48
@@ -104,11 +104,11 @@
      </form>
    </if>
    <div class="portlet">
-     <include src=place-element-other-page &="element_multi" portal_id=@portal_id@ page_id=@page_id@ action_string=@action_string@ anchor=@page_id@ return_url=@return_url@>
+     <include src=place-element-other-page &="element_multi" portal_id="@portal_id;literal@" page_id="@page_id;literal@" action_string="@action_string;literal@" anchor="@page_id;literal@" return_url="@return_url;literal@">
    </div>
   </multiple>
 </div> <!-- portlet-wrapper -->
 
-<include src="show-here" portal_id=@portal_id@ action_string=@action_string@ region=@region@ page_id=@page_id@ anchor=@page_id@    return_url=@return_url@>
+<include src="show-here" portal_id="@portal_id;literal@" action_string="@action_string;literal@" region="@region;literal@" page_id="@page_id;literal@" anchor="@page_id;literal@"    return_url="@return_url;literal@">
 
 
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.20 -r1.21
--- openacs-4/packages/new-portal/www/template-place-element.adp	17 Jun 2015 07:28:07 -0000	1.20
+++ openacs-4/packages/new-portal/www/template-place-element.adp	14 Jul 2015 22:36:41 -0000	1.21
@@ -89,11 +89,11 @@
 </form>
 
     <include src=place-element-other-page &="element_multi" 
-             target_stub=@target_stub@
-             portal_id=@portal_id@
-             page_id=@element_multi.page_id@
-             return_url=@return_url@
-             action_string=@action_string@>
+             target_stub="@target_stub;literal@"
+             portal_id="@portal_id;literal@"
+             page_id="@element_multi.page_id;literal@"
+             return_url="@return_url;literal@"
+             action_string="@action_string;literal@">
 
 
 </multiple>
Index: openacs-4/packages/new-portal/www/admin/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/new-portal/www/admin/portal-config.adp	17 Jun 2015 07:28:07 -0000	1.13
+++ openacs-4/packages/new-portal/www/admin/portal-config.adp	14 Jul 2015 22:36:41 -0000	1.14
@@ -30,4 +30,4 @@
 
 <a name="custom"><h2></a>#new-portal.Custom_Portlets#</h2>
 <p> #new-portal.lt_-_Note_custom_portlet#</p>
-<include src="/packages/static-portlet/www/static-admin-portlet" package_id="@portal_id@" template_portal_id="@portal_id@" return_url="@return_url@">
+<include src="/packages/static-portlet/www/static-admin-portlet" package_id="@portal_id;literal@" template_portal_id="@portal_id;literal@" return_url="@return_url;literal@">
Index: openacs-4/packages/new-portal/www/layouts/header3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/header3.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/new-portal/www/layouts/header3.adp	17 Jun 2015 07:28:07 -0000	1.5
+++ openacs-4/packages/new-portal/www/layouts/header3.adp	14 Jul 2015 22:36:41 -0000	1.6
@@ -23,24 +23,24 @@
     <tr>
       <td colspan="3" valign="top">
         <list name="element_ids_i1">
-          <include src="@element_src@" element_id="@element_ids_i1@" region="i1"><br>
+          <include src="@element_src;literal@" element_id="@element_ids_i1;literal@" region="i1"><br>
         </list>
       </td>
     </tr>
     <tr>
       <td valign="top" width="33%">
         <list name="element_ids_1">
-          <include src="@element_src@" element_id="@element_ids_1@" region="1"><br>
+          <include src="@element_src;literal@" element_id="@element_ids_1;literal@" region="1"><br>
         </list>
       </td>
       <td valign="top" width="34%">
         <list name="element_ids_2">
-          <include src="@element_src@" element_id="@element_ids_2@" region="2"><br>
+          <include src="@element_src;literal@" element_id="@element_ids_2;literal@" region="2"><br>
         </list>
       </td>
       <td valign="top" width="33%">
         <list name="element_ids_3">
-          <include src="@element_src@" element_id="@element_ids_3@" region="3"><br>
+          <include src="@element_src;literal@" element_id="@element_ids_3;literal@" region="3"><br>
         </list>
       </td>
     </tr>
Index: openacs-4/packages/new-portal/www/layouts/simple1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple1.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/layouts/simple1.adp	17 Jun 2015 07:28:08 -0000	1.7
+++ openacs-4/packages/new-portal/www/layouts/simple1.adp	14 Jul 2015 22:36:41 -0000	1.8
@@ -24,17 +24,17 @@
     <tr>
       <td valign="top" style="width:50%">
         <list name="element_ids_1">
-          <include src="@element_src@" 
-          element_id="@element_ids_1:item@" 
-          action_string=@action_string@ 
-          theme_id=@theme_id@ 
+          <include src="@element_src;literal@" 
+          element_id="@element_ids_1:item;literal@" 
+          action_string="@action_string;literal@" 
+          theme_id="@theme_id;literal@" 
           region="1" 
-          portal_id=@portal_id@ 
-          edit_p=@edit_p@
-          return_url=@return_url@ 
-          hide_links_p=@hide_links_p@
-          page_id=@page_id@ 
-          layout_id=@layout_id@><br>
+          portal_id="@portal_id;literal@" 
+          edit_p="@edit_p;literal@"
+          return_url="@return_url;literal@" 
+          hide_links_p="@hide_links_p;literal@"
+          page_id="@page_id;literal@" 
+          layout_id="@layout_id;literal@"><br>
         </list>
       </td>
     </tr>
Index: openacs-4/packages/new-portal/www/layouts/simple2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple2.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/new-portal/www/layouts/simple2.adp	8 Aug 2006 21:26:59 -0000	1.12
+++ openacs-4/packages/new-portal/www/layouts/simple2.adp	14 Jul 2015 22:36:41 -0000	1.13
@@ -24,33 +24,33 @@
   <tr>
     <td class="leftColumn" valign="top">
       <list name="element_ids_1">
-        <include src="@element_src@"
-                 element_id="@element_ids_1:item@"
-                 action_string="@action_string@"
-                 theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+                 element_id="@element_ids_1:item;literal@"
+                 action_string="@action_string;literal@"
+                 theme_id="@theme_id;literal@"
                  region="1"
-                 portal_id="@portal_id@"
-                 edit_p="@edit_p@"
-                 return_url="@return_url@"
-                 hide_links_p="@hide_links_p@"
-                 page_id="@page_id@"
-                 layout_id="@layout_id@">
+                 portal_id="@portal_id;literal@"
+                 edit_p="@edit_p;literal@"
+                 return_url="@return_url;literal@"
+                 hide_links_p="@hide_links_p;literal@"
+                 page_id="@page_id;literal@"
+                 layout_id="@layout_id;literal@">
         <br>
       </list>
     </td>
     <td class="rightColumn" valign="top">
       <list name="element_ids_2">
-        <include src="@element_src@"
-                 element_id="@element_ids_2:item@"
-                 action_string="@action_string@"
-                 theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+                 element_id="@element_ids_2:item;literal@"
+                 action_string="@action_string;literal@"
+                 theme_id="@theme_id;literal@"
                  region="2"
-                 portal_id="@portal_id@"
-                 edit_p="@edit_p@"
-                 return_url="@return_url@"
-                 hide_links_p="@hide_links_p@"
-                 page_id="@page_id@"
-                 layout_id="@layout_id@">
+                 portal_id="@portal_id;literal@"
+                 edit_p="@edit_p;literal@"
+                 return_url="@return_url;literal@"
+                 hide_links_p="@hide_links_p;literal@"
+                 page_id="@page_id;literal@"
+                 layout_id="@layout_id;literal@">
         <br>
       </list>
     </td>
Index: openacs-4/packages/new-portal/www/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple3.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/new-portal/www/layouts/simple3.adp	9 Nov 2008 23:29:27 -0000	1.5
+++ openacs-4/packages/new-portal/www/layouts/simple3.adp	14 Jul 2015 22:36:41 -0000	1.6
@@ -24,49 +24,49 @@
   <tr>
     <td valign="top" style="width:33%">
       <list name="element_ids_1">
-        <include src="@element_src@"
-                 element_id="@element_ids_1:item@"
-                 action_string="@action_string@"
-                 theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+                 element_id="@element_ids_1:item;literal@"
+                 action_string="@action_string;literal@"
+                 theme_id="@theme_id;literal@"
                  region="1"
-                 portal_id="@portal_id@"
-                 edit_p="@edit_p@"
-                 return_url="@return_url@"
-                 hide_links_p="@hide_links_p@"
-                 page_id="@page_id@"
-                 layout_id="@layout_id@">
+                 portal_id="@portal_id;literal@"
+                 edit_p="@edit_p;literal@"
+                 return_url="@return_url;literal@"
+                 hide_links_p="@hide_links_p;literal@"
+                 page_id="@page_id;literal@"
+                 layout_id="@layout_id;literal@">
         <br>
       </list>
     </td>
     <td valign="top" style="width:33%">
       <list name="element_ids_2">
-        <include src="@element_src@"
-                 element_id="@element_ids_2:item@"
-                 action_string="@action_string@"
-                 theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+                 element_id="@element_ids_2:item;literal@"
+                 action_string="@action_string;literal@"
+                 theme_id="@theme_id;literal@"
                  region="2"
-                 portal_id="@portal_id@"
-                 edit_p="@edit_p@"
-                 return_url="@return_url@"
-                 hide_links_p="@hide_links_p@"
-                 page_id="@page_id@"
-                 layout_id="@layout_id@">
+                 portal_id="@portal_id;literal@"
+                 edit_p="@edit_p;literal@"
+                 return_url="@return_url;literal@"
+                 hide_links_p="@hide_links_p;literal@"
+                 page_id="@page_id;literal@"
+                 layout_id="@layout_id;literal@">
         <br>
       </list>
     </td>
     <td valign="top" style="width:33%">
       <list name="element_ids_3">
-        <include src="@element_src@"
-                 element_id="@element_ids_3:item@"
-                 action_string="@action_string@"
-                 theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+                 element_id="@element_ids_3:item;literal@"
+                 action_string="@action_string;literal@"
+                 theme_id="@theme_id;literal@"
                  region="3"
-                 portal_id="@portal_id@"
-                 edit_p="@edit_p@"
-                 return_url="@return_url@"
-                 hide_links_p="@hide_links_p@"
-                 page_id="@page_id@"
-                 layout_id="@layout_id@">
+                 portal_id="@portal_id;literal@"
+                 edit_p="@edit_p;literal@"
+                 return_url="@return_url;literal@"
+                 hide_links_p="@hide_links_p;literal@"
+                 page_id="@page_id;literal@"
+                 layout_id="@layout_id;literal@">
         <br>
       </list>
     </td>
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.17 -r1.18
--- openacs-4/packages/news-portlet/www/news-portlet.adp	9 Nov 2008 23:29:28 -0000	1.17
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	14 Jul 2015 22:36:41 -0000	1.18
@@ -38,8 +38,8 @@
 
         <multiple name="news_items">
           <include src="summary" 
-            item_id="@news_items.item_id@"
-            url="@news_items.view_url@">
+            item_id="@news_items.item_id;literal@"
+            url="@news_items.view_url;literal@">
         </multiple>
         
       </if>
Index: openacs-4/packages/oacs-dav/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/www/admin/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/oacs-dav/www/admin/index.adp	27 Oct 2014 16:41:52 -0000	1.2
+++ openacs-4/packages/oacs-dav/www/admin/index.adp	14 Jul 2015 22:36:41 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@title;literal@</property>
+  <property name="context">@context;literal@</property>
   
 <listtemplate name="folders"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/my-subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/my-subscrs.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/rss-support/www/my-subscrs.adp	3 Jul 2015 11:04:08 -0000	1.6
+++ openacs-4/packages/rss-support/www/my-subscrs.adp	14 Jul 2015 22:36:41 -0000	1.7
@@ -4,4 +4,4 @@
 
 <small><em>Subscriptions created by you.</em></small>
 
-<include src="subscrs-include" enc_url="@enc_url;noquote@" user_id="@user_id;noquote@" rel_path=".">
\ No newline at end of file
+<include src="subscrs-include" enc_url="@enc_url;literal@" user_id="@user_id;literal@" rel_path=".">
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/admin/subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/admin/subscrs.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/rss-support/www/admin/subscrs.adp	3 Jul 2015 11:04:08 -0000	1.9
+++ openacs-4/packages/rss-support/www/admin/subscrs.adp	14 Jul 2015 22:36:41 -0000	1.10
@@ -2,4 +2,4 @@
 <property name="doc(title)">Report Generation Subscriptions</property>
 <property name="context">@context;literal@</property>
 
-<include src="../subscrs-include" enc_url="@enc_url;noquote@" rel_path="..">
\ No newline at end of file
+<include src="../subscrs-include" enc_url="@enc_url;literal@" rel_path="..">
\ No newline at end of file
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/search/www/search.adp	3 Jul 2015 11:04:08 -0000	1.17
+++ openacs-4/packages/search/www/search.adp	14 Jul 2015 22:36:41 -0000	1.18
@@ -60,7 +60,7 @@
 </else>
 
 <include src="/packages/search/lib/navbar" &="urlencoded_query"
-    paginator_class="list-paginator-bottom" count="@result.count@" &="low" &="high"
+    paginator_class="list-paginator-bottom" count="@result.count;literal@" &="low" &="high"
     &="offset" &="num" &="search_package_id">
 
 <if @count@ gt 0>
Index: openacs-4/packages/theme-zen/lib/layouts/zen1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen1.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/theme-zen/lib/layouts/zen1.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/lib/layouts/zen1.adp	14 Jul 2015 22:36:40 -0000	1.3
@@ -4,19 +4,19 @@
   <div id="main-content">
     <div class="main-content-padding">
       <list name="element_ids_1">
-        <include src="@element_src@" 
-          element_id="@element_ids_1:item@" 
-          element_num="@element_ids_1:rownum@"
+        <include src="@element_src;literal@" 
+          element_id="@element_ids_1:item;literal@" 
+          element_num="@element_ids_1:rownum;literal@"
           element_first_num="0"
-          action_string=@action_string@ 
-          theme_id=@theme_id@ 
+          action_string="@action_string;literal@" 
+          theme_id="@theme_id;literal@" 
           region="1" 
-          portal_id=@portal_id@ 
-          edit_p=@edit_p@
-          return_url=@return_url@ 
-          hide_links_p=@hide_links_p@
-          page_id=@page_id@ 
-          layout_id=@layout_id@>
+          portal_id="@portal_id;literal@" 
+          edit_p="@edit_p;literal@"
+          return_url="@return_url;literal@" 
+          hide_links_p="@hide_links_p;literal@"
+          page_id="@page_id;literal@" 
+          layout_id="@layout_id;literal@">
       </list>
     </div> <!-- /main-content-padding -->
   </div> <!-- /main-content -->
Index: openacs-4/packages/theme-zen/lib/layouts/zen2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen2.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/theme-zen/lib/layouts/zen2.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.adp	14 Jul 2015 22:36:40 -0000	1.3
@@ -3,39 +3,39 @@
   <div id="main-content">
     <div class="main-content-padding">
       <list name="element_ids_2">
-        <include src="@element_src@"
-          element_id="@element_ids_2:item@"
-          element_num="@element_ids_2:rownum@"
-          element_first_num="@element_2_first_num@"
-          action_string="@action_string@"
-          theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+          element_id="@element_ids_2:item;literal@"
+          element_num="@element_ids_2:rownum;literal@"
+          element_first_num="@element_2_first_num;literal@"
+          action_string="@action_string;literal@"
+          theme_id="@theme_id;literal@"
           region="1"
-          portal_id="@portal_id@"
-          edit_p="@edit_p@"
-          return_url="@return_url@"
-          hide_links_p="@hide_links_p@"
-          page_id="@page_id@"
-          layout_id="@layout_id@">
+          portal_id="@portal_id;literal@"
+          edit_p="@edit_p;literal@"
+          return_url="@return_url;literal@"
+          hide_links_p="@hide_links_p;literal@"
+          page_id="@page_id;literal@"
+          layout_id="@layout_id;literal@">
       </list>
     </div> <!-- /main-content-padding -->
   </div> <!-- /main-content -->
 
 <div id="sidebar-1">
   <div class="sidebar-1-padding">
     <list name="element_ids_1">
-      <include src="@element_src@"
-        element_id="@element_ids_1:item@"
-        element_num="@element_ids_1:rownum@"
+      <include src="@element_src;literal@"
+        element_id="@element_ids_1:item;literal@"
+        element_num="@element_ids_1:rownum;literal@"
         element_first_num="0"
-        action_string="@action_string@"
-        theme_id="@theme_id@"
+        action_string="@action_string;literal@"
+        theme_id="@theme_id;literal@"
         region="2"
-        portal_id="@portal_id@"
-        edit_p="@edit_p@"
-        return_url="@return_url@"
-        hide_links_p="@hide_links_p@"
-        page_id="@page_id@"
-        layout_id="@layout_id@">
+        portal_id="@portal_id;literal@"
+        edit_p="@edit_p;literal@"
+        return_url="@return_url;literal@"
+        hide_links_p="@hide_links_p;literal@"
+        page_id="@page_id;literal@"
+        layout_id="@layout_id;literal@">
     </list>
   </div> <!-- /sidebar-1-padding -->
 </div> <!-- /sidebar-1 -->
Index: openacs-4/packages/theme-zen/lib/layouts/zen3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen3.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/theme-zen/lib/layouts/zen3.adp	15 May 2007 20:14:56 -0000	1.2
+++ openacs-4/packages/theme-zen/lib/layouts/zen3.adp	14 Jul 2015 22:36:41 -0000	1.3
@@ -2,39 +2,39 @@
   <div id="main-content">
     <div class="main-content-padding">
       <list name="element_ids_2">
-        <include src="@element_src@"
-          element_id="@element_ids_2:item@"
-          element_num="@element_ids_2:rownum@"
-          element_first_num="@element_2_first_num@"
-          action_string="@action_string@"
-          theme_id="@theme_id@"
+        <include src="@element_src;literal@"
+          element_id="@element_ids_2:item;literal@"
+          element_num="@element_ids_2:rownum;literal@"
+          element_first_num="@element_2_first_num;literal@"
+          action_string="@action_string;literal@"
+          theme_id="@theme_id;literal@"
           region="2"
-          portal_id="@portal_id@"
-          edit_p="@edit_p@"
-          return_url="@return_url@"
-          hide_links_p="@hide_links_p@"
-          page_id="@page_id@"
-          layout_id="@layout_id@">
+          portal_id="@portal_id;literal@"
+          edit_p="@edit_p;literal@"
+          return_url="@return_url;literal@"
+          hide_links_p="@hide_links_p;literal@"
+          page_id="@page_id;literal@"
+          layout_id="@layout_id;literal@">
       </list>
     </div> <!-- /main-content-padding -->
   </div> <!-- /main-content -->
 
 <div id="sidebar-1">
   <div class="sidebar-1-padding">
     <list name="element_ids_1">
-      <include src="@element_src@"
-        element_id="@element_ids_1:item@"
-        element_num="@element_ids_1:rownum@"
+      <include src="@element_src;literal@"
+        element_id="@element_ids_1:item;literal@"
+        element_num="@element_ids_1:rownum;literal@"
         element_first_num="0"
-        action_string="@action_string@"
-        theme_id="@theme_id@"
+        action_string="@action_string;literal@"
+        theme_id="@theme_id;literal@"
         region="1"
-        portal_id="@portal_id@"
-        edit_p="@edit_p@"
-        return_url="@return_url@"
-        hide_links_p="@hide_links_p@"
-        page_id="@page_id@"
-        layout_id="@layout_id@">
+        portal_id="@portal_id;literal@"
+        edit_p="@edit_p;literal@"
+        return_url="@return_url;literal@"
+        hide_links_p="@hide_links_p;literal@"
+        page_id="@page_id;literal@"
+        layout_id="@layout_id;literal@">
     </list>
   </div> <!-- /sidebar-1-padding -->
 </div> <!-- /sidebar-1 -->
@@ -43,19 +43,19 @@
 <div id="sidebar-2">
   <div class="sidebar-2-padding">
     <list name="element_ids_3">
-      <include src="@element_src@"
-        element_id="@element_ids_3:item@"
-        element_num="@element_ids_3:rownum@"
-        element_first_num="@element_3_first_num@"
-        action_string="@action_string@"
-        theme_id="@theme_id@"
+      <include src="@element_src;literal@"
+        element_id="@element_ids_3:item;literal@"
+        element_num="@element_ids_3:rownum;literal@"
+        element_first_num="@element_3_first_num;literal@"
+        action_string="@action_string;literal@"
+        theme_id="@theme_id;literal@"
         region="3"
-        portal_id="@portal_id@"
-        edit_p="@edit_p@"
-        return_url="@return_url@"
-        hide_links_p="@hide_links_p@"
-        page_id="@page_id@"
-        layout_id="@layout_id@">
+        portal_id="@portal_id;literal@"
+        edit_p="@edit_p;literal@"
+        return_url="@return_url;literal@"
+        hide_links_p="@hide_links_p;literal@"
+        page_id="@page_id;literal@"
+        layout_id="@layout_id;literal@">
     </list>
   </div> <!-- /sidebar-2-padding -->
 </div> <!-- /sidebar-2 -->