@@ -8,7 +8,7 @@ another, and a command-line tool that uses this library. It can read
8and [LaTeX]; and it can write plain text, [markdown], [reStructuredText],
8and [LaTeX]; and it can write plain text, [markdown], [reStructuredText],
9[HTML], [LaTeX], [ConTeXt], [RTF], [DocBook XML], [OpenDocument XML], [ODT],
9[HTML], [LaTeX], [ConTeXt], [RTF], [DocBook XML], [OpenDocument XML], [ODT],
10[GNU Texinfo], [MediaWiki markup], [EPUB], [Textile], [groff man] pages,
10[GNU Texinfo], [MediaWiki markup], [EPUB], [Textile], [groff man] pages,
11−and [Slidy] or [S5] HTML slide shows.
11+[Emacs Org-Mode], and [Slidy] or [S5] HTML slide shows.
13Pandoc's enhanced version of markdown includes syntax for footnotes,
13Pandoc's enhanced version of markdown includes syntax for footnotes,
14tables, flexible ordered lists, definition lists, delimited code blocks,
14tables, flexible ordered lists, definition lists, delimited code blocks,
@@ -76,8 +76,9 @@ Supported output formats include `markdown`, `latex`, `context`
76(reStructuredText), `docbook` (DocBook XML), `opendocument`
76(reStructuredText), `docbook` (DocBook XML), `opendocument`
77(OpenDocument XML), `odt` (OpenOffice text document), `texinfo`, (GNU
77(OpenDocument XML), `odt` (OpenOffice text document), `texinfo`, (GNU
78Texinfo), `mediawiki` (MediaWiki markup), `textile` (Textile),
78Texinfo), `mediawiki` (MediaWiki markup), `textile` (Textile),
79−`epub` (EPUB ebook), `man` (groff man), `slidy` (slidy HTML and
79+`epub` (EPUB ebook), `man` (groff man), `org` (Emacs Org-Mode),
80+`slidy` (slidy HTML and javascript slide show), or `s5`
80−javascript slide show), or `s5` (S5 HTML and javascript slide show).
81+(S5 HTML and javascript slide show).
82Supported input formats include `markdown`, `textile`, `html`,
83Supported input formats include `markdown`, `textile`, `html`,
83`latex`, and `rst`. Note that the `rst` reader only parses a subset of
84`latex`, and `rst`. Note that the `rst` reader only parses a subset of
@@ -170,15 +171,18 @@ For further documentation, see the `pandoc(1)` man page.
170`-f`, `--from`, `-r`, or `--read` *format*
171`-f`, `--from`, `-r`, or `--read` *format*
171: specifies the input format (the format Pandoc will be converting
172: specifies the input format (the format Pandoc will be converting
172 *from*). *format* can be `native`, `markdown`, `textile`, `rst`, `html`,
173 *from*). *format* can be `native`, `markdown`, `textile`, `rst`, `html`,
173− or `latex`. (`+lhs` can be appended to indicate that the input should
174+ or `latex`. (`+lhs` can be appended to `html`, `markdown`, `latex`,
174− be treated as literate Haskell source. See
175+ or `rst` to indicate that the input should be treated as literate Haskell
175− [Literate Haskell support](#literate-haskell-support), below.)
176+ source. See [Literate Haskell support](#literate-haskell-support),
177`-t`, `--to`, `-w`, or `--write` *format*
179`-t`, `--to`, `-w`, or `--write` *format*
178: specifies the output format -- the format Pandoc will
180: specifies the output format -- the format Pandoc will
179 be converting *to*. *format* can be `native`, `html`, `slidy`, `s5`,
181 be converting *to*. *format* can be `native`, `html`, `slidy`, `s5`,
180− `docbook`, `opendocument`, `latex`, `context`, `markdown`, `man`,
182+ `docbook`, `opendocument`, `odt`, `epub`, `latex`, `context`,
183+ `markdown`, `man`, `plain`, `mediawiki`, `texinfo`, `textile`, `org`,
181− `plain`, `rst`, and `rtf`. (`+lhs` can be appended to indicate that
184+ `plain`, `rst`, and `rtf`. (`+lhs` can be appended to `html`,
185+ `markdown`, `rst`, or `latex` to indicate that
182 the output should be treated as literate Haskell source. See
186 the output should be treated as literate Haskell source. See
183 [Literate Haskell support](#literate-haskell-support), below.)
187 [Literate Haskell support](#literate-haskell-support), below.)
@@ -1217,8 +1221,8 @@ you need to enclose text in literal $ characters, backslash-escape
1217them and they won't be treated as math delimiters.
1221them and they won't be treated as math delimiters.
1219TeX math will be printed in all output formats. In Markdown,
1223TeX math will be printed in all output formats. In Markdown,
1220−reStructuredText, LaTeX, and ConTeXt output, it will appear verbatim
1224+reStructuredText, LaTeX, Org-Mode, and ConTeXt output, it will appear
1221−between $ characters.
1225+verbatim between $ characters.
1223In reStructuredText output, it will be rendered using an interpreted
1227In reStructuredText output, it will be rendered using an interpreted
1224text role `:math:`, as described
1228text role `:math:`, as described
@@ -1474,6 +1478,7 @@ and pasted as literate Haskell source.
1474[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
1478[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
1475[Haskell]: http://www.haskell.org/
1479[Haskell]: http://www.haskell.org/
1476[GNU Texinfo]: http://www.gnu.org/software/texinfo/
1480[GNU Texinfo]: http://www.gnu.org/software/texinfo/
1481+[Emacs Org-Mode]: http://org-mode.org
1477[EPUB]: http://www.idpf.org/
1482[EPUB]: http://www.idpf.org/
1478[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"
1483[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"