Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.82 -r1.83
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	30 Jul 2007 17:16:02 -0000	1.82
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	31 Jul 2007 12:18:38 -0000	1.83
@@ -1617,7 +1617,7 @@
       }
       set menu [list]
       foreach b $menu_buttons {
-	set html [$p include_portlet $b]
+	set html [$p include_portlet [list $b -book_mode true]]
 	if {$html ne ""} {lappend menu $html}
       }
       append output "<h$level class='book'>" \
@@ -1670,6 +1670,7 @@
           {-page_id}
           {-title "#xowiki.edit#"}
           {-alt "edit"}
+          {-book_mode false}
         }}
       }
   
@@ -1681,10 +1682,13 @@
       set template [$page page_template]
       set title "$title [$template title] [$page name]"
     }
+    set return_url [::xo::cc url]
+    if {$book_mode} {
+      append return_url #[toc anchor [$page name]]
+    }
     return [my render_button \
 		-page $page -method edit -package_id $package_id \
-		-title $title -alt $alt \
-		-return_url [::xo::cc url] \
+		-title $title -alt $alt -return_url $return_url \
 		-src /resources/acs-subsite/Edit16.gif]
   }
 
@@ -1695,6 +1699,7 @@
           {-page_id}
           {-title "#xowiki.delete#"}
           {-alt "delete"}
+          {-book_mode false}
         }}
       }
 
@@ -1715,6 +1720,7 @@
         {parameter_declaration {
           {-page_id}
           {-alt "new"}
+          {-book_mode false}
         }}
       }
 
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 -r1.158 -r1.159
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Jul 2007 10:58:06 -0000	1.158
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	31 Jul 2007 12:18:38 -0000	1.159
@@ -210,7 +210,7 @@
   Page array set RE {
     include {([^\\]){{([^<]+?)}}(\s|<|$)?}
     anchor  {([^\\])\\\[\\\[([^\]]+?)\\\]\\\]}
-    div     {()([^\\])&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*<br */?>)?}
+    div     {()([^\\])&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*)?}
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}
     clean2  { <br */?> *(<div)}
   }