X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=Documentation%2Ftxt2pre;h=2f1799fc15e70d42f416a16500a80b5f9d14a457;hb=956ede734d7c2e8d0a3003c6e2d554114586643e;hp=2dd1597c9a24002ee6f23579c0780da2fad2a93c;hpb=3f779258173530ca88f31e1dc5332f951d2c44cd;p=public-inbox.git
diff --git a/Documentation/txt2pre b/Documentation/txt2pre
index 2dd1597c..2f1799fc 100755
--- a/Documentation/txt2pre
+++ b/Documentation/txt2pre
@@ -7,28 +7,19 @@
# and requires indentation to output preformatted text.
use strict;
use warnings;
-use Encode qw/encode/;
-my $str = eval { local $/; <> };
-my %xhtml_map = (
- '"' => '"',
- '&' => '&',
- "'" => ''',
- '<' => '<',
- '>' => '>',
-);
-$str =~ s/([<>&'"])/$xhtml_map{$1}/ge;
-$str = encode('us-ascii', $str, Encode::HTMLCREF);
-my ($title) = ($str =~ /\A([^\n]+)/);
-
-# temporarily swap > for escape so our s!! to add href works.
-# there's probably a way to do this with only a single s!! ...
-$str =~ s!>!\e!g;
-$str =~ s!\b((nntp|ftp|https?)://[\w+\+\&\?\.\%\;/#-]+)!$1!g;
+use PublicInbox::Linkify;
+use PublicInbox::Hval qw(ascii_html);
-$str =~ s!\e!>!g; # swap escapes back to >
+my $str = eval { local $/; <> };
+my $title = $ENV{TITLE};
+($title) = ($str =~ /\A([^\n]+)/) unless $title;
+$title = ascii_html($title);
+my $l = PublicInbox::Linkify->new;
+$str = $l->linkify_1($str);
+$str = ascii_html($str);
+$str = $l->linkify_2($str);
print '',
- '',
+ qq(),
"$title",
- "\n", $str , '
';
+ "", $str , '