aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-01-10 22:38:07 -0800
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-01-10 22:39:47 -0800
commitf8db21fa16e8f8e3244f4d3fc85ea1df17aae86f (patch)
tree0c374667b4fd18fc9dadf079a839fb3bdf6f1452 /README
parent23ab5ffcb0b708e4f07cafd7a877926ce0dc532b (diff)
downloadpandoc-f8db21fa16e8f8e3244f4d3fc85ea1df17aae86f.tar.gz
Options: Added phpMarkdownExtraExtensions.
And added markdown_phpextra input/output format.
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 3 insertions, 1 deletions
diff --git a/README b/README
index 2b0da269b..f1d189d37 100644
--- a/README
+++ b/README
@@ -140,6 +140,7 @@ General options
: Specify input format. *FORMAT* can be `native` (native Haskell),
`json` (JSON version of native AST), `markdown` (pandoc's
extended markdown), `markdown_strict` (original unextended markdown),
+ `markdown_phpextra` (PHP Markdown Extra extended markdown),
`textile` (Textile), `rst` (reStructuredText), `html` (HTML),
`docbook` (DocBook XML), `mediawiki` (MediaWiki markup),
or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
@@ -158,7 +159,8 @@ General options
: Specify output format. *FORMAT* can be `native` (native Haskell),
`json` (JSON version of native AST), `plain` (plain text),
`markdown` (pandoc's extended markdown), `markdown_strict` (original
- unextended markdown), `rst` (reStructuredText), `html` (XHTML
+ unextended markdown), `markdown_phpextra` (PHP Markdown extra
+ extended markdown), `rst` (reStructuredText), `html` (XHTML
1), `html5` (HTML 5), `latex` (LaTeX), `beamer` (LaTeX beamer slide show),
`context` (ConTeXt), `man` (groff man), `mediawiki` (MediaWiki markup),
`textile` (Textile), `org` (Emacs Org-Mode), `texinfo` (GNU Texinfo),