diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-07-31 12:00:21 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-07-31 12:00:21 -0700 |
| commit | 6dd24184765800bdedc1d28a87f9564f7f44d4f4 (patch) | |
| tree | d916b72cf96b7f96dd23763cb8992cad4f970ca4 /src/Text/Pandoc/Readers | |
| parent | 00662faefbca0b9889d3d79dbb2985350356d18a (diff) | |
| download | pandoc-6dd24184765800bdedc1d28a87f9564f7f44d4f4.tar.gz | |
New module, Text.Pandoc.MediaBag.
Moved `MediaBag` definition and functions from Shared:
`lookupMedia`, `mediaDirectory`, `insertMedia`, `extractMediaBag`.
Removed `emptyMediaBag`; use `mempty` instead, since `MediaBag`
is a Monoid.
Diffstat (limited to 'src/Text/Pandoc/Readers')
| -rw-r--r-- | src/Text/Pandoc/Readers/Docx.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs index 2fb4da2d9..7a89c0b04 100644 --- a/src/Text/Pandoc/Readers/Docx.hs +++ b/src/Text/Pandoc/Readers/Docx.hs @@ -84,8 +84,10 @@ import Text.Pandoc.Readers.Docx.Lists import Text.Pandoc.Readers.Docx.Reducible import Text.Pandoc.Readers.Docx.TexChar import Text.Pandoc.Shared +import Text.Pandoc.MediaBag (insertMedia, MediaBag) import Data.Maybe (mapMaybe, fromMaybe) import Data.List (delete, isPrefixOf, (\\), intercalate, intersect) +import Data.Monoid import qualified Data.ByteString.Lazy as B import qualified Data.Map as M import Control.Monad.Reader @@ -108,7 +110,7 @@ data DState = DState { docxAnchorMap :: M.Map String String defaultDState :: DState defaultDState = DState { docxAnchorMap = M.empty - , docxMediaBag = emptyMediaBag + , docxMediaBag = mempty , docxInHeaderBlock = False , docxInTexSubscript = False} |