diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.2.0 + +- Pandoc 2.2; GHC 8.4 + ## 0.3.1.0 - Update documentation diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal --- a/pandoc-crossref.cabal +++ b/pandoc-crossref.cabal @@ -1,11 +1,11 @@ --- This file has been generated from package.yaml by hpack version 0.21.2. +-- This file has been generated from package.yaml by hpack version 0.28.2. -- -- see: https://github.com/sol/hpack -- --- hash: 1134f5ed99f27ba306513fcd6aecbd132e1238e315eade16a2155173959174b8 +-- hash: 289183a32db42f3d7d750a268670291b8dfaa5f160574e53ff9ad07aacf00401 name: pandoc-crossref -version: 0.3.1.0 +version: 0.3.2.0 synopsis: Pandoc filter for cross-references description: pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them. category: Text @@ -17,12 +17,10 @@ license-file: LICENSE build-type: Simple cabal-version: >= 1.10 - extra-source-files: CHANGELOG.md test/demo-chapters.inc test/demo.inc - data-files: docs/demo/demo.md docs/index.md @@ -72,7 +70,7 @@ lib ghc-options: -Wall build-depends: - base >=4.9 && <5 + base >=4.11 && <5 , containers >=0.1 && <0.6 , data-accessor >=0.2.2.6 && <0.3.0.0 , data-accessor-template >=0.2.1.12 && <0.3.0.0 @@ -81,7 +79,7 @@ , directory >=1 && <1.4 , filepath >=1.1 && <1.5 , mtl >=1.1 && <2.3 - , pandoc >=2.1.3 && <2.2 + , pandoc >=2.2 && <2.3 , pandoc-types ==1.17.* , roman-numerals ==0.5.* , syb >=0.4 && <0.8 @@ -116,7 +114,7 @@ src ghc-options: -Wall -threaded build-depends: - base >=4.9 && <5 + base >=4.11 && <5 , containers >=0.1 && <0.6 , data-accessor >=0.2.2.6 && <0.3.0.0 , data-accessor-template >=0.2.1.12 && <0.3.0.0 @@ -128,7 +126,7 @@ , mtl >=1.1 && <2.3 , open-browser >=0.2 && <0.3 , optparse-applicative >=0.13 && <0.15 - , pandoc >=2.1.3 && <2.2 + , pandoc >=2.2 && <2.3 , pandoc-crossref , pandoc-types ==1.17.* , roman-numerals ==0.5.* @@ -149,7 +147,7 @@ test ghc-options: -Wall -fno-warn-unused-do-bind -threaded build-depends: - base >=4.9 && <5 + base >=4.11 && <5 , containers >=0.1 && <0.6 , data-accessor >=0.2.2.6 && <0.3.0.0 , data-accessor-template >=0.2.1.12 && <0.3.0.0 @@ -159,7 +157,7 @@ , filepath >=1.1 && <1.5 , hspec >=2.4.4 && <3 , mtl >=1.1 && <2.3 - , pandoc >=2.1.3 && <2.2 + , pandoc >=2.2 && <2.3 , pandoc-crossref , pandoc-types ==1.17.* , roman-numerals ==0.5.* @@ -177,7 +175,7 @@ lib ghc-options: -Wall -fno-warn-unused-do-bind -threaded build-depends: - base >=4.9 && <5 + base >=4.11 && <5 , containers >=0.1 && <0.6 , data-accessor >=0.2.2.6 && <0.3.0.0 , data-accessor-template >=0.2.1.12 && <0.3.0.0 @@ -187,7 +185,7 @@ , filepath >=1.1 && <1.5 , hspec >=2.4.4 && <3 , mtl >=1.1 && <2.3 - , pandoc >=2.1.3 && <2.2 + , pandoc >=2.2 && <2.3 , pandoc-types ==1.17.* , roman-numerals ==0.5.* , syb >=0.4 && <0.8 diff --git a/src/pandoc-crossref.hs b/src/pandoc-crossref.hs --- a/src/pandoc-crossref.hs +++ b/src/pandoc-crossref.hs @@ -20,7 +20,6 @@ {-# LANGUAGE ApplicativeDo, TemplateHaskell, CPP #-} import Text.Pandoc -import Text.Pandoc.Builder import Text.Pandoc.JSON import Text.Pandoc.CrossRef diff --git a/test/m2m/equations-tables-auto/expect.md b/test/m2m/equations-tables-auto/expect.md --- a/test/m2m/equations-tables-auto/expect.md +++ b/test/m2m/equations-tables-auto/expect.md @@ -4,6 +4,7 @@ --------------------------------------------------------------- --------- $$ this $$ $$(1)$$ + --------------------------------------------------------------- --------- @@ -14,6 +15,7 @@ --------------------------------------------------------------- --------- $$ for example $$ $$(2)$$ + --------------------------------------------------------------- --------- @@ -26,6 +28,7 @@ --------------------------------------------------------------- --------- $$ start $$ $$(3)$$ + --------------------------------------------------------------- --------- @@ -38,6 +41,7 @@ --------------------------------------------------------------- --------- $$ separate $$ $$(4)$$ + --------------------------------------------------------------- --------- @@ -49,6 +53,7 @@ ::: {#eq:0} --------------------------------------------------------------- --------- $$ this $$ $$(5)$$ + --------------------------------------------------------------- --------- ::: @@ -57,6 +62,7 @@ ::: {#eq:1} --------------------------------------------------------------- --------- $$ for example $$ $$(6)$$ + --------------------------------------------------------------- --------- ::: @@ -67,6 +73,7 @@ ::: {#eq:2} --------------------------------------------------------------- --------- $$ start $$ $$(7)$$ + --------------------------------------------------------------- --------- ::: @@ -77,6 +84,7 @@ ::: {#eq:3} --------------------------------------------------------------- --------- $$ separate $$ $$(8)$$ + --------------------------------------------------------------- --------- ::: diff --git a/test/m2m/equations-tables/expect.md b/test/m2m/equations-tables/expect.md --- a/test/m2m/equations-tables/expect.md +++ b/test/m2m/equations-tables/expect.md @@ -17,6 +17,7 @@ ::: {#eq:0} --------------------------------------------------------------- --------- $$ this $$ $$(1)$$ + --------------------------------------------------------------- --------- ::: @@ -25,6 +26,7 @@ ::: {#eq:1} --------------------------------------------------------------- --------- $$ for example $$ $$(2)$$ + --------------------------------------------------------------- --------- ::: @@ -35,6 +37,7 @@ ::: {#eq:2} --------------------------------------------------------------- --------- $$ start $$ $$(3)$$ + --------------------------------------------------------------- --------- ::: @@ -45,6 +48,7 @@ ::: {#eq:3} --------------------------------------------------------------- --------- $$ separate $$ $$(4)$$ + --------------------------------------------------------------- --------- :::