git.iko.soy/typeable/pandoc
on master help sign in
Removed markdown2pdf and all references to it.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1395 788f1e2b-df1e-0410-8736-df70ead52e1b

commit1cbc974e7e0bff62aedb2600660641f19aacbaa6 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 10 Aug 2008, 17:34 (18 years ago) parent0f4bdc6
15 files changed+45−283
compare with master
unifiedsplit
INSTALL+1−2 Makefile+3−3 README+10−35 Setup.hs+1−1 debian/control+9−9 debian/rules+1−1 freebsd/Makefile.in+3−5 freebsd/pkg-descr+2−2 macports/Portfile.in+4−4 man/man1/markdown2pdf.1.md−69 markdown2pdf−140 pandoc.cabal+4−4 web/Makefile+1−1 web/demos+2−2 web/index.txt.in+4−5
INSTALL+1−2
@@ -175,8 +175,7 @@ but are documented here for packagers and developers:
175175 persistence.
176176 - Runs Cabal's "configure" command.
177177* `build-exec`: Builds `pandoc` executable (using Cabal's "build"
178− command) and creates the wrappers `html2markdown` and `markdown2pdf`
179− from templates in `src/wrappers`.
178+ command).
180179* `build-doc`: Builds program documentation (e.g. `README.html`).
181180* `build-lib-doc`: Builds Haddock documentation for Pandoc libraries.
182181* `install-doc`, `uninstall-doc`: Installs/uninstalls user documentation
Makefile+3−3
@@ -24,7 +24,7 @@ EXECSBASE := $(shell sed -ne 's/^[Ee]xecutable:\{0,1\}[[:space:]]*//p' $(CABAL))
2424#-------------------------------------------------------------------------------
2525# Install targets
2626#-------------------------------------------------------------------------------
27−WRAPPERS := html2markdown markdown2pdf hsmarkdown
27+WRAPPERS := html2markdown hsmarkdown
2828# Add .exe extensions if we're running Windows/Cygwin.
2929EXTENSION := $(shell uname | tr '[:upper:]' '[:lower:]' | \
3030 sed -ne 's/^cygwin.*$$/\.exe/p')
@@ -85,8 +85,8 @@ all: build-program
8585 ./$(MAIN) -s -w latex $< >$@ || rm -f $@
8686%.rtf: % $(MAIN)
8787 ./$(MAIN) -s -w rtf $< >$@ || rm -f $@
88−%.pdf: % $(MAIN) markdown2pdf
89− sh ./markdown2pdf $< || rm -f $@
88+%.pdf: % $(MAIN)
89+ ./$(MAIN) -w pdf -o $@ $< || rm -f $@
9090%.txt: %
9191 perl -p -e 's/\n/\r\n/' $< > $@ || rm -f $@ # convert to DOS line endings
9292
README+10−35
@@ -55,9 +55,9 @@ If you want to write to a file, use the `-o` option:
5555
5656 pandoc -o hello.html hello.txt
5757
58−[^1]: The exception is for non-text output formats, such as `odt`.
59− For output in `odt` format, an output file must be specified
60− explicitly.
58+[^1]: The exception is for non-text output formats, such as `odt`
59+ and `pdf`. For output in these formats, an output file must be
60+ specified explicitly.
6161
6262Note that you can specify multiple input files on the command line.
6363`pandoc` will concatenate them all (with blank lines between them)
@@ -148,37 +148,12 @@ then convert the output back to the local encoding.
148148Shell scripts
149149=============
150150
151−Three shell scripts, `markdown2pdf`, `html2markdown`, and
152−`hsmarkdown`, are included in the standard Pandoc installation. (They
153−are not included in the Windows binary package, as they require a POSIX
154−shell, but they may be used in Windows under Cygwin.)
151+Two shell scripts, `html2markdown` and `hsmarkdown`, are included in
152+the standard Pandoc installation. (They are not included in the Windows
153+binary package, as they require a POSIX shell, but they may be used in
154+Windows under Cygwin.)
155155
156−1. `markdown2pdf` produces a PDF file from markdown-formatted
157− text, using `pandoc` and `pdflatex`. The default
158− behavior of `markdown2pdf` is to create a file with the same
159− base name as the first argument and the extension `pdf`; thus,
160− for example,
161−
162− markdown2pdf sample.txt endnotes.txt
163−
164− will produce `sample.pdf`. (If `sample.pdf` exists already,
165− it will be backed up before being overwritten.) An output file
166− name can be specified explicitly using the `-o` option:
167−
168− markdown2pdf -o book.pdf chap1 chap2
169−
170− If no input file is specified, input will be taken from stdin.
171− All of `pandoc`'s options will work with `markdown2pdf` as well.
172−
173− `markdown2pdf` assumes that `pdflatex` is in the path. It also
174− assumes that the following LaTeX packages are available:
175− `unicode`, `fancyhdr` (if you have verbatim text in footnotes),
176− `graphicx` (if you use images), `array` (if you use tables),
177− and `ulem` (if you use strikeout text). If they are not already
178− included in your LaTeX distribution, you can get them from
179− [CTAN].
180−
181−2. `html2markdown` grabs a web page from a file or URL and converts
156+1. `html2markdown` grabs a web page from a file or URL and converts
182157 it to markdown-formatted text, using `tidy` and `pandoc`.
183158
184159 All of `pandoc`'s options will work with `html2markdown` as well.
@@ -207,7 +182,7 @@ shell, but they may be used in Windows under Cygwin.)
207182 It uses [`iconv`] for character encoding conversions; if `iconv`
208183 is absent, it will still work, but it will treat everything as UTF-8.
209184
210−3. `hsmarkdown` is designed to be used as a drop-in replacement for
185+2. `hsmarkdown` is designed to be used as a drop-in replacement for
211186 `Markdown.pl`. It forces `pandoc` to convert from markdown to
212187 HTML, and to use the `--strict` flag for maximal compliance with
213188 official markdown syntax. (All of Pandoc's syntax extensions and
@@ -252,7 +227,7 @@ For further documentation, see the `pandoc(1)` man page.
252227`-o` or `--output` *filename*
253228: sends output to *filename*. If this option is not specified,
254229 or if its argument is `-`, output will be sent to stdout.
255− (Exception: if the output format is `odt`, output to stdout
230+ (Exception: if the output format is `odt` or `pdf`, output to stdout
256231 is disabled.)
257232
258233`-p` or `--preserve-tabs`
Setup.hs+1−1
@@ -50,7 +50,7 @@ makeReferenceODT sources = do
5050
5151-- | Build man pages from markdown sources in man/man1/.
5252makeManPages _ _ _ _ = do
53− mapM makeManPage ["pandoc.1", "hsmarkdown.1", "markdown2pdf.1", "html2markdown.1"]
53+ mapM makeManPage ["pandoc.1", "hsmarkdown.1", "html2markdown.1"]
5454 return ()
5555
5656-- | Build a man page from markdown source in man/man1.
debian/control+9−9
@@ -18,9 +18,9 @@ Description: general markup converter
1818 Pandoc is a Haskell library for converting from one markup format to
1919 another, and a command-line tool that uses this library. It can read
2020 markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it
21− can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, DocBook XML,
22− OpenDocument XML, RTF, GNU Texinfo, MediaWiki markup, groff man pages,
23− and S5 HTML slide shows.
21+ can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, PDF,
22+ DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo, MediaWiki markup,
23+ groff man pages, and S5 HTML slide shows.
2424 .
2525 Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
2626 tables, definition lists, and other features. A compatibility mode is
@@ -44,9 +44,9 @@ Description: general markup converter
4444 Pandoc is a Haskell library for converting from one markup format to
4545 another, and a command-line tool that uses this library. It can read
4646 markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it
47− can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, DocBook XML,
48− OpenDocument XML, RTF, GNU Texinfo, MediaWiki markup, groff man pages,
49− and S5 HTML slide shows.
47+ can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, PDF,
48+ DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo, MediaWiki markup,
49+ groff man pages, and S5 HTML slide shows.
5050 .
5151 Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
5252 tables, definition lists, and other features. A compatibility mode is
@@ -70,9 +70,9 @@ Description: general markup converter
7070 Pandoc is a Haskell library for converting from one markup format to
7171 another, and a command-line tool that uses this library. It can read
7272 markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it
73− can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, DocBook XML,
74− OpenDocument XML, RTF, GNU Texinfo, MediaWiki markup, groff man pages,
75− and S5 HTML slide shows.
73+ can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, PDF,
74+ DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo, MediaWiki markup,
75+ groff man pages, and S5 HTML slide shows.
7676 .
7777 Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
7878 tables, definition lists, and other features. A compatibility mode is
debian/rules+1−1
@@ -111,7 +111,7 @@ binary-arch: build install
111111 dh_installexamples -a
112112 dh_installman -a
113113 dh_link -a
114− dh_strip -a -Xhtml2 -Xmarkdown2 -Xlatex2 -Xrst2
114+ dh_strip -a -Xhtml2
115115 dh_compress -a
116116 dh_fixperms -a
117117 dh_installdeb -a
freebsd/Makefile.in+3−5
@@ -16,16 +16,14 @@ COMMENT= A general markup converter
1616BUILD_DEPENDS= ghc>=6.6:${PORTSDIR}/lang/ghc
1717
1818MANCOMPRESSED= no
19−MAN1= pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1 markdown2odt.1
19+MAN1= pandoc.1 html2markdown.1 hsmarkdown.1
2020
2121USE_GMAKE= yes
2222USE_PERL5= yes
2323
24−PLIST_FILES= bin/pandoc bin/markdown2pdf bin/html2markdown bin/hsmarkdown \
25− bin/markdown2odt
24+PLIST_FILES= bin/pandoc bin/html2markdown bin/hsmarkdown
2625PORTDOCS= BUGS README README.html
27−SCRIPTS= hsmarkdown html2markdown markdown2pdf markdown2odt
28−DATA_FILES= odt-styles/reference.odt
26+SCRIPTS= hsmarkdown html2markdown
2927
3028do-install:
3129 @${INSTALL_PROGRAM} ${WRKSRC}/dist/build/pandoc/pandoc ${PREFIX}/bin
freebsd/pkg-descr+2−2
@@ -1,8 +1,8 @@
11Pandoc is a command-line tool for converting from one markup format
22to another. It can read markdown and (subsets of) reStructuredText,
33HTML, and LaTeX, and it can write markdown, reStructuredText, HTML,
4−LaTeX, ConTeXt, DocBook XML, OpenDocument XML, RTF, GNU Texinfo,
5−MediaWiki markup, groff man pages, and S5 HTML slide shows.
4+LaTeX, ConTeXt, PDF, DocBook XML, OpenDocument XML, ODT, RTF, GNU
5+Texinfo, MediaWiki markup, groff man pages, and S5 HTML slide shows.
66
77Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
88and other features. A compatibility mode is provided for those who
macports/Portfile.in+4−4
@@ -11,7 +11,7 @@ long_description \
1111 Pandoc is a command-line tool for converting from one markup format \
1212 to another. It can read markdown and (subsets of) reStructuredText, \
1313 HTML, and LaTeX, and it can write markdown, reStructuredText, HTML, \
14− LaTeX, ConTeXt, DocBook XML, OpenDocument XML, RTF, Texinfo, \
14+ LaTeX, ConTeXt, PDF, DocBook XML, OpenDocument XML, ODT, RTF, Texinfo, \
1515 MediaWiki markup, groff man, and S5 HTML slide shows.
1616
1717homepage http://johnmacfarlane.net/pandoc/
@@ -40,8 +40,8 @@ destroot {
4040 xinstall -m 755 ${worksrcpath}/unregister.sh \
4141 ${destroot}${prefix}/libexec/${name}-${version}
4242 # install shell scripts:
43− xinstall -m 755 -W ${worksrcpath} html2markdown hsmarkdown markdown2pdf \
44− markdown2odt ${destroot}${prefix}/bin
43+ xinstall -m 755 -W ${worksrcpath} html2markdown hsmarkdown \
44+ ${destroot}${prefix}/bin
4545 # install data file:
4646 xinstall -d ${destroot}${prefix}/share/${name}
4747 xinstall -m 644 -W ${worksrcpath} odt-styles/reference.odt \
@@ -51,7 +51,7 @@ destroot {
5151 xinstall -m 644 -W ${worksrcpath} README README.html COPYRIGHT BUGS \
5252 ${destroot}${prefix}/share/doc/${name}
5353 xinstall -m 644 -W ${worksrcpath}/man/man1 pandoc.1 hsmarkdown.1 \
54− markdown2pdf.1 html2markdown.1 markdown2odt.1 \
54+ html2markdown.1 \
5555 ${destroot}${prefix}/share/man/man1
5656}
5757
man/man1/markdown2pdf.1.mddeleted−69
@@ -1,69 +0,0 @@
1−% MARKDOWN2PDF(1) Pandoc User Manuals
2−% John MacFarlane and Recai Oktas
3−% January 8, 2008
4−
5−# NAME
6−
7−markdown2pdf - converts markdown-formatted text to PDF, using pdflatex
8−
9−# SYNOPSIS
10−
11−markdown2pdf [*options*] [*input-file*]...
12−
13−# DESCRIPTION
14−
15−`markdown2pdf` converts *input-file* (or text from standard
16−input) from markdown-formatted plain text to PDF, using `pdflatex`.
17−If no output filename is specified (using the `-o` option),
18−the name of the output file is derived from the input file; thus, for
19−example, if the input file is *hello.txt*, the output file will be
20−*hello.pdf*. If the input is read from STDIN and no output filename
21−is specified, the output file will be named *stdin.pdf*. If multiple
22−input files are specified, they will be concatenated before conversion,
23−and the name of the output file will be derived from the first input file.
24−
25−Input is assumed to be in the UTF-8 character encoding. If your
26−local character encoding is not UTF-8, you should pipe input
27−through `iconv`:
28−
29− iconv -t utf-8 input.txt | markdown2pdf
30−
31−`markdown2pdf` assumes that the `unicode`, `array`, `fancyvrb`,
32−`graphicx`, and `ulem` packages are in latex's search path. If these
33−packages are not included in your latex setup, they can be obtained from
34−<http://ctan.org>.
35−
36−# OPTIONS
37−
38−`markdown2pdf` is a wrapper around `pandoc`, so all of
39−`pandoc`'s options can be used with `markdown2pdf` as well.
40−See `pandoc`(1) for a complete list.
41−The following options are most relevant:
42−
43−-o *FILE*, \--output=*FILE*
44−: Write output to *FILE*.
45−
46−\--strict
47−: Use strict markdown syntax, with no extensions or variants.
48−
49−-N, \--number-sections
50−: Number section headings in LaTeX output. (Default is not to number them.)
51−
52−-H *FILE*, \--include-in-header=*FILE*
53−: Include (LaTeX) contents of *FILE* at the end of the header. Implies
54− `-s`.
55−
56−-B *FILE*, \--include-before-body=*FILE*
57−: Include (LaTeX) contents of *FILE* at the beginning of the document body.
58−
59−-A *FILE*, \--include-after-body=*FILE*
60−: Include (LaTeX) contents of *FILE* at the end of the document body.
61−
62−-C *FILE*, \--custom-header=*FILE*
63−: Use contents of *FILE*
64− as the LaTeX document header (overriding the default header, which can be
65− printed using `pandoc -D latex`). Implies `-s`.
66−
67−# SEE ALSO
68−
69−`pandoc`(1), `pdflatex`(1)
markdown2pdfdeleted−140
@@ -1,140 +0,0 @@
1−#!/bin/sh -e
2−
3−REQUIRED="pdflatex"
4−SYNOPSIS="converts markdown-formatted text to PDF, using pdflatex."
5−
6−THIS=${0##*/}
7−
8−NEWLINE='
9−'
10−
11−err () { echo "$*" | fold -s -w ${COLUMNS:-110} >&2; }
12−errn () { printf "$*" | fold -s -w ${COLUMNS:-110} >&2; }
13−
14−usage () {
15− err "$1 - $2" # short description
16− err "See the $1(1) man page for usage."
17−}
18−
19−# Portable which(1).
20−pathfind () {
21− oldifs="$IFS"; IFS=':'
22− for _p in $PATH; do
23− if [ -x "$_p/$*" ] && [ -f "$_p/$*" ]; then
24− IFS="$oldifs"
25− return 0
26− fi
27− done
28− IFS="$oldifs"
29− return 1
30−}
31−
32−for p in pandoc $REQUIRED; do
33− pathfind $p || {
34− err "You need '$p' to use this program!"
35− exit 1
36− }
37−done
38−
39−CONF=$(pandoc --dump-args "$@" 2>&1) || {
40− errcode=$?
41− echo "$CONF" | sed -e '/^pandoc \[OPTIONS\] \[FILES\]/,$d' >&2
42− [ $errcode -eq 2 ] && usage "$THIS" "$SYNOPSIS"
43− exit $errcode
44−}
45−
46−OUTPUT=$(echo "$CONF" | sed -ne '1p')
47−ARGS=$(echo "$CONF" | sed -e '1d')
48−
49−
50−# As a security measure refuse to proceed if mktemp is not available.
51−pathfind mktemp || { err "Couldn't find 'mktemp'; aborting."; exit 1; }
52−
53−# Avoid issues with /tmp directory on Windows/Cygwin
54−cygwin=
55−cygwin=$(uname | sed -ne '/^CYGWIN/p')
56−if [ -n "$cygwin" ]; then
57− TMPDIR=.
58− export TMPDIR
59−fi
60−
61−THIS_TEMPDIR=
62−THIS_TEMPDIR="$(mktemp -d -t $THIS.XXXXXXXX)" || exit 1
63−readonly THIS_TEMPDIR
64−
65−trap 'exitcode=$?
66− [ -z "$THIS_TEMPDIR" ] || rm -rf "$THIS_TEMPDIR"
67− exit $exitcode' 0 1 2 3 13 15
68−
69−texname=output
70−logfile=$THIS_TEMPDIR/log
71−
72−pandoc -s -r markdown -w latex "$@" -o $THIS_TEMPDIR/$texname.tex
73−
74−if [ "$OUTPUT" = "-" ]; then
75− firstinfile="$(echo $ARGS | sed -ne '1p')"
76− firstinfilebase="${firstinfile%.*}"
77− destname="${firstinfilebase:-stdin}.pdf"
78−else
79− destname="$OUTPUT"
80−fi
81−
82−(
83− origdir=$(pwd)
84− cd $THIS_TEMPDIR
85− TEXINPUTS=$origdir:$TEXINPUTS:
86− export TEXINPUTS
87− finished=no
88− runs=0
89− while [ $finished = "no" ]; do
90− pdflatex -interaction=batchmode $texname.tex >/dev/null || {
91− errcode=$?
92− err "${THIS}: pdfLaTeX failed with error code $errcode"
93− [ -f $texname.log ] && {
94− err "${THIS}: error context:"
95− sed -ne '/^!/,/^[[:space:]]*$/p' \
96− -ne '/^[Ll]a[Tt]e[Xx] [Ww]arning/,/^[[:space:]]*$/p' \
97− -ne '/^[Ee]rror/,/^[[:space:]]*$/p' $texname.log >&2
98− if grep -q "File \`ucs.sty' not found" $texname.log; then
99− err "${THIS}: Please install the 'unicode' package from CTAN:"
100− err " http://www.ctan.org/tex-archive/macros/latex/contrib/unicode/"
101− fi
102− if grep -q "File \`ulem.sty' not found" $texname.log; then
103− err "${THIS}: Please install the 'ulem' package from CTAN:"
104− err " http://www.ctan.org/tex-archive/macros/latex/contrib/misc/ulem.sty"
105− fi
106− }
107− exit $errcode
108− }
109− if [ $runs -lt 3 ] &&
110− ((grep -q "LaTeX Warning: There were undefined references." $texname.log) ||
111− (echo "$@" | grep -q -- "--toc\|--table-of-contents")); then
112− runs=$(($runs + 1))
113− if grep -q "LaTeX Warning:.*[Cc]itation" $texname.log; then
114− bibtex $texname 2>&1 >bibtex.err
115− if [ $runs -gt 2 ]; then
116− if grep -q "error message" bibtex.err ||
117− grep -q "Warning" bibtex.err; then
118− cat bibtex.err >&2
119− fi
120− fi
121− fi
122− else
123− finished=yes
124− fi
125− done
126−) || exit $?
127−
128−is_target_exists=
129−if [ -f "$destname" ]; then
130− is_target_exists=1
131− mv "$destname" "$destname~"
132−fi
133−
134−mv -f $THIS_TEMPDIR/$texname.pdf "$destname"
135−
136−errn "Created $destname"
137−[ -z "$is_target_exists" ] || {
138− errn " (previous file has been backed up as $destname~)"
139−}
140−err .
pandoc.cabal+4−4
@@ -18,7 +18,7 @@ Description: Pandoc is a Haskell library for converting from one markup
1818 this library. It can read markdown and (subsets of)
1919 reStructuredText, HTML, and LaTeX, and it can write
2020 markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
21− OpenDocument, ODT, RTF, MediaWiki, groff man pages, and
21+ OpenDocument, ODT, PDF, RTF, MediaWiki, groff man pages, and
2222 S5 HTML slide shows.
2323 .
2424 Pandoc extends standard markdown syntax with footnotes,
@@ -38,12 +38,12 @@ Extra-Source-Files:
3838 -- documentation
3939 README, INSTALL, COPYRIGHT, COPYING, changelog,
4040 -- sources for man pages
41− man/man1/pandoc.1.md, man/man1/markdown2pdf.1.md,
41+ man/man1/pandoc.1.md,
4242 man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,
4343 -- Makefile
4444 Makefile,
4545 -- wrappers
46− markdown2pdf, html2markdown, hsmarkdown,
46+ html2markdown, hsmarkdown,
4747 -- data for DefaultHeaders.hs
4848 data/headers/ConTeXt.header,
4949 data/headers/Docbook.header,
@@ -118,7 +118,7 @@ Extra-Source-Files:
118118 tests/Diff.hs,
119119 tests/RunTests.hs
120120Extra-Tmp-Files: man/man1/pandoc.1, man/man1/hsmarkdown.1,
121− man/man1/markdown2pdf.1, man/man1/html2markdown.1
121+ man/man1/html2markdown.1
122122
123123Flag splitBase
124124 Description: Choose the new, smaller, split-up base package.
web/Makefile+1−1
@@ -1,4 +1,4 @@
1−ALL := index.html README.html INSTALL.html examples.html pandoc.1.html markdown2pdf.1.html html2markdown.1.html hsmarkdown.1.html html2x.html
1+ALL := index.html README.html INSTALL.html examples.html pandoc.1.html html2markdown.1.html hsmarkdown.1.html html2x.html
22PANDOC_PATH ?= $(dir $(shell which pandoc))
33MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -H css -A footer.html
44all : $(ALL)
web/demos+2−2
@@ -61,11 +61,11 @@ click on the name of the output file:
6161
626213. From markdown to PDF:
6363
64−@ markdown2pdf @@README@@ -o @@example13.pdf@@
64+@ pandoc @@README@@ -o @@example13.pdf@@
6565
666614. PDF with numbered sections and a custom LaTeX header:
6767
68−@ markdown2pdf -N -C @@myheader.tex@@ @@README@@ -o @@example14.pdf@@
68+@ pandoc -N -C @@myheader.tex@@ @@README@@ -o @@example14.pdf@@
6969
7070[xmlto]: http://cyberelk.net/tim/xmlto/
7171
web/index.txt.in+4−5
@@ -6,8 +6,8 @@ Pandoc is a [Haskell] library for converting from one markup format
66to another, and a command-line tool that uses this library. It can read
77[markdown] and (subsets of) [reStructuredText], [HTML], and [LaTeX],
88and it can write [markdown], [reStructuredText], [HTML], [LaTeX], [ConTeXt],
9−[RTF], [DocBook XML], [OpenDocument XML], [GNU Texinfo], [MediaWiki markup],
10−[groff man] pages, and [S5] HTML slide shows.
9+[PDF], [RTF], [DocBook XML], [OpenDocument XML], [ODT], [GNU Texinfo],
10+[[MediaWiki markup], groff man] pages, and [S5] HTML slide shows.
1111
1212Pandoc features
1313
@@ -36,8 +36,6 @@ Pandoc features
3636- Convenient wrapper scripts:
3737 + `html2markdown` makes it easy to produce a markdown version
3838 of any web page.
39− + `markdown2pdf` converts markdown to PDF in one step.
40− + `markdown2odt` converts markdown to ODT in one step.
4139 + `hsmarkdown` is a drop-in replacement for `Markdown.pl`.
4240- Multi-platform: runs on Windows, MacOS X, Linux, Unix.
4341- Free software, released under the [GPL].
@@ -51,7 +49,6 @@ or [try pandoc on the web](/pandoc/try).
5149- [Demonstrations](examples.html)
5250- Man pages
5351 - [`pandoc(1)`](pandoc.1.html)
54− - [`markdown2pdf(1)`](markdown2pdf.1.html)
5552 - [`html2markdown(1)`](html2markdown.1.html)
5653 - [`hsmarkdown(1)`](hsmarkdown.1.html)
5754- [Library documentation](doc/pandoc/index.html) (for Haskell programmers)
@@ -168,6 +165,8 @@ kind.
168165[LaTeX]: http://www.latex-project.org/
169166[ConTeXt]: http://www.pragma-ade.nl/
170167[RTF]: http://en.wikipedia.org/wiki/Rich_Text_Format
168+[PDF]: http://en.wikipedia.org/wiki/Portable_Document_Format
169+[ODT]: http://en.wikipedia.org/wiki/OpenDocument
171170[DocBook XML]: http://www.docbook.org/
172171[OpenDocument XML]: http://opendocument.xml.org/
173172[MediaWiki markup]: http://www.mediawiki.org/wiki/Help:Formatting