Skip to content

Commit

Permalink
Update for pandoc 2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
lierdakil committed Nov 23, 2019
1 parent 6b89857 commit 9ae2b78
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -3,6 +3,8 @@ static-build
.stack-work
.cabal-sandbox
.pandoc-*
pandoc
cabal.project.local
dist
dist-newstyle
cabal.sandbox.config
Expand Down
4 changes: 2 additions & 2 deletions package.yaml
@@ -1,5 +1,5 @@
name: pandoc-crossref
version: '0.3.4.2'
version: '0.3.5.0'
synopsis: Pandoc filter for cross-references
description: pandoc-crossref is a pandoc filter for numbering figures, equations,
tables and cross-references to them.
Expand All @@ -18,7 +18,7 @@ data-files:
- test/m2m/*/*
dependencies:
- base >=4.11 && <5
- pandoc >=2.3 && < 2.8
- pandoc >=2.8 && < 2.9
- pandoc-types >=1.17.5.1 && < 1.18
- mtl >=1.1 && <2.3
- containers >=0.1 && <0.7
Expand Down
12 changes: 6 additions & 6 deletions pandoc-crossref.cabal
Expand Up @@ -4,10 +4,10 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
-- hash: edd11ea020cd9236b745c8aa8d2a9728ac41f337c5648fc1d98b28e62e7f4584
-- hash: 2f4fe34cf2805278f96d96410f404e425f98f053031b5adcd73f25e2e16eb715

name: pandoc-crossref
version: 0.3.4.2
version: 0.3.5.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
Expand Down Expand Up @@ -104,7 +104,7 @@ library
, directory >=1 && <1.4
, filepath >=1.1 && <1.5
, mtl >=1.1 && <2.3
, pandoc >=2.3 && <2.8
, pandoc >=2.8 && <2.9
, pandoc-types >=1.17.5.1 && <1.18
, roman-numerals ==0.5.*
, syb >=0.4 && <0.8
Expand Down Expand Up @@ -135,7 +135,7 @@ executable pandoc-crossref
, mtl >=1.1 && <2.3
, open-browser >=0.2 && <0.3
, optparse-applicative >=0.13 && <0.16
, pandoc >=2.3 && <2.8
, pandoc >=2.8 && <2.9
, pandoc-crossref
, pandoc-types >=1.17.5.1 && <1.18
, roman-numerals ==0.5.*
Expand Down Expand Up @@ -163,7 +163,7 @@ test-suite test-integrative
, filepath >=1.1 && <1.5
, hspec >=2.4.4 && <3
, mtl >=1.1 && <2.3
, pandoc >=2.3 && <2.8
, pandoc >=2.8 && <2.9
, pandoc-crossref
, pandoc-types >=1.17.5.1 && <1.18
, roman-numerals ==0.5.*
Expand Down Expand Up @@ -212,7 +212,7 @@ test-suite test-pandoc-crossref
, filepath >=1.1 && <1.5
, hspec >=2.4.4 && <3
, mtl >=1.1 && <2.3
, pandoc >=2.3 && <2.8
, pandoc >=2.8 && <2.9
, pandoc-types >=1.17.5.1 && <1.18
, roman-numerals ==0.5.*
, syb >=0.4 && <0.8
Expand Down
4 changes: 3 additions & 1 deletion src/ManData.hs
Expand Up @@ -25,6 +25,7 @@ import Language.Haskell.TH.Syntax
import qualified Data.Text as T
import System.IO
import qualified Text.Pandoc as P
import qualified Text.Pandoc.Templates as PT
import Control.DeepSeq
import Data.String
import Text.Pandoc.Highlighting (pygments)
Expand Down Expand Up @@ -59,8 +60,9 @@ embedManualText = embedManual $ P.writePlain P.def
embedManualHtml :: Q Exp
embedManualHtml = do
t <- runIO $ fmap (either (error . show) id) $ P.runIO $ P.getDefaultTemplate "html5"
tt <- runIO $ either (error . show) id <$> PT.compileTemplate "html5.txt" t
embedManual $ P.writeHtml5String P.def{
P.writerTemplate = Just t
P.writerTemplate = Just tt
, P.writerHighlightStyle = Just pygments
}

Expand Down
11 changes: 0 additions & 11 deletions stack.yaml

This file was deleted.

0 comments on commit 9ae2b78

Please sign in to comment.