Index: openacs-4/packages/wiki/tcl/wikit-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/tcl/wikit-procs.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/wiki/tcl/wikit-procs.tcl 11 Aug 2005 15:04:21 -0000 1.2.2.1 +++ openacs-4/packages/wiki/tcl/wikit-procs.tcl 4 Oct 2005 15:26:22 -0000 1.2.2.2 @@ -111,15 +111,6 @@ foreach line [split $text \n] { # Per line, classify the it and extract the main textual information. foreach {tag depth txt aux} [linetype $line] break ; # lassign -ns_log debug " -DB -------------------------------------------------------------------------------- -DB DAVE debugging /var/lib/aolserver/openacs-5-2/packages/wiki/tcl/wikit-procs.tcl -DB -------------------------------------------------------------------------------- -DB tag = '${tag}' -DB depth = '${depth}' -DB txt = '${txt}' -DB aux = '${aux}' -DB --------------------------------------------------------------------------------" # Classification tags # # UL, OL, DL = Lists (unordered/bullet, ordered/enum, @@ -736,6 +727,9 @@ regsub -all {<} $q {\<} q regsub -all {>} $q {\>} q regsub -all {&(#\d+;)} $q {\&\1} q + # allow
and
+ regsub -all {\<br\>} $q {
} q + regsub -all {\<br /\>} $q {
} q return $q } @@ -825,6 +819,10 @@ vs D B

vs D C

vs D E

+ vs U A

+ vs U B

+ vs U C

+ vs U E