Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.444 -r1.445
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Oct 2011 02:56:00 -0000	1.444
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Oct 2011 03:22:28 -0000	1.445
@@ -2236,13 +2236,15 @@
 
     # Ugly hack to fight against a problem with tDom: asHTML strips
     # spaces between a </span> and the following <span>"
-    regsub -all "/span>      <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
-    regsub -all "/span>     <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
-    regsub -all "/span>    <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
-    regsub -all "/span>   <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;<span" data
-    regsub -all "/span>  <span" $data "/span>\\&nbsp;\\&nbsp;<span" data
-    regsub -all "/span> <span" $data "/span>\\&nbsp;<span" data
+    #regsub -all "/span>      <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
+    #regsub -all "/span>     <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
+    #regsub -all "/span>    <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;\\&nbsp;<span" data
+    #regsub -all "/span>   <span" $data "/span>\\&nbsp;\\&nbsp;\\&nbsp;<span" data
+    #regsub -all "/span>  <span" $data "/span>\\&nbsp;\\&nbsp;<span" data
 
+    regsub -all "/span> " $data "/span>\\&nbsp;" data
+    regsub -all " <span " $data "\\&nbsp;<span " data
+
     dom parse -html $data doc 
     $doc documentElement root 
 
@@ -2259,7 +2261,8 @@
     }
 
     #
-    # 
+    # In case, the switch is activated, and we have a menubar, add the
+    # top level section
     #
     if {$add_sections_to_folder_tree && [info command ::__xowiki__MenuBar] ne ""} {
       $owner set book_mode 1