Moved MediaBag back from Shared to Options, to avoid module cycle.
This commit is contained in:
parent
77aa72ec24
commit
67c5c7a575
3 changed files with 13 additions and 6 deletions
|
@ -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)
|
||||
|
|
|
@ -42,7 +42,6 @@ module Text.Pandoc.Options ( Extension(..)
|
|||
, EPUBVersion (..)
|
||||
, WriterOptions (..)
|
||||
, TrackChanges (..)
|
||||
, MediaBag
|
||||
, def
|
||||
, isEnabled
|
||||
) where
|
||||
|
@ -50,7 +49,7 @@ 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 Text.Pandoc.Shared (MediaBag)
|
||||
import qualified Data.Map as M
|
||||
|
||||
-- | Individually selectable syntax extensions.
|
||||
|
@ -277,9 +276,6 @@ 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
|
||||
|
|
|
@ -48,6 +48,8 @@ module Text.Pandoc.Shared (
|
|||
toRomanNumeral,
|
||||
escapeURI,
|
||||
tabFilter,
|
||||
-- * Media Handling
|
||||
MediaBag,
|
||||
-- * Date/time
|
||||
normalizeDate,
|
||||
-- * Pandoc block and inline list processing
|
||||
|
@ -117,6 +119,7 @@ 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)
|
||||
|
@ -283,6 +286,14 @@ 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
|
||||
--
|
||||
|
|
Loading…
Add table
Reference in a new issue