From: <de...@de...> - 2010-07-17 02:15:33
|
Author: PeterThoeny Date: 2010-07-16 21:15:27 -0500 (Fri, 16 Jul 2010) New Revision: 19219 Trac url: http://develop.twiki.org/trac/changeset/19219 Modified: twiki/branches/TWikiRelease05x00/SpreadSheetPlugin/lib/TWiki/Plugins/SpreadSheetPlugin/Calc.pm Log: Item6525: Add $n token to TRANSLATE for newline Modified: twiki/branches/TWikiRelease05x00/SpreadSheetPlugin/lib/TWiki/Plugins/SpreadSheetPlugin/Calc.pm =================================================================== --- twiki/branches/TWikiRelease05x00/SpreadSheetPlugin/lib/TWiki/Plugins/SpreadSheetPlugin/Calc.pm 2010-07-17 02:14:34 UTC (rev 19218) +++ twiki/branches/TWikiRelease05x00/SpreadSheetPlugin/lib/TWiki/Plugins/SpreadSheetPlugin/Calc.pm 2010-07-17 02:15:27 UTC (rev 19219) @@ -684,8 +684,10 @@ my $string = $1; my $from = $2; my $to = $3; - $from =~ s/\$comma/,/g; $from =~ s/\$sp/ /g; $from = quotemeta( $from ); - $to =~ s/\$comma/,/g; $to =~ s/\$sp/ /g; $to = quotemeta( $to ); + $from =~ s/\$comma/,/g; $to =~ s/\$comma/,/g; + $from =~ s/\$sp/ /g; $to =~ s/\$sp/ /g; + $from =~ s/\$n/\n/g; $to =~ s/\$n/\n/g; # the $from is silly, CALC can't be multi-line, yet + $from = quotemeta( $from ); $to = quotemeta( $to ); $from =~ s/([a-zA-Z0-9])\\\-([a-zA-Z0-9])/$1\-$2/g; # fix quotemeta (allow only ranges) $to =~ s/([a-zA-Z0-9])\\\-([a-zA-Z0-9])/$1\-$2/g; $result = $string; |