aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MANUAL.txt4
-rw-r--r--README.md11
-rw-r--r--pandoc.cabal20
3 files changed, 18 insertions, 17 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index 7f3a67a51..6a85d08b4 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -27,8 +27,8 @@ markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI
Simple], [Muse] and [Slidy], [Slideous], [DZSlides], [reveal.js]
or [S5] HTML slide shows. It can also produce [PDF] output on
-systems where LaTeX, ConTeXt, `pdfroff`, or `wkhtmltopdf` is
-installed.
+systems where LaTeX, ConTeXt, `pdfroff`, `wkhtmltopdf`,
+`prince`, or `weasyprint` is installed.
Pandoc's enhanced version of Markdown includes syntax for [footnotes],
[tables], flexible [ordered lists], [definition lists], [fenced code
diff --git a/README.md b/README.md
index e116d2e45..eaaf79059 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ another, and a command-line tool that uses this library. It can read
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
Markdown], [MultiMarkdown], and (subsets of) [Textile],
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
-[TikiWiki markup], [Haddock markup], [OPML], [Emacs Org mode], [DocBook],
-[Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
-write plain text, [Markdown], [CommonMark], [PHP Markdown
+[TikiWiki markup], [Creole 1.0], [Haddock markup], [OPML], [Emacs Org mode],
+[DocBook], [Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx];
+and it can write plain text, [Markdown], [CommonMark], [PHP Markdown
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
[`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook],
@@ -31,8 +31,8 @@ markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI
Simple], [Muse] and [Slidy], [Slideous], [DZSlides], [reveal.js]
or [S5] HTML slide shows. It can also produce [PDF] output on
-systems where LaTeX, ConTeXt, `pdfroff`, or `wkhtmltopdf` is
-installed.
+systems where LaTeX, ConTeXt, `pdfroff`, `wkhtmltopdf`,
+`prince`, or `weasyprint` is installed.
Pandoc's enhanced version of Markdown includes syntax for [footnotes],
[tables], flexible [ordered lists], [definition lists], [fenced code
@@ -77,6 +77,7 @@ Markdown can be expected to be lossy.
[Beamer User's Guide]: http://ctan.math.utah.edu/ctan/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf
[ConTeXt]: http://www.contextgarden.net/
[RTF]: http://en.wikipedia.org/wiki/Rich_Text_Format
+[Creole 1.0]: http://www.wikicreole.org/wiki/Creole1.0
[DocBook]: http://docbook.org
[txt2tags]: http://txt2tags.org
[EPUB]: http://idpf.org/epub
diff --git a/pandoc.cabal b/pandoc.cabal
index 4d19bc41b..77e484949 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -17,16 +17,16 @@ 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 several dialects of Markdown and
(subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, TWiki markup, TikiWiki markup, Haddock
- markup, OPML, Emacs Org-Mode, txt2tags, Muse, Vimwiki, Word
- Docx, ODT, and Textile, and it can write Markdown,
- reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
- JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF, MediaWiki,
- DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text,
- Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
- FictionBook2, InDesign ICML, Muse, and several kinds of
- HTML/javascript slide shows (S5, Slidy, Slideous, DZSlides,
- reveal.js).
+ MediaWiki markup, TWiki markup, TikiWiki markup, Creole 1.0,
+ Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags,
+ Vimwiki, Word Docx, ODT, and Textile, and it can write
+ Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt,
+ DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx,
+ RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man,
+ groff ms, plain text, Emacs Org-Mode, AsciiDoc,
+ Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign
+ ICML, Muse, and several kinds of HTML/javascript slide
+ shows (S5, Slidy, Slideous, DZSlides, reveal.js).
.
In contrast to most existing tools for converting Markdown
to HTML, pandoc has a modular design: it consists of a set of