On Mon, Nov 30, 2009 at 05:23:41PM +0000, Roger Burton West wrote:
>Diff to fix appears to be this.
Further diff for the HTML output filter:
--- /usr/share/perl5/sdf/tohtml.pl.old 1999-05-24 09:44:27.000000000 +0100
+++ /usr/share/perl5/sdf/tohtml.pl 2009-12-03 12:09:59.000000000 +0000
@@ -840,18 +840,11 @@
# local($result);
local($old_match_flag);
- # Enable multi-line matching
- $old_match_flag = $*;
- $* = 1;
-
# Escape the symbols
- $text =~ s/\&/&/g;
- $text =~ s/\</</g;
- $text =~ s/\>/>/g;
- $text =~ s/\"/"/g;
-
- # Reset multi-line matching flag
- $* = $old_match_flag;
+ $text =~ s/\&/&/gm;
+ $text =~ s/\</</gm;
+ $text =~ s/\>/>/gm;
+ $text =~ s/\"/"/gm;
# Return result
$text;
@@ -980,10 +973,6 @@
local($user_ext);
local($old_match_flag);
- # Enable multi-line matching
- $old_match_flag = $*;
- $* = 1;
-
# For hypertext jumps, surround the text. If the
# text contains a jump, the existing jump is removed.
if ($attr{'jump'} ne '') {
@@ -994,11 +983,11 @@
$value = $attr{'jump'};
$user_ext = $SDF_USER'var{'HTML_EXT'};
if ($user_ext) {
- $value =~ s/\.html/.$user_ext/;
+ $value =~ s/\.html/.$user_ext/m;
}
$value = &_HtmlEscape($value);
- $text =~ s/\<A HREF\=[^>]+\>(.*)\<\/A\>/$1/;
+ $text =~ s/\<A HREF\=[^>]+\>(.*)\<\/A\>/$1/m;
$text = "<A HREF=\"$value\">$text</A>";
delete $attr{'jump'};
$result++;
@@ -1009,7 +998,7 @@
# jump and id definitions don't clash.
if ($attr{'id'} ne '') {
$value = &_HtmlEscape($attr{'id'});
- if ($text =~ /\<A /) {
+ if ($text =~ /\<A /m) {
$text = "<A NAME=\"$value\"> </A>$text";
}
else {
@@ -1019,9 +1008,6 @@
$result++;
}
- # Reset multi-line matching flag
- $* = $old_match_flag;
-
# Return result
return $result;
}
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
