aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--man/pandoc.1.after3
-rw-r--r--man/pandoc.1.before2
-rw-r--r--man/pandoc.1.template10
-rw-r--r--pandoc.cabal3
5 files changed, 13 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 2214436c5..791f7cdb4 100644
--- a/Makefile
+++ b/Makefile
@@ -98,10 +98,13 @@ pandoc-windows-x86_64.msi:
JOBID=$(shell curl https://ci.appveyor.com/api/projects/jgm/pandoc | jq '.build.jobs[]| select(.name|test("x86_64")) | .jobId') && \
wget "https://ci.appveyor.com/api/buildjobs/$$JOBID/artifacts/windows%2F$@" -O $@
-man/pandoc.1: MANUAL.txt man/pandoc.1.template
- pandoc $< -f markdown-smart -t man -s --template man/pandoc.1.template \
+man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after
+ pandoc $< -f markdown-smart -t man -s \
--lua-filter man/manfilter.lua \
- --variable version="pandoc $(version)" \
+ --include-before-body man/pandoc.1.before \
+ --include-after-body man/pandoc.1.after \
+ --metadata author="" \
+ --variable footer="pandoc $(version)" \
-o $@
doc/lua-filters.md: tools/ldoc.ltp data/pandoc.lua tools/update-lua-docs.lua
diff --git a/man/pandoc.1.after b/man/pandoc.1.after
new file mode 100644
index 000000000..e5eabb670
--- /dev/null
+++ b/man/pandoc.1.after
@@ -0,0 +1,3 @@
+.PP
+The Pandoc source code and all documentation may be downloaded
+from <http://pandoc.org>.
diff --git a/man/pandoc.1.before b/man/pandoc.1.before
new file mode 100644
index 000000000..56d71738c
--- /dev/null
+++ b/man/pandoc.1.before
@@ -0,0 +1,2 @@
+.SH NAME
+pandoc - general markup converter
diff --git a/man/pandoc.1.template b/man/pandoc.1.template
deleted file mode 100644
index 6a1c26a52..000000000
--- a/man/pandoc.1.template
+++ /dev/null
@@ -1,10 +0,0 @@
-$if(has-tables)$
-.\"t
-$endif$
-.TH PANDOC 1 "$date$" "$version$"
-.SH NAME
-pandoc - general markup converter
-$body$
-.PP
-The Pandoc source code and all documentation may be downloaded
-from <http://pandoc.org>.
diff --git a/pandoc.cabal b/pandoc.cabal
index bda4d6363..a95730fa9 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -188,7 +188,8 @@ extra-source-files:
stack.yaml
-- files needed to build man page
man/manfilter.lua
- man/pandoc.1.template
+ man/pandoc.1.before
+ man/pandoc.1.after
-- trypandoc
trypandoc/Makefile
trypandoc/index.html