Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:19 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -9,7 +9,7 @@
         <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
@@ -37,7 +37,7 @@
       </div>
 <div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 6px; margin-top: 6px; padding: 0px;            
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
                       <div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
                       <include src="/packages/xowiki/www/portlets/include" &__including_page=page
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:19 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -10,7 +10,7 @@
         <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:20 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -20,7 +20,7 @@
         <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
@@ -47,16 +47,16 @@
       </div>
       </div>
  
-    <div class="row"> 
+    <div class="row">
 
         <div class="col-md-9 col-sm-8 col-xs-12 col-md-push-3 col-sm-push-4"> <!-- content -->
             @top_includelets;noquote@
             <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
             <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
             <else><h1>@body.title@</h1></else>
-            <if @folderhtml@ not nil> 
-                <div class='folders' style=''>@folderhtml;noquote@</div> 
-                <div class='content-with-folders'>@content;noquote@</div> 
+            <if @folderhtml@ not nil>
+                <div class='folders' style=''>@folderhtml;noquote@</div>
+                <div class='content-with-folders'>@content;noquote@</div>
             </if>
             <else>@content;noquote@</else>
         </div> <!-- content -->
@@ -93,7 +93,7 @@
     </div>
    <div class="row">
         <div class="col-xs-12">
-            <hr>        
+            <hr>
             @footer;noquote@
         </div>
     </div>
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:20 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -15,7 +15,7 @@
         <script language='javascript' src='/resources/acs-templating/mktree.js' async type='text/javascript'></script>
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:20 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -7,7 +7,7 @@
                   <property name="head">
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
 
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:20 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -7,7 +7,7 @@
                   <property name="head">
       </property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
 
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,12 +1,12 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:19 +0100 2019 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">body</property>
                   <property name="&doc">doc</property>
                   <property name="head"></property>
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,6 +1,6 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:05 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:19 +0100 2019 -->
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
       <%
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	14 Feb 2019 16:15:01 -0000	1.5.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	16 Feb 2019 08:47:00 -0000	1.5.2.2
@@ -1,6 +1,6 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 14 15:31:04 +0100 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Feb 16 09:46:19 +0100 2019 -->
 <!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>
 
  @top_includelets;noquote@
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.51 -r1.51.2.1
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Mar 2018 15:40:49 -0000	1.51
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	16 Feb 2019 08:47:00 -0000	1.51.2.1
@@ -1,5 +1,5 @@
 ::xo::library doc {
-  XoWiki - adp generator procs: remove redundancy in adp files by generating it
+  XoWiki - ADP generator procs: remove redundancy in ADP files by generating it
 
   @creation-date 2007-03-13
   @author Gustaf Neumann
@@ -89,7 +89,7 @@
 
     append _ \
         {<!-- The following DIV is needed for overlib to function! -->
-          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
+          <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
           <div class='xowiki-content'>} \n
 
     append _ [:wikicmds_part] \n
@@ -152,7 +152,7 @@
         return [subst -novariables -nobackslashes \
                     {<div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 6px; margin-top: 6px; padding: 0px;            
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
                       <div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
                       <include src="/packages/xowiki/www/portlets/include" &__including_page=page
@@ -283,7 +283,7 @@
 
         }]
       }
-  
+
   # oacs-view3-bootstrap3
   #
   # similar to oacs view3, but based on bootstrap
@@ -311,16 +311,16 @@
         set open_page {-open_page [list @name@]}
         return [subst -novariables -nobackslashes {\
 
-    <div class="row"> 
+    <div class="row">
 
         <div class="col-md-9 col-sm-8 col-xs-12 col-md-push-3 col-sm-push-4"> <!-- content -->
             @top_includelets;noquote@
             <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
             <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
             <else><h1>@body.title@</h1></else>
-            <if @folderhtml@ not nil> 
-                <div class='folders' style=''>@folderhtml;noquote@</div> 
-                <div class='content-with-folders'>@content;noquote@</div> 
+            <if @folderhtml@ not nil>
+                <div class='folders' style=''>@folderhtml;noquote@</div>
+                <div class='content-with-folders'>@content;noquote@</div>
             </if>
             <else>@content;noquote@</else>
         </div> <!-- content -->
@@ -357,15 +357,15 @@
     </div>
    <div class="row">
         <div class="col-xs-12">
-            <hr>        
+            <hr>
             @footer;noquote@
         </div>
     </div>
         }]
       }
 
 
-  
+
   ####################################################################################
   #
   # view-book
@@ -462,7 +462,7 @@
   #
   # view-book-no-ajax
   #
-  # adp identical to view-book.
+  # ADP identical to view-book.
   #
   ADP_Generator create view-book-no-ajax -master 1 -footer 1 -wikicmds 0 \
       -extra_header_stuff {