Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 30 Jul 2002 22:06:21 -0000 1.6 +++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 4 Sep 2002 13:32:17 -0000 1.7 @@ -61,9 +61,6 @@ # Convert every two spaces to an nbsp regsub -all { } $text "\\\ " text - # Convert every tab to 4 nbsp's - regsub -all {\t} $text {\ \ \ \ } text - # turn CRLFCRLF into
if { [regsub -all {\r\n\s*\r\n} $text "
" text] == 0 } { # try LFLF @@ -75,13 +72,16 @@ if { !$no_links_p } { # Dress the links and emails with A HREF - regsub -all {([]!?.:;,<>\(\)\}-]+)(eNdUrL\t)} $text {\2\1} text - regsub -all {([]!?.:;,<>\(\)\}-]+)(eNdEmAiL\t)} $text {\2\1} text + regsub -all {([]!?.:;,<>\(\)\}"'-]+)(eNdUrL\t)} $text {\2\1} text + regsub -all {([]!?.:;,<>\(\)\}"'-]+)(eNdEmAiL\t)} $text {\2\1} text regsub -all {\tsTaRtUrL([^\t]*)eNdUrL\t} $text {\1} text regsub -all {\tsTaRtEmAiL([^\t]*)eNdEmAiL\t} $text {\1} text set text [string trimleft $text] } + # Convert every tab to 4 nbsp's + regsub -all {\t} $text {\ \ \ \ } text + return $text }