Imported Upstream version 1.5.0.1

4 files changed, 175 insertions, 172 deletions

diff --git a/man/man1/hsmarkdown.1.md b/man/man1/hsmarkdown.1.md
deleted file mode 100644
index a197ef2ca..000000000
--- a/man/man1/hsmarkdown.1.md
+++ /dev/null
@@ -1,42 +0,0 @@
-% HSMARKDOWN(1) Pandoc User Manuals
-% John MacFarlane
-% January 8, 2008
-
-# NAME
-
-hsmarkdown - convert markdown-formatted text to HTML
-
-# SYNOPSIS
-
-hsmarkdown [*input-file*]...
-
-# DESCRIPTION
-
-`hsmarkdown` converts markdown-formatted text to HTML. It is designed
-to be usable as a drop-in replacement for John Gruber's `Markdown.pl`.
-
-If no *input-file* is specified, input is read from *stdin*.
-Otherwise, the *input-files* are concatenated (with a blank
-line between each) and used as input.  Output goes to *stdout* by
-default.  For output to a file, use shell redirection:
-
-    hsmarkdown input.txt > output.html
-
-`hsmarkdown` uses the UTF-8 character encoding for both input and output.
-If your local character encoding is not UTF-8, you should pipe input
-and output through `iconv`:
-
-    iconv -t utf-8 input.txt | hsmarkdown | iconv -f utf-8
-
-`hsmarkdown` is implemented as a wrapper around `pandoc`(1).  It
-calls `pandoc` with the options `--from markdown --to html
---strict` and disables all other options.  (Command-line options
-will be interpreted as filenames, as they are by `Markdown.pl`.)
-
-# SEE ALSO
-
-`pandoc`(1).  The *README*
-file distributed with Pandoc contains full documentation.
-
-The Pandoc source code and all documentation may be downloaded from
-<http://johnmacfarlane.net/pandoc/>.
diff --git a/man/man1/html2markdown.1.md b/man/man1/html2markdown.1.md
deleted file mode 100644
index 73e3420dd..000000000
--- a/man/man1/html2markdown.1.md
+++ /dev/null
@@ -1,95 +0,0 @@
-% HTML2MARKDOWN(1) Pandoc User Manuals
-% John MacFarlane and Recai Oktas
-% January 8, 2008
-
-# NAME
-
-html2markdown - converts HTML to markdown-formatted text
-
-# SYNOPSIS
-
-html2markdown [*pandoc-options*] [\-- *special-options*] [*input-file* or
-*URL*]
-
-# DESCRIPTION
-
-`html2markdown` converts *input-file* or *URL* (or text
-from *stdin*) from HTML to markdown-formatted plain text.
-If a URL is specified, `html2markdown` uses an available program
-(e.g. wget, w3m, lynx or curl) to fetch its contents.  Output is sent
-to *stdout* unless an output file is specified using the `-o`
-option.
-
-`html2markdown` uses the character encoding specified in the
-"Content-type" meta tag.  If this is not present, or if input comes
-from *stdin*, UTF-8 is assumed.  A character encoding may be specified
-explicitly using the `-e` special option.
-
-# OPTIONS
-
-`html2markdown` is a wrapper for `pandoc`, so all of
-`pandoc`'s options may be used.  See `pandoc`(1) for
-a complete list.  The following options are most relevant:
-
--s, \--standalone
-:   Include title, author, and date information (if present) at the
-    top of markdown output.
-
--o *FILE*, \--output=*FILE*
-:   Write output to *FILE* instead of *stdout*.
-
-\--strict
-:   Use strict markdown syntax, with no extensions or variants.
-
-\--reference-links
-:   Use reference-style links, rather than inline links, in writing markdown
-    or reStructuredText.
-
--R, \--parse-raw
-:   Parse untranslatable HTML codes as raw HTML.
-
-\--no-wrap
-:   Disable text wrapping in output.  (Default is to wrap text.)
-
--H *FILE*, \--include-in-header=*FILE*
-:   Include contents of *FILE* at the end of the header.  Implies
-    `-s`.
-
--B *FILE*, \--include-before-body=*FILE*
-:   Include contents of *FILE* at the beginning of the document body.
-
--A *FILE*, \--include-after-body=*FILE*
-:   Include contents of *FILE* at the end of the document body.
-
--C *FILE*, \--custom-header=*FILE*
-:   Use contents of *FILE*
-    as the document header (overriding the default header, which can be
-    printed using `pandoc -D markdown`).  Implies `-s`.
-
-# SPECIAL OPTIONS
-
-In addition, the following special options may be used.  The special
-options must be separated from the `html2markdown` command and any
-regular `pandoc` options by the delimiter \``--`', as in
-
-    html2markdown -o foo.txt -- -g 'curl -u bar:baz' -e latin1  \
-    www.foo.com
-
--e *encoding*, \--encoding=*encoding* 
-:   Assume the character encoding *encoding* in reading HTML.
-    (Note: *encoding* will be passed to `iconv`; a list of
-    available encodings may be obtained using `iconv -l`.)
-    If this option is not specified and input is not from
-    *stdin*, `html2markdown` will try to extract the character encoding
-    from the "Content-type" meta tag.  If no character encoding is
-    specified in this way, or if input is from *stdin*, UTF-8 will be
-    assumed.
-
--g *command*, \--grabber=*command*
-:   Use *command* to fetch the contents of a URL.  (By default,
-    `html2markdown` searches for an available program or text-based
-    browser to fetch the contents of a URL.)
-
-# SEE ALSO
-
-`pandoc`(1), `iconv`(1)
diff --git a/man/man1/markdown2pdf.1.md b/man/man1/markdown2pdf.1.md
index 0bc8329d7..3947ef8da 100644
--- a/man/man1/markdown2pdf.1.md
+++ b/man/man1/markdown2pdf.1.md
@@ -13,14 +13,15 @@ markdown2pdf [*options*] [*input-file*]...
 # DESCRIPTION
 
 `markdown2pdf` converts *input-file* (or text from standard 
-input) from markdown-formatted plain text to PDF, using `pdflatex`.
-If no output filename is specified (using the `-o` option),
-the name of the output file is derived from the input file; thus, for
-example, if the input file is *hello.txt*, the output file will be
-*hello.pdf*.  If the input is read from STDIN and no output filename
-is specified, the output file will be named *stdin.pdf*.  If multiple
-input files are specified, they will be concatenated before conversion,
-and the name of the output file will be derived from the first input file.
+input) from markdown-formatted plain text to PDF, using `pandoc`
+and `pdflatex`. If no output filename is specified (using the `-o`
+option), the name of the output file is derived from the input file;
+thus, for example, if the input file is *hello.txt*, the output file
+will be *hello.pdf*. If the input is read from STDIN and no output
+filename is specified, the output file will be named *stdin.pdf*. If
+multiple input files are specified, they will be concatenated before
+conversion, and the name of the output file will be derived from the
+first input file.
 
 Input is assumed to be in the UTF-8 character encoding.  If your
 local character encoding is not UTF-8, you should pipe input
@@ -35,20 +36,31 @@ packages are not included in your latex setup, they can be obtained from
 
 # OPTIONS
 
-`markdown2pdf` is a wrapper around `pandoc`, so all of
-`pandoc`'s options can be used with `markdown2pdf` as well.
-See `pandoc`(1) for a complete list.
-The following options are most relevant:
-
 -o *FILE*, \--output=*FILE*
 :   Write output to *FILE*.
 
 \--strict
 :   Use strict markdown syntax, with no extensions or variants.
 
+\--xetex
+:   Use xelatex instead of pdflatex to create the PDF.
+
 -N, \--number-sections
 :   Number section headings in LaTeX output.  (Default is not to number them.)
 
+\--template=*FILE*
+:   Use *FILE* as a custom template for the generated document. Implies
+    `-s`. See the section TEMPLATES in `pandoc`(1) for information about
+    template syntax.  Use `pandoc -D latex` to print the default LaTeX
+    template.
+
+-V KEY=VAL, \--variable=*KEY:VAL*
+:   Set the template variable KEY to the value VAL when rendering the
+    document in standalone mode. This is only useful when the
+    `--template` option is used to specify a custom template, since
+    pandoc automatically sets the variables used in the default
+    templates.
+
 -H *FILE*, \--include-in-header=*FILE*
 :   Include (LaTeX) contents of *FILE* at the end of the header.  Implies
     `-s`.
@@ -60,9 +72,8 @@ The following options are most relevant:
 :   Include (LaTeX) contents of *FILE* at the end of the document body.
 
 -C *FILE*, \--custom-header=*FILE*
-:   Use contents of *FILE*
-    as the LaTeX document header (overriding the default header, which can be
-    printed using `pandoc -D latex`).  Implies `-s`.
+:   Use contents of *FILE* as the document header. *Note: This option is
+    deprecated. Users should transition to using `--template` instead.*
 
 # SEE ALSO
 
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index 3caf104f4..ac6f633e7 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -14,9 +14,9 @@ pandoc [*options*] [*input-file*]...
 
 Pandoc converts files from one markup format to another. It can
 read markdown and (subsets of) reStructuredText, HTML, and LaTeX, and
-it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Texinfo,
-groff man, MediaWiki markup, RTF, OpenDocument XML, ODT, DocBook XML,
-and S5 HTML slide shows.
+it can write plain text, markdown, reStructuredText, HTML, LaTeX,
+ConTeXt, Texinfo, groff man, MediaWiki markup, RTF, OpenDocument XML,
+ODT, DocBook XML, and S5 HTML slide shows.
 
 If no *input-file* is specified, input is read from *stdin*.
 Otherwise, the *input-files* are concatenated (with a blank
@@ -26,6 +26,11 @@ format).  For output to a file, use the `-o` option:
 
     pandoc -o output.html input.txt
 
+Instead of a file, an absolute URI may be given.  In this case
+pandoc will fetch the content using HTTP:
+
+    pandoc -f html -t markdown http://www.fsf.org
+
 The input and output formats may be specified using command-line options
 (see **OPTIONS**, below, for details).  If these formats are not
 specified explicitly, Pandoc will attempt to determine them
@@ -48,16 +53,13 @@ markdown: the differences are described in the *README* file in
 the user documentation.  If standard markdown syntax is desired, the
 `--strict` option may be used.
 
-Pandoc uses the UTF-8 character encoding for both input and output.
-If your local character encoding is not UTF-8, you should pipe input
-and output through `iconv`:
+Pandoc uses the UTF-8 character encoding for both input and output
+(unless compiled with GHC 6.12 or higher, in which case it uses
+the local encoding). If your local character encoding is not UTF-8, you
+should pipe input and output through `iconv`:
 
     iconv -t utf-8 input.txt | pandoc | iconv -f utf-8
 
-Pandoc's HTML parser is not very forgiving.  If your input is
-HTML, consider running it through `tidy`(1) before passing it
-to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
-
 # OPTIONS
 
 -f *FORMAT*, -r *FORMAT*, \--from=*FORMAT*, \--read=*FORMAT*
@@ -69,7 +71,7 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
 
 -t *FORMAT*, -w *FORMAT*, \--to=*FORMAT*, \--write=*FORMAT*
 :   Specify output format.  *FORMAT* can be `native` (native Haskell),
-    `markdown` (markdown or plain text), `rst` (reStructuredText),
+    `plain` (plain text), `markdown` (markdown), `rst` (reStructuredText),
     `html` (HTML), `latex` (LaTeX), `context` (ConTeXt), `man` (groff man), 
     `mediawiki` (MediaWiki markup), `texinfo` (GNU Texinfo),
     `docbook` (DocBook XML), `opendocument` (OpenDocument XML),
@@ -116,6 +118,10 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
     provide a *URL*. If no *URL* is provided, the contents of the
     script will be inserted directly into the HTML header.
 
+\--mathml
+:   Convert TeX math to MathML.  In standalone mode, a small javascript
+    will be inserted that allows the MathML to be viewed on some browsers.
+
 \--jsmath=*URL*
 :   Use jsMath to display embedded TeX math in HTML output.
     The *URL* should point to the jsMath load script; if provided,
@@ -133,6 +139,9 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
 -i, \--incremental
 :   Make list items in S5 display incrementally (one by one).
 
+\--xetex
+:   Create LaTeX outut suitable for processing by XeTeX.
+
 -N, \--number-sections
 :   Number section headings in LaTeX, ConTeXt, or HTML output.
     (Default is not to number them.)
@@ -169,6 +178,22 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
     RTF) or an instruction to create one (LaTeX, reStructuredText).
     This option has no effect on man, DocBook, or S5 output.
 
+\--base-header-level=*LEVEL*
+:   Specify the base level for headers (defaults to 1).
+
+\--template=*FILE*
+:   Use *FILE* as a custom template for the generated document. Implies
+    `-s`. See TEMPLATES below for a description of template syntax. If
+    this option is not used, a default template appropriate for the
+    output format will be used. See also `-D/--print-default-template`.
+
+-V KEY=VAL, \--variable=*KEY:VAL*
+:   Set the template variable KEY to the value VAL when rendering the
+    document in standalone mode. This is only useful when the
+    `--template` option is used to specify a custom template, since
+    pandoc automatically sets the variables used in the default
+    templates.
+
 -c *CSS*, \--css=*CSS*
 :   Link to a CSS style sheet.  *CSS* is the pathname of the style sheet.
 
@@ -177,23 +202,47 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
 
 -B *FILE*, \--include-before-body=*FILE*
 :   Include contents of *FILE* at the beginning of the document body.
+    Implies `-s`.
 
 -A *FILE*, \--include-after-body=*FILE*
 :   Include contents of *FILE* at the end of the document body.
-
--C *FILE*, \--custom-header=*FILE*
-:   Use contents of *FILE* as the document header (overriding the
-    default header, which can be printed by using the `-D` option).
     Implies `-s`.
 
--D *FORMAT*, \--print-default-header=*FORMAT*
-:   Print the default header for *FORMAT* (`html`, `s5`, `latex`,
-    `context`, `docbook`, `man`, `markdown`, `opendocument`,
-    `rst`, `rtf`).
+-C *FILE*, \--custom-header=*FILE*
+:   Use contents of *FILE* as the document header. *Note: This option is
+    deprecated. Users should transition to using `--template` instead.*
+
+\--reference-odt=*filename*
+:   Use the specified file as a style reference in producing an ODT.
+    For best results, the reference ODT should be a modified version
+    of an ODT produced using pandoc.  The contents of the reference ODT
+    are ignored, but its stylesheets are used in the new ODT. If no
+    reference ODT is specified on the command line, pandoc will look
+    for a file `reference.odt` in the user data directory (see
+    `--data-dir`). If this is not found either, sensible defaults will be
+    used.
+
+-D *FORMAT*, \--print-default-template=*FORMAT*
+:   Print the default template for an output *FORMAT*. (See `-t`
+    for a list of possible *FORMAT*s.)
 
 -T *STRING*, \--title-prefix=*STRING*
 :   Specify *STRING* as a prefix to the HTML window title.
 
+\--data-dir*=DIRECTORY*
+:   Specify the user data directory to search for pandoc data files.
+    If this option is not specified, the default user data directory
+    will be used:
+
+        $HOME/.pandoc
+
+    in unix and
+
+        C:\Documents And Settings\USERNAME\Application Data\pandoc
+
+    in Windows. A reference ODT, `templates` directory, `s5` directory
+    placed in this directory will override pandoc's normal defaults.
+
 \--dump-args
 :   Print information about command-line arguments to *stdout*, then exit.
     The first line of output contains the name of the output file specified
@@ -220,6 +269,86 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
 -h, \--help
 :   Show usage message.
 
+# TEMPLATES
+
+When the `-s/--standalone` option is used, pandoc uses a template to
+add header and footer material that is needed for a self-standing
+document.  To see the default template that is used, just type
+
+    pandoc --print-default-template=FORMAT
+
+where `FORMAT` is the name of the output format. A custom template
+can be specified using the `--template` option.  You can also override
+the system default templates for a given output format `FORMAT`
+by putting a file `templates/FORMAT.template` in the user data
+directory (see `--data-dir`, below).
+
+Templates may contain *variables*.  Variable names are sequences of
+alphanumerics, `-`, and `_`, starting with a letter.  A variable name
+surrounded by `$` signs will be replaced by its value.  For example,
+the string `$title$` in
+
+    <title>$title$</title>
+
+will be replaced by the document title.
+
+To write a literal `$` in a template, use `$$`.
+
+Some variables are set automatically by pandoc.  These vary somewhat
+depending on the output format, but include:
+
+`legacy-header`
+:   contents specified by `-C/--custom-header`
+`header-includes`
+:   contents specified by `-H/--include-in-header` (may have multiple
+    values)
+`toc`
+:   non-null value if `--toc/--table-of-contents` was specified
+`include-before`
+:   contents specified by `-B/--include-before-body` (may have
+    multiple values)
+`include-after`
+:   contents specified by `-A/--include-after-body` (may have
+    multiple values)
+`body`
+:   body of document
+`title`
+:   title of document, as specified in title block
+`author`
+:   author of document, as specified in title block (may have
+    multiple values)
+`date`
+:   date of document, as specified in title block
+
+Variables may be set at the command line using the `-V/--variable`
+option. This allows users to include custom variables in their
+templates.
+
+Templates may contain conditionals.  The syntax is as follows:
+
+    $if(variable)$
+    X 
+    $else$
+    Y
+    $endif$
+
+This will include `X` in the template if `variable` has a non-null
+value; otherwise it will include `Y`. `X` and `Y` are placeholders for
+any valid template text, and may include interpolated variables or other
+conditionals. The `$else$` section may be omitted.
+
+When variables can have multiple values (for example, `author` in
+a multi-author document), you can use the `$for$` keyword:
+
+    $for(author)$
+    <meta name="author" content="$author$" />
+    $endfor$
+
+You can optionally specify a separator to be used between
+consecutive items:
+
+    $for(author)$$author$$sep$, $endfor$
+
 # SEE ALSO
 
 `hsmarkdown`(1),