heist 1.0.1.3 → 1.1

raw patch · 2 files changed

+4/−30 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• heist.cabal +2/−2
• src/Heist/Splices/Markdown.hs +2/−28

@@ -1,5 +1,5 @@ name:           heist-version:        1.0.1.3+version:        1.1 synopsis:       An Haskell template system supporting both HTML5 and XML. description:     Heist is a powerful template system that supports both HTML5 and XML.@@ -172,7 +172,7 @@     filepath                   >= 1.3     && < 1.5,     hashable                   >= 1.1     && < 1.3,     lifted-base                >= 0.2     && < 0.3,-    map-syntax                 >= 0.2     && < 0.4,+    map-syntax                 >= 0.3     && < 0.4,     monad-control              >= 0.3     && < 1.1,     mtl                        >= 2.0     && < 2.3,     process                    >= 1.1     && < 1.7,

@@ -87,10 +87,6 @@   , pandocArgs   , pandocBaseDir   , pandocWrapDiv-  -- * Internal helper functions-  , pandoc-  , pandocBS-  , readProcessWithExitCode'   ) where  ------------------------------------------------------------------------------@@ -165,7 +161,7 @@ -- | Default options defaultPandocOptions :: PandocOptions defaultPandocOptions = PandocOptions "pandoc"-                                     ["-S", "--no-wrap"]+                                     []                                      Nothing                                      (Just "markdown") @@ -209,7 +205,7 @@ markdownTag = "markdown"  --------------------------------------------------------------------------------- | Default markdown splice with executable "pandoc" and options "-S --no-wrap"+-- | Default markdown splice with executable "pandoc" markdownSplice :: MonadIO m => Splice m markdownSplice= pandocSplice defaultPandocOptions @@ -254,28 +250,6 @@                     in [Element "div" finalAttrs  body]     appendClass Nothing cls = cls     appendClass (Just orig) cls = T.concat [orig, " ", cls]---pandoc :: FilePath -> FilePath -> FilePath -> IO ByteString-pandoc pandocPath templateDir inputFile = do-    sout <- pandocWith pandocPath args templateDir inputFile-    return $ BC.concat [ "<div class=\"markdown\">\n"-                         , sout-                         , "\n</div>" ]--  where-    args = [ "-S", "--no-wrap"]---pandocBS :: FilePath -> ByteString -> IO ByteString-pandocBS pandocPath s = do-    sout <- pandocWithBS pandocPath args s-    return $ BC.concat [ "<div class=\"markdown\">\n"-                       , sout-                       , "\n</div>" ]--  where-    args = [ "-S", "--no-wrap" ]   pandocWith :: FilePath -> [String] -> FilePath -> FilePath -> IO ByteString