* [PATCH 1/3] txt2pre: use public-inbox internal APIs
2016-09-01 18:20 [PATCH 0/3] documentation build changes Eric Wong
@ 2016-09-01 18:20 ` Eric Wong
2016-09-01 18:20 ` [PATCH 2/3] txt2pre: allow overriding title via env Eric Wong
2016-09-01 18:20 ` [PATCH 3/3] doc: set release and section properly for manpages Eric Wong
2 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2016-09-01 18:20 UTC (permalink / raw)
To: meta
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 5d73028..51a914b 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 2dd1597..72de0b7 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+\+\&\?\.\%\;/#-]+)!<a
-href="$1"\n>$1</a>!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 '<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>';
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] doc: set release and section properly for manpages
2016-09-01 18:20 [PATCH 0/3] documentation build changes Eric Wong
2016-09-01 18:20 ` [PATCH 1/3] txt2pre: use public-inbox internal APIs Eric Wong
2016-09-01 18:20 ` [PATCH 2/3] txt2pre: allow overriding title via env Eric Wong
@ 2016-09-01 18:20 ` Eric Wong
2 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2016-09-01 18:20 UTC (permalink / raw)
To: meta
This will be important as we will have more of them.
---
Documentation/include.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/include.mk b/Documentation/include.mk
index 4583f95..9d2c3b0 100644
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -9,6 +9,7 @@ docs += $(shell git ls-files 'Documentation/*.txt')
INSTALL = install
PODMAN = pod2man
PODMAN_OPTS = -v --stderr -d 1993-10-02 -c 'public-inbox user manual'
+PODMAN_OPTS += -r public-inbox.git
podman = $(PODMAN) $(PODMAN_OPTS)
PODTEXT = pod2text
PODTEXT_OPTS = --stderr
@@ -41,8 +42,8 @@ install-man: man
test -z "$(man5)" || $(INSTALL) -m 644 $(man5) $(DESTDIR)$(man5dir)
test -z "$(man7)" || $(INSTALL) -m 644 $(man7) $(DESTDIR)$(man7dir)
-%.1 : Documentation/%.pod
- $(podman) -s 1 $< $@+ && mv $@+ $@
+%.1 %.5 %.7 %.8 : Documentation/%.pod
+ $(podman) -s $(subst .,,$(suffix $@)) $< $@+ && mv $@+ $@
mantxt = $(addprefix Documentation/, $(addsuffix .txt, $(m1)))
docs += $(mantxt)
--
EW
^ permalink raw reply related [flat|nested] 4+ messages in thread