Moved MediaBag from Shared to Options.

This will allow us to put a MediaBag in WriterOptions.

3 files changed, 7 insertions, 12 deletions

diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index 11553383c..d9af9993b 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, MediaBag)
+import Text.Pandoc.Shared (safeRead, warn)
 import Data.Aeson
 import qualified Data.ByteString.Lazy as BL
 import Data.List (intercalate)
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index ac791ac74..a19f4b087 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -42,6 +42,7 @@ module Text.Pandoc.Options ( Extension(..)
                            , EPUBVersion (..)
                            , WriterOptions (..)
                            , TrackChanges (..)
+                           , MediaBag
                            , def
                            , isEnabled
                            ) where
@@ -49,6 +50,8 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Default
 import Text.Pandoc.Highlighting (Style, pygments)
+import qualified Data.ByteString.Lazy as BL
+import qualified Data.Map as M
 
 -- | Individually selectable syntax extensions.
 data Extension =
@@ -274,6 +277,9 @@ data TrackChanges = AcceptChanges
                   | AllChanges
                   deriving (Show, Read, Eq)
 
+-- | A map of media paths to their binary representations.
+type MediaBag = M.Map String BL.ByteString
+
 -- | Options for writers
 data WriterOptions = WriterOptions
   { writerStandalone       :: Bool   -- ^ Include header and footer
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index d296888d6..64c07285d 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -48,8 +48,6 @@ module Text.Pandoc.Shared (
                      toRomanNumeral,
                      escapeURI,
                      tabFilter,
-                     -- * Media Handling
-                     MediaBag,
                      -- * Date/time
                      normalizeDate,
                      -- * Pandoc block and inline list processing
@@ -119,7 +117,6 @@ import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),
          renderOptions)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as B8
-import qualified Data.ByteString.Lazy as BL
 import Text.Pandoc.Compat.Monoid
 import Data.ByteString.Base64 (decodeLenient)
 import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)
@@ -286,14 +283,6 @@ tabFilter tabStop =
         x : go (spsToNextStop - 1) xs
   in  go tabStop
 
----
---- Media handling
----
-
--- | A map of media paths to their binary representations.
-
-type MediaBag = M.Map String BL.ByteString
-
 --
 -- Date/time
 --