$title

X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=Documentation%2Ftxt2pre;h=cb6a76138131a8d0abd3593d013860d523b1f1fa;hb=7c5ac90b309bbe76468055e8a9289664ef2dfe37;hp=acc6ca94bb484a42ee57f5d43aaead53f81d8600;hpb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;p=public-inbox.git diff --git a/Documentation/txt2pre b/Documentation/txt2pre index acc6ca94..cb6a7613 100755 --- a/Documentation/txt2pre +++ b/Documentation/txt2pre @@ -1,26 +1,31 @@ #!/usr/bin/env perl -# Copyright (C) 2014-2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2014-2019 all contributors +# License: AGPL-3.0+ # # 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/; +use PublicInbox::Linkify; +use PublicInbox::Hval qw(ascii_html); + 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((ftp|https?)://[\w+\+\&\?\.\%\;/#-]+)!$1!g; -$str =~ s!\e!>!g; # swap escapes back to > +$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 , '

'; +STDOUT->flush; + +# keep mtime on website consistent so clients can cache +if (-f STDIN && -f STDOUT) { + my @st = stat(STDIN); + utime($st[8], $st[9], \*STDOUT); +}