diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-07-23 15:54:18 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-07-23 15:54:18 -0700 |
| commit | 2b68f7af15f7503083d07265355363e36cfaf4bb (patch) | |
| tree | ab4cb15076073f17573bea0f46278a903aebf649 | |
| parent | f06809355527394f3c32c0e46e6f9cb48786b668 (diff) | |
| download | pandoc-2b68f7af15f7503083d07265355363e36cfaf4bb.tar.gz | |
Updated README and cabal description for ODT reader.
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | pandoc.cabal | 7 |
2 files changed, 8 insertions, 7 deletions
@@ -15,7 +15,7 @@ another, and a command-line tool that uses this library. It can read [Markdown], [CommonMark], and (subsets of) [Textile], [reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup], [Haddock markup], [OPML], [Emacs Org-mode], [DocBook], -[txt2tags], [EPUB] and [Word docx]; and it can write plain text, +[txt2tags], [EPUB], [ODT] 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], @@ -68,7 +68,7 @@ pandoc will fetch the content using HTTP: If multiple input files are given, `pandoc` will concatenate them all (with blank lines between them) before parsing. This feature is disabled for - binary input formats such as `EPUB` and `docx`. + binary input formats such as `EPUB`, `odt`, 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 @@ -164,8 +164,8 @@ General options markdown), `markdown_github` (github extended markdown), `commonmark` (CommonMark markdown), `textile` (Textile), `rst` (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t` - (txt2tags), `docx` (docx), `epub` (EPUB), `opml` (OPML), `org` - (Emacs Org-mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki + (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML), + `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki 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 diff --git a/pandoc.cabal b/pandoc.cabal index 1924e568d..d2bbff0c2 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -17,9 +17,10 @@ Description: 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) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki - markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and - Textile, and it can write markdown, reStructuredText, XHTML, - HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, + markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, + Word Docx, ODT, and Textile, and it can write + Markdown, reStructuredText, XHTML, HTML 5, LaTeX, + ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, and several |