git.iko.soy/typeable/pandoc
on master help sign in
Added ZimWiki format to documentation and cabal description.
7fdcd9aAlex Ivkin
README+11−8
compare with master
unifiedsplit
@@ -20,11 +20,12 @@ write plain text, [Markdown], [CommonMark], [PHP Markdown Extra],
20[GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML],
20[GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML],
21[HTML5], [LaTeX] (including [`beamer`] slide shows), [ConTeXt], [RTF], [OPML],
21[HTML5], [LaTeX] (including [`beamer`] slide shows), [ConTeXt], [RTF], [OPML],
22[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
22[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
23−markup], [DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3),
23+markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
24−[FictionBook2], [Textile], [groff man] pages, [Emacs Org mode],
24+[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages,
25−[AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy], [Slideous], [DZSlides],
25+[Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy],
26−[reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output
26+[Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can also
27−on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is installed.
27+produce [PDF] output on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is
28+installed.
28
29
29Pandoc's enhanced version of Markdown includes syntax for [footnotes],
30Pandoc's enhanced version of Markdown includes syntax for [footnotes],
30[tables], flexible [ordered lists], [definition lists], [fenced code blocks],
31[tables], flexible [ordered lists], [definition lists], [fenced code blocks],
@@ -77,6 +78,7 @@ Markdown can be expected to be lossy.
77[Textile]: http://redcloth.org/textile
78[Textile]: http://redcloth.org/textile
78[MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting
79[MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting
79[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
80[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
81+[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html
80[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
82[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
81[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html
83[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html
82[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
84[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
@@ -272,8 +274,9 @@ General options
272 (MultiMarkdown), `commonmark` (CommonMark Markdown), `rst`
274 (MultiMarkdown), `commonmark` (CommonMark Markdown), `rst`
273 (reStructuredText), `html` (XHTML), `html5` (HTML5), `latex`
275 (reStructuredText), `html` (XHTML), `html5` (HTML5), `latex`
274 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
276 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
275− `man` (groff man), `mediawiki` (MediaWiki markup), `dokuwiki`
277+ `man` (groff man), `mediawiki` (MediaWiki markup),
278+ `dokuwiki` (DokuWiki markup), `zimwiki` (ZimWiki markup),
276− (DokuWiki markup), `textile` (Textile), `org` (Emacs Org mode),
279+ `textile` (Textile), `org` (Emacs Org mode),
277 `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook 4),
280 `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` (DocBook 4),
278 `docbook5` (DocBook 5), `opendocument` (OpenDocument), `odt`
281 `docbook5` (DocBook 5), `opendocument` (OpenDocument), `odt`
279 (OpenOffice text document), `docx` (Word docx), `haddock`
282 (OpenOffice text document), `docx` (Word docx), `haddock`
@@ -2646,7 +2649,7 @@ them and they won't be treated as math delimiters.
2646TeX math will be printed in all output formats. How it is rendered
2649TeX math will be printed in all output formats. How it is rendered
2647depends on the output format:
2650depends on the output format:
2648
2651
2649−Markdown, LaTeX, Emacs Org mode, ConTeXt
2652+Markdown, LaTeX, Emacs Org mode, ConTeXt, ZimWiki
2650 ~ It will appear verbatim between `$` characters.
2653 ~ It will appear verbatim between `$` characters.
2651
2654
2652reStructuredText
2655reStructuredText
pandoc.cabal+8−5
@@ -21,11 +21,11 @@ Description: Pandoc is a Haskell library for converting from one markup
21 Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and
21 Emacs Org-Mode, txt2tags, Word Docx, ODT, and Textile, and
22 it can write Markdown, reStructuredText, XHTML, HTML 5,
22 it can write Markdown, reStructuredText, XHTML, HTML 5,
23 LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT,
23 LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT,
24− Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man
24+ Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile,
25− pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
25+ groff man pages, plain text, Emacs Org-Mode, AsciiDoc,
26− EPUB (v2 and v3), FictionBook2, InDesign ICML, and several
26+ Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
27− kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
27+ and several kinds of HTML/javascript slide shows (S5, Slidy,
28− DZSlides, reveal.js).
28+ Slideous, DZSlides, reveal.js).
29 .
29 .
30 In contrast to most existing tools for converting Markdown
30 In contrast to most existing tools for converting Markdown
31 to HTML, pandoc has a modular design: it consists of a set of
31 to HTML, pandoc has a modular design: it consists of a set of
@@ -55,6 +55,7 @@ Data-Files:
55 data/templates/default.plain
55 data/templates/default.plain
56 data/templates/default.mediawiki
56 data/templates/default.mediawiki
57 data/templates/default.dokuwiki
57 data/templates/default.dokuwiki
58+ data/templates/default.zimwiki
58 data/templates/default.rtf
59 data/templates/default.rtf
59 data/templates/default.s5
60 data/templates/default.s5
60 data/templates/default.slidy
61 data/templates/default.slidy
@@ -148,6 +149,7 @@ Extra-Source-Files:
148 tests/tables.docbook
149 tests/tables.docbook
149 tests/tables.docbook5
150 tests/tables.docbook5
150 tests/tables.dokuwiki
151 tests/tables.dokuwiki
152+ tests/tables.zimwiki
151 tests/tables.icml
153 tests/tables.icml
152 tests/tables.html
154 tests/tables.html
153 tests/tables.latex
155 tests/tables.latex
@@ -189,6 +191,7 @@ Extra-Source-Files:
189 tests/writer.fb2
191 tests/writer.fb2
190 tests/writer.opml
192 tests/writer.opml
191 tests/writer.dokuwiki
193 tests/writer.dokuwiki
194+ tests/writer.zimwiki
192 tests/writers-lang-and-dir.latex
195 tests/writers-lang-and-dir.latex
193 tests/writers-lang-and-dir.context
196 tests/writers-lang-and-dir.context
194 tests/dokuwiki_inline_formatting.dokuwiki
197 tests/dokuwiki_inline_formatting.dokuwiki