diff options
Diffstat (limited to 'Documentation/txt2pre')
-rwxr-xr-x | Documentation/txt2pre | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/Documentation/txt2pre b/Documentation/txt2pre index ef6a4f35..2f1799fc 100755 --- a/Documentation/txt2pre +++ b/Documentation/txt2pre @@ -1,28 +1,25 @@ #!/usr/bin/env perl -# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org> -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2014-2016 all contributors <meta@public-inbox.org> +# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> # # Stupid script to make HTML from preformatted, utf-8 text versions, # only generating links for http(s). Markdown does too much # and requires indentation to output preformatted text. use strict; use warnings; -use CGI qw/escapeHTML/; -use Encode qw/encode/; -my $str = eval { local $/; <> }; -$str = escapeHTML($str); -$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+\+\&\?\.\%\;/#-]+)!<a -href="$1"\n>$1</a>!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 '<html><head>', - '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />', + qq(<meta\nhttp-equiv="Content-Type"\ncontent="text/html; charset=utf-8"\n/>), "<title>$title</title>", - "</head><body>\n<pre>", $str , '</pre></body></html>'; + "</head><body><pre>", $str , '</pre></body></html>'; |