Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	26 Apr 2008 16:31:47 -0000	1.32
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	30 Apr 2008 07:29:13 -0000	1.33
@@ -2007,7 +2007,7 @@
         }
         default { 
           set content [$p get_content]
-          set content [string map [list "\{\{" "\\\{\{"] $content]
+          #set content [string map [list "\{\{" "\\\{\{"] $content]
         }
       }
       set menu [list]
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.240 -r1.241
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Apr 2008 16:13:05 -0000	1.240
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Apr 2008 07:29:14 -0000	1.241
@@ -186,12 +186,12 @@
   Page array set RE {
     include {{{([^<]+?)}}([&<\s]|$)}
     anchor  {\\\[\\\[([^\]]+?)\\\]\\\]}
-    div     {&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*)?}
+    div     {&gt;&gt;([^&<]*?)&lt;&lt;([ \n]*)?}
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}
     clean2  { <br */?> *(<div)}
   }
-  Page set markupmap(escape)   [list "\\\[\[" \03\01 "\\\{\{" \03\02  {\\&lt;&lt;} \03\03]
-  Page set markupmap(unescape) [list \03\01 "\[\["    \03\02 "\{\{"   \03\03 {&lt;&lt;}  ]
+  Page set markupmap(escape)   [list "\\\[\[" \03\01 "\\\{\{" \03\02  "\\&gt;&gt;" \03\03]
+  Page set markupmap(unescape) [list \03\01 "\[\["    \03\02 "\{\{"   \03\03 "&gt;&gt;"  ]
 
   #
   # templating and CSS
@@ -1238,12 +1238,12 @@
   PlainPage array set RE {
     include {{{(.+?)}}([ \n\r])}
     anchor  {\\\[\\\[([^\]]+?)\\\]\\\]}
-    div     {()>>([^<]*?)<<}
+    div     {>>([^<]*?)<<}
     clean   {[\\](\{\{|>>|\[\[)}
     clean2  {(--DUMMY NOT USED--)}
   }
-  PlainPage set markupmap(escape)   [list "\\\[\["  \03\01  "\\\{\{"  \03\02   {\<<}  \03\03]
-  PlainPage set markupmap(unescape) [list  \03\01 "\[\["     \03\02 "\{\{"      \03\03 {<<}]
+  PlainPage set markupmap(escape)   [list "\\\[\["  \03\01  "\\\{\{"  \03\02   {\>>}  \03\03]
+  PlainPage set markupmap(unescape) [list  \03\01 "\[\["     \03\02 "\{\{"      \03\03 {>>}]
 
 
   PlainPage instproc get_content {} {