Added ZimWiki format to documentation and cabal description.

This commit is contained in:
Alex Ivkin 2016-06-28 23:11:42 -07:00 committed by John MacFarlane
parent a73c95f61d
commit 7fdcd9a6e2
2 changed files with 19 additions and 13 deletions

19
README
View file

@ -20,11 +20,12 @@ write plain text, [Markdown], [CommonMark], [PHP Markdown Extra],
[GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML], [GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML],
[HTML5], [LaTeX] (including [`beamer`] slide shows), [ConTeXt], [RTF], [OPML], [HTML5], [LaTeX] (including [`beamer`] slide shows), [ConTeXt], [RTF], [OPML],
[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki [DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
markup], [DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3), markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
[FictionBook2], [Textile], [groff man] pages, [Emacs Org mode], [EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages,
[AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy], [Slideous], [DZSlides], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy],
[reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output [Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can also
on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is installed. produce [PDF] output on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is
installed.
Pandoc's enhanced version of Markdown includes syntax for [footnotes], Pandoc's enhanced version of Markdown includes syntax for [footnotes],
[tables], flexible [ordered lists], [definition lists], [fenced code blocks], [tables], flexible [ordered lists], [definition lists], [fenced code blocks],
@ -77,6 +78,7 @@ Markdown can be expected to be lossy.
[Textile]: http://redcloth.org/textile [Textile]: http://redcloth.org/textile
[MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting [MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting
[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki [DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html
[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules [TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html [Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html
[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html [groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
@ -272,8 +274,9 @@ General options
(MultiMarkdown), `commonmark` (CommonMark Markdown), `rst` (MultiMarkdown), `commonmark` (CommonMark Markdown), `rst`
(reStructuredText), `html` (XHTML), `html5` (HTML5), `latex` (reStructuredText), `html` (XHTML), `html5` (HTML5), `latex`
(LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt), (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
`man` (groff man), `mediawiki` (MediaWiki markup), `dokuwiki` `man` (groff man), `mediawiki` (MediaWiki markup),
(DokuWiki markup), `textile` (Textile), `org` (Emacs Org mode), `dokuwiki` (DokuWiki markup), `zimwiki` (ZimWiki markup),
`textile` (Textile), `org` (Emacs Org mode),
`texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook 4), `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook 4),
`docbook5` (DocBook 5), `opendocument` (OpenDocument), `odt` `docbook5` (DocBook 5), `opendocument` (OpenDocument), `odt`
(OpenOffice text document), `docx` (Word docx), `haddock` (OpenOffice text document), `docx` (Word docx), `haddock`
@ -2646,7 +2649,7 @@ them and they won't be treated as math delimiters.
TeX math will be printed in all output formats. How it is rendered TeX math will be printed in all output formats. How it is rendered
depends on the output format: depends on the output format:
Markdown, LaTeX, Emacs Org mode, ConTeXt Markdown, LaTeX, Emacs Org mode, ConTeXt, ZimWiki
~ It will appear verbatim between `$` characters. ~ It will appear verbatim between `$` characters.
reStructuredText reStructuredText

View file

@ -21,11 +21,11 @@ Description: Pandoc is a Haskell library for converting from one markup
Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and
it can write Markdown, reStructuredText, XHTML, HTML 5, it can write Markdown, reStructuredText, XHTML, HTML 5,
LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT,
Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile,
pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, groff man pages, plain text, Emacs Org-Mode, AsciiDoc,
EPUB (v2 and v3), FictionBook2, InDesign ICML, and several Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
kinds of HTML/javascript slide shows (S5, Slidy, Slideous, and several kinds of HTML/javascript slide shows (S5, Slidy,
DZSlides, reveal.js). Slideous, DZSlides, reveal.js).
. .
In contrast to most existing tools for converting Markdown In contrast to most existing tools for converting Markdown
to HTML, pandoc has a modular design: it consists of a set of to HTML, pandoc has a modular design: it consists of a set of
@ -55,6 +55,7 @@ Data-Files:
data/templates/default.plain data/templates/default.plain
data/templates/default.mediawiki data/templates/default.mediawiki
data/templates/default.dokuwiki data/templates/default.dokuwiki
data/templates/default.zimwiki
data/templates/default.rtf data/templates/default.rtf
data/templates/default.s5 data/templates/default.s5
data/templates/default.slidy data/templates/default.slidy
@ -148,6 +149,7 @@ Extra-Source-Files:
tests/tables.docbook tests/tables.docbook
tests/tables.docbook5 tests/tables.docbook5
tests/tables.dokuwiki tests/tables.dokuwiki
tests/tables.zimwiki
tests/tables.icml tests/tables.icml
tests/tables.html tests/tables.html
tests/tables.latex tests/tables.latex
@ -189,6 +191,7 @@ Extra-Source-Files:
tests/writer.fb2 tests/writer.fb2
tests/writer.opml tests/writer.opml
tests/writer.dokuwiki tests/writer.dokuwiki
tests/writer.zimwiki
tests/writers-lang-and-dir.latex tests/writers-lang-and-dir.latex
tests/writers-lang-and-dir.context tests/writers-lang-and-dir.context
tests/dokuwiki_inline_formatting.dokuwiki tests/dokuwiki_inline_formatting.dokuwiki