Merge branch 'typeclass'

1 files changed, 24 insertions, 17 deletions

diff --git a/pandoc.cabal b/pandoc.cabal
index ce552ecdc..a64e8ed26 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 Name:            pandoc
-Version:         1.19.2
+Version:         2.0
 Cabal-Version:   >= 1.10
 Build-Type:      Custom
 License:         GPL
@@ -36,9 +36,9 @@ Description:     Pandoc is a Haskell library for converting from one markup
                  only adding a reader or writer.
 Data-Files:
                  -- templates
-                 data/templates/default.html
+                 data/templates/default.html4
                  data/templates/default.html5
-                 data/templates/default.docbook
+                 data/templates/default.docbook4
                  data/templates/default.docbook5
                  data/templates/default.tei
                  data/templates/default.beamer
@@ -66,7 +66,7 @@ Data-Files:
                  data/templates/default.haddock
                  data/templates/default.textile
                  data/templates/default.org
-                 data/templates/default.epub
+                 data/templates/default.epub2
                  data/templates/default.epub3
                  -- source files for reference.docx
                  data/docx/[Content_Types].xml
@@ -145,12 +145,13 @@ Extra-Source-Files:
                  tests/s5-fragment.html
                  tests/s5-inserts.html
                  tests/tables.context
-                 tests/tables.docbook
+                 tests/tables.docbook4
                  tests/tables.docbook5
                  tests/tables.dokuwiki
                  tests/tables.zimwiki
                  tests/tables.icml
-                 tests/tables.html
+                 tests/tables.html4
+                 tests/tables.html5
                  tests/tables.latex
                  tests/tables.man
                  tests/tables.plain
@@ -170,9 +171,10 @@ Extra-Source-Files:
                  tests/testsuite.txt
                  tests/writer.latex
                  tests/writer.context
-                 tests/writer.docbook
+                 tests/writer.docbook4
                  tests/writer.docbook5
-                 tests/writer.html
+                 tests/writer.html4
+                 tests/writer.html5
                  tests/writer.man
                  tests/writer.markdown
                  tests/writer.plain
@@ -290,10 +292,10 @@ Library
                  old-time,
                  deepseq >= 1.3 && < 1.5,
                  JuicyPixels >= 3.1.6.1 && < 3.3,
-                 filemanip >= 0.3 && < 0.4,
+                 Glob >= 0.7 && < 0.8,
                  cmark >= 0.5 && < 0.6,
                  doctemplates >= 0.1 && < 0.2,
-                 ghc-prim >= 0.2
+                 free >= 4
   if flag(old-locale)
      Build-Depends: old-locale >= 1 && < 1.1,
                     time >= 1.2 && < 1.5
@@ -328,6 +330,7 @@ Library
 
   Exposed-Modules: Text.Pandoc,
                    Text.Pandoc.Options,
+                   Text.Pandoc.Extensions,
                    Text.Pandoc.Pretty,
                    Text.Pandoc.Shared,
                    Text.Pandoc.MediaBag,
@@ -341,7 +344,6 @@ Library
                    Text.Pandoc.Readers.Org,
                    Text.Pandoc.Readers.DocBook,
                    Text.Pandoc.Readers.OPML,
-                   Text.Pandoc.Readers.TeXMath,
                    Text.Pandoc.Readers.Textile,
                    Text.Pandoc.Readers.Native,
                    Text.Pandoc.Readers.Haddock,
@@ -377,13 +379,15 @@ Library
                    Text.Pandoc.Writers.EPUB,
                    Text.Pandoc.Writers.FB2,
                    Text.Pandoc.Writers.TEI,
+                   Text.Pandoc.Writers.Math,
                    Text.Pandoc.PDF,
                    Text.Pandoc.UTF8,
                    Text.Pandoc.Templates,
                    Text.Pandoc.XML,
                    Text.Pandoc.SelfContained,
                    Text.Pandoc.Process,
-                   Text.Pandoc.CSS
+                   Text.Pandoc.MIME,
+                   Text.Pandoc.Class
   Other-Modules:   Text.Pandoc.Readers.Docx.Lists,
                    Text.Pandoc.Readers.Docx.Combine,
                    Text.Pandoc.Readers.Docx.Parse,
@@ -410,7 +414,7 @@ Library
                    Text.Pandoc.Readers.Org.Shared,
                    Text.Pandoc.Writers.Shared,
                    Text.Pandoc.Asciify,
-                   Text.Pandoc.MIME,
+                   Text.Pandoc.CSS,
                    Text.Pandoc.Emoji,
                    Text.Pandoc.Parsing,
                    Text.Pandoc.UUID,
@@ -435,7 +439,8 @@ Executable pandoc
                  aeson >= 0.7.0.5 && < 1.2,
                  yaml >= 0.8.8.2 && < 0.9,
                  containers >= 0.1 && < 0.6,
-                 HTTP >= 4000.0.5 && < 4000.4
+                 HTTP >= 4000.0.5 && < 4000.4,
+                 mtl >= 2.2 && < 2.3
   if flag(network-uri)
      Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6
   else
@@ -483,7 +488,8 @@ Executable weigh-pandoc
   if flag(weigh-pandoc)
      Build-Depends:   pandoc,
                       base >= 4.2 && < 5,
-                      weigh >= 0.0 && < 0.1
+                      weigh >= 0.0 && < 0.1,
+                      mtl >= 2.2 && < 2.3
      Buildable:       True
   else
     Buildable:     False
@@ -516,11 +522,11 @@ Test-Suite test-pandoc
                   containers >= 0.1 && < 0.6,
                   ansi-terminal >= 0.5 && < 0.7,
                   executable-path >= 0.0 && < 0.1,
-                  zip-archive >= 0.2.3.4 && < 0.4
+                  zip-archive >= 0.2.3.4 && < 0.4,
+                  mtl >= 2.2 && < 2.3
   Other-Modules:  Tests.Old
                   Tests.Helpers
                   Tests.Shared
-                  Tests.Walk
                   Tests.Readers.LaTeX
                   Tests.Readers.HTML
                   Tests.Readers.Markdown
@@ -552,6 +558,7 @@ benchmark benchmark-pandoc
      Hs-Source-Dirs: prelude
      Other-Modules:  Prelude
   Build-Depends:   pandoc,
+                   time, bytestring, containers,
                    base >= 4.2 && < 5,
                    syb >= 0.1 && < 0.7,
                    criterion >= 1.0 && < 1.2