$title

From dfb1ed795ba2890b710b3faee82db9ccdf888e17 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 31 Aug 2016 19:25:15 +0000 Subject: txt2pre: use public-inbox internal APIs Since this is bundled with the source, we might as well use internal APIs to avoid having duplicate code (and bugs :P) --- Documentation/include.mk | 3 ++- Documentation/txt2pre | 30 ++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Documentation/include.mk b/Documentation/include.mk index 5d730285..51a914b3 100644 --- a/Documentation/include.mk +++ b/Documentation/include.mk @@ -52,7 +52,8 @@ all :: $(mantxt) Documentation/%.txt : Documentation/%.pod $(podtext) $< $@+ && mv $@+ $@ -txt2pre = ./Documentation/txt2pre <$< >$@+ && touch -r $< $@+ && mv $@+ $@ +txt2pre = $(PERL) -I lib ./Documentation/txt2pre <$< >$@+ && \ + touch -r $< $@+ && mv $@+ $@ txt := INSTALL README COPYING TODO dtxt := design_notes.txt design_www.txt dc-dlvr-spam-flow.txt dtxt := $(addprefix Documentation/, $(dtxt)) $(mantxt) diff --git a/Documentation/txt2pre b/Documentation/txt2pre index 2dd1597c..72de0b79 100755 --- a/Documentation/txt2pre +++ b/Documentation/txt2pre @@ -7,28 +7,18 @@ # and requires indentation to output preformatted text. use strict; use warnings; -use Encode qw/encode/; +use PublicInbox::Linkify; +use PublicInbox::Hval qw(ascii_html); + 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; - -$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 , '

'; -- cgit v1.2.3-24-ge0c7