aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-04 07:36:18 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-04 07:36:18 -0700
commit4630cff2a6c116f1d474f459e6e759f5ce7f2003 (patch)
tree5c52982b8f0615fadb69a0a105af9e1e60d51f25 /README
parent81335df9a51740631e75614c1279634f937d650a (diff)
parentcd9a5d90cbf93925db5bb9e9060ef40d05b4bfc8 (diff)
downloadpandoc-4630cff2a6c116f1d474f459e6e759f5ce7f2003.tar.gz
Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
Conflicts: pandoc.cabal
Diffstat (limited to 'README')
-rw-r--r--README13
1 files changed, 8 insertions, 5 deletions
diff --git a/README b/README
index b3cd43eed..9618fabc8 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Pandoc is a [Haskell] library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], [Emacs
-Org-mode], [DocBook], [txt2tags] and [Word docx]; and it can write plain text,
+Org-mode], [DocBook], [txt2tags], [EPUB] and [Word docx]; and it can write plain text,
[markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX] (including
[beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
@@ -56,7 +56,8 @@ pandoc will fetch the content using HTTP:
pandoc -f html -t markdown http://www.fsf.org
If multiple input files are given, `pandoc` will concatenate them all (with
-blank lines between them) before parsing.
+blank lines between them) before parsing. This feature is disabled for
+ binary input formats such as `EPUB` and `docx`.
The format of the input and output can be specified explicitly using
command-line options. The input format can be specified using the
@@ -144,9 +145,10 @@ General options
`markdown_phpextra` (PHP Markdown Extra extended markdown),
`markdown_github` (github extended markdown),
`textile` (Textile), `rst` (reStructuredText), `html` (HTML),
- `docbook` (DocBook), `t2t` (txt2tags), `opml` (OPML), `org` (Emacs
- Org-mode), `mediawiki` (MediaWiki markup), `haddock` (Haddock markup),
- or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
+ `docbook` (DocBook), `t2t` (txt2tags), `docx` (docx), `epub` (EPUB),
+ `opml` (OPML), `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup),
+ `haddock` (Haddock markup), or `latex` (LaTeX). If `+lhs` is appended
+ to `markdown`, `rst`,
`latex`, or `html`, the input will be treated as literate Haskell
source: see [Literate Haskell support](#literate-haskell-support),
below. Markdown syntax extensions can be individually enabled or
@@ -3110,3 +3112,4 @@ Rosenthal.
[RFC5646]: http://tools.ietf.org/html/rfc5646
[InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf
[txt2tags]: http://txt2tags.org/
+[EPUB]: http://idpf.org/epub