diff options
| author | Marc Schreiber <marc.schreiber@fh-aachen.de> | 2017-07-13 11:35:35 +0200 |
|---|---|---|
| committer | Marc Schreiber <marc.schreiber@fh-aachen.de> | 2017-07-13 11:51:40 +0200 |
| commit | f93d7d06f688654137b5e728601441881ff5aebf (patch) | |
| tree | e36c6fe213491dfe97e3b9de47a773ebfff8c133 /pandoc.cabal | |
| parent | 635f299b441e238ccd34e3ad61c5e36f0ca30067 (diff) | |
| parent | 8b502dd50ff842bdbbf346a67a607d1a7905bda3 (diff) | |
| download | pandoc-f93d7d06f688654137b5e728601441881ff5aebf.tar.gz | |
Merge branch 'master' of https://github.com/jgm/pandoc into textcolor-support
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 8d336097d..dd92690ce 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -18,13 +18,13 @@ Description: Pandoc is a Haskell library for converting from one markup this library. It can read several dialects of Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki 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, 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 + 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). . @@ -162,6 +162,7 @@ Extra-Source-Files: test/markdown-citations.txt test/textile-reader.textile test/mediawiki-reader.wiki + test/vimwiki-reader.wiki test/rst-reader.rst test/s5-basic.html test/s5-fancy.html @@ -287,14 +288,14 @@ Library parsec >= 3.1 && < 3.2, mtl >= 2.2 && < 2.3, filepath >= 1.1 && < 1.5, - process >= 1.2.3 && < 1.5, + process >= 1.2.3 && < 1.7, directory >= 1 && < 1.4, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, safe >= 0.3 && < 0.4, zip-archive >= 0.2.3.4 && < 0.4, HTTP >= 4000.0.5 && < 4000.4, - texmath >= 0.9.4 && < 0.10, + texmath >= 0.9.4.1 && < 0.10, xml >= 1.3.12 && < 1.4, random >= 1 && < 1.2, pandoc-types >= 1.17 && < 1.18, @@ -331,7 +332,7 @@ Library Build-Depends: old-locale >= 1 && < 1.1, time >= 1.2 && < 1.5 else - Build-Depends: time >= 1.5 && < 1.7 + Build-Depends: time >= 1.5 && < 1.9 if flag(network-uri) Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6 else @@ -365,9 +366,11 @@ Library Text.Pandoc.Readers, Text.Pandoc.Readers.HTML, Text.Pandoc.Readers.LaTeX, + Text.Pandoc.Readers.LaTeX.Types, Text.Pandoc.Readers.Markdown, Text.Pandoc.Readers.CommonMark, Text.Pandoc.Readers.MediaWiki, + Text.Pandoc.Readers.Vimwiki, Text.Pandoc.Readers.RST, Text.Pandoc.Readers.Org, Text.Pandoc.Readers.DocBook, @@ -380,6 +383,7 @@ Library Text.Pandoc.Readers.Docx, Text.Pandoc.Readers.Odt, Text.Pandoc.Readers.EPUB, + Text.Pandoc.Readers.Muse, Text.Pandoc.Writers, Text.Pandoc.Writers.Native, Text.Pandoc.Writers.Docbook, @@ -460,6 +464,7 @@ Library Text.Pandoc.Lua.Util, Text.Pandoc.CSS, Text.Pandoc.UUID, + Text.Pandoc.BCP47 Text.Pandoc.Slides, Text.Pandoc.Compat.Time, Paths_pandoc @@ -532,7 +537,7 @@ Test-Suite test-pandoc directory >= 1 && < 1.4, filepath >= 1.1 && < 1.5, hslua >= 0.4 && < 0.6, - process >= 1.2.3 && < 1.5, + process >= 1.2.3 && < 1.7, skylighting >= 0.3.3 && < 0.4, temporary >= 1.1 && < 1.3, Diff >= 0.2 && < 0.4, @@ -540,7 +545,7 @@ Test-Suite test-pandoc tasty-hunit >= 0.9 && < 0.10, tasty-quickcheck >= 0.8 && < 0.9, tasty-golden >= 2.3 && < 2.4, - QuickCheck >= 2.4 && < 2.10, + QuickCheck >= 2.4 && < 2.11, containers >= 0.1 && < 0.6, executable-path >= 0.0 && < 0.1, zip-archive >= 0.2.3.4 && < 0.4, @@ -559,6 +564,7 @@ Test-Suite test-pandoc Tests.Readers.Odt Tests.Readers.Txt2Tags Tests.Readers.EPUB + Tests.Readers.Muse Tests.Writers.Native Tests.Writers.ConTeXt Tests.Writers.Docbook |