diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-07-30 10:55:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-07-30 10:55:29 -0700 |
| commit | b12d2ea20a8b914ed2d6ee111eee5a25ad989597 (patch) | |
| tree | ccf89e4668affc8ee0bf16089f6eadc2c3a427ad /src/Text/Pandoc.hs | |
| parent | 02c79ea4f6c050e9e610825e8b462382beae2b5a (diff) | |
| parent | f733b50150c3e7bf445d0d7c71e1f34e62ddf61a (diff) | |
| download | pandoc-b12d2ea20a8b914ed2d6ee111eee5a25ad989597.tar.gz | |
Merge pull request #1468 from jkr/mediabag
Mediabag
Diffstat (limited to 'src/Text/Pandoc.hs')
| -rw-r--r-- | src/Text/Pandoc.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index be34641a9..11553383c 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -160,7 +160,7 @@ import Text.Pandoc.Writers.Haddock import Text.Pandoc.Writers.Custom import Text.Pandoc.Templates import Text.Pandoc.Options -import Text.Pandoc.Shared (safeRead, warn) +import Text.Pandoc.Shared (safeRead, warn, MediaBag) import Data.Aeson import qualified Data.ByteString.Lazy as BL import Data.List (intercalate) @@ -204,12 +204,12 @@ markdown o s = do return doc data Reader = StringReader (ReaderOptions -> String -> IO Pandoc) - | ByteStringReader (ReaderOptions -> BL.ByteString -> IO Pandoc) + | ByteStringReader (ReaderOptions -> BL.ByteString -> IO (Pandoc, MediaBag)) mkStringReader :: (ReaderOptions -> String -> Pandoc) -> Reader mkStringReader r = StringReader (\o s -> return $ r o s) -mkBSReader :: (ReaderOptions -> BL.ByteString -> Pandoc) -> Reader +mkBSReader :: (ReaderOptions -> BL.ByteString -> (Pandoc, MediaBag)) -> Reader mkBSReader r = ByteStringReader (\o s -> return $ r o s) -- | Association list of formats and readers. |