@@ -13,9 +13,9 @@ Description
13Pandoc is a [Haskell] library for converting from one markup format to
13Pandoc is a [Haskell] library for converting from one markup format to
14another, and a command-line tool that uses this library. It can read
14another, and a command-line tool that uses this library. It can read
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
16−[LaTeX], [MediaWiki markup], [OPML], and [DocBook]; and it can write
16+[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], and [DocBook]; and
17−plain text, [markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX]
17+it can write plain text, [markdown], [reStructuredText], [XHTML], [HTML 5],
18−(including [beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
18+[LaTeX] (including [beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
19[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
19[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
20[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, [Emacs
20[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, [Emacs
21Org-Mode], [AsciiDoc], and [Slidy], [Slideous], [DZSlides], [reveal.js]
21Org-Mode], [AsciiDoc], and [Slidy], [Slideous], [DZSlides], [reveal.js]
@@ -144,8 +144,9 @@ General options
144 `markdown_github` (github extended markdown),
144 `markdown_github` (github extended markdown),
145 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
145 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
146 `docbook` (DocBook), `opml` (OPML), `mediawiki` (MediaWiki markup),
146 `docbook` (DocBook), `opml` (OPML), `mediawiki` (MediaWiki markup),
147+ `haddock` (Haddock markup), or `latex` (LaTeX).
147− or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
148+ If `+lhs` is appended to `markdown`, `rst`, `latex`, or `html`,
148− `latex`, the input will be treated as literate Haskell source:
149+ the input will be treated as literate Haskell source:
149 see [Literate Haskell support](#literate-haskell-support), below.
150 see [Literate Haskell support](#literate-haskell-support), below.
150 Markdown syntax extensions can be individually enabled or disabled
151 Markdown syntax extensions can be individually enabled or disabled
151 by appending `+EXTENSION` or `-EXTENSION` to the format name.
152 by appending `+EXTENSION` or `-EXTENSION` to the format name.
@@ -2653,6 +2654,7 @@ Sergey Astanin, Arlo O'Keeffe, Denis Laxalde, Brent Yorgey.
2653[ODT]: http://en.wikipedia.org/wiki/OpenDocument
2654[ODT]: http://en.wikipedia.org/wiki/OpenDocument
2654[Textile]: http://redcloth.org/textile
2655[Textile]: http://redcloth.org/textile
2655[MediaWiki markup]: http://www.mediawiki.org/wiki/Help:Formatting
2656[MediaWiki markup]: http://www.mediawiki.org/wiki/Help:Formatting
2657+[Haddock markup]: http://www.haskell.org/haddock/doc/html/ch03s08.html
2656[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
2658[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
2657[Haskell]: http://www.haskell.org/
2659[Haskell]: http://www.haskell.org/
2658[GNU Texinfo]: http://www.gnu.org/software/texinfo/
2660[GNU Texinfo]: http://www.gnu.org/software/texinfo/