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.472.2.33 -r1.472.2.34 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 2 Feb 2015 12:32:53 -0000 1.472.2.33 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 12 Feb 2015 08:42:34 -0000 1.472.2.34 @@ -281,7 +281,7 @@ Page set recursion_count 0 Page array set RE { - include {{{([^<]+?)}}([&<\s]|$)} + include {{{([^<]+?)}}([^\}])} anchor {\\\[\\\[([^\]]+?)\\\]\\\]} div {>>([^&<]*?)<<([ \n]*)?} clean {[\\](\{\{|>>|\[\[)} @@ -2320,7 +2320,7 @@ {render_adp 0} } PlainPage array set RE { - include {{{(.+?)}}([ \n\r])} + include {{{(.+?)}}([^\}])} anchor {\\\[\\\[([^\]]+?)\\\]\\\]} div {>>([^<]*?)<<} clean {[\\](\{\{|>>|\[\[)}