Skip to content
Permalink
Browse files

Merge pull request #3 from christian-marie/master

Fix pandoc and optparse-applicative changes, drop upper bounds
  • Loading branch information...
sdiehl committed Jul 6, 2017
2 parents daa6c84 + 30a9196 commit 1b2ebf1e7e468f262e817688b8fcaef760c2efa2
Showing with 13 additions and 11 deletions.
  1. +9 −9 cats.cabal
  2. +1 −1 src/Data/Pandoc/Tikz.hs
  3. +3 −1 src/Main.hs
@@ -1,4 +1,4 @@
name: pandoc-cats
name: cats
version: 0.1.0.1
synopsis: Commutative via TikZ for Pandoc
homepage: https://github.com/sdiehl/cats
@@ -28,10 +28,10 @@ Library
Build-Depends:
base >= 4 && < 5,
pandoc >= 1.9.3,
bytestring >= 0.9 && < 0.11,
filepath >= 1.0 && < 1.4,
unix >= 2.4 && < 2.7,
process >= 1.0 && < 1.2,
bytestring >= 0.9,
filepath >= 1.0,
unix >= 2.4,
process >= 1.0,
pureMD5 >= 2.1,
data-default

@@ -43,10 +43,10 @@ Executable cats
Build-Depends:
base >= 4 && < 5,
pandoc >= 1.9.3,
bytestring >= 0.9 && < 0.11,
filepath >= 1.0 && < 1.4,
unix >= 2.4 && < 2.7,
process >= 1.0 && < 1.2,
bytestring >= 0.9,
filepath >= 1.0,
unix >= 2.4,
process >= 1.0,
pureMD5 >= 2.1,
optparse-applicative >= 0.7,
data-default
@@ -32,7 +32,7 @@ ljoin = makeRelative "." . join


imageBlock :: FilePath -> Block
imageBlock fname = Para [Image [] (fname, "")]
imageBlock fname = Para [Image nullAttr [] (fname, "")]

svgify :: FilePath -> IO Block
svgify file = do
@@ -1,15 +1,17 @@
import Control.Exception(throw)
import Data.Default
import Data.Pandoc.Tikz
import System.IO
import Text.Pandoc
import Options.Applicative
import Data.Monoid

data Options = Options
{ input :: String }
deriving Show

readDoc :: String -> Pandoc
readDoc = readMarkdown def
readDoc = either throw id . readMarkdown def

writeDoc :: Pandoc -> String
writeDoc = writeMarkdown def

0 comments on commit 1b2ebf1

Please sign in to comment.
You can’t perform that action at this time.