git.iko.soy/typeable/pandoc
on master help sign in
Moved MediaBag from Shared to Options.

This will allow us to put a MediaBag in WriterOptions.

commit555f9b746d19e24d962b9ae6ccb940810fdb2a08 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 30 Jul 2014, 13:00 (12 years ago) parentd3cf53a
3 files changed+7−12
compare with master
unifiedsplit
src/Text/Pandoc.hs+1−1 src/Text/Pandoc/Options.hs+6 src/Text/Pandoc/Shared.hs−11
src/Text/Pandoc.hs+1−1
@@ -160,7 +160,7 @@ import Text.Pandoc.Writers.Haddock
160160import Text.Pandoc.Writers.Custom
161161import Text.Pandoc.Templates
162162import Text.Pandoc.Options
163−import Text.Pandoc.Shared (safeRead, warn, MediaBag)
163+import Text.Pandoc.Shared (safeRead, warn)
164164import Data.Aeson
165165import qualified Data.ByteString.Lazy as BL
166166import Data.List (intercalate)
src/Text/Pandoc/Options.hs+6
@@ -42,6 +42,7 @@ module Text.Pandoc.Options ( Extension(..)
4242 , EPUBVersion (..)
4343 , WriterOptions (..)
4444 , TrackChanges (..)
45+ , MediaBag
4546 , def
4647 , isEnabled
4748 ) where
@@ -49,6 +50,8 @@ import Data.Set (Set)
4950import qualified Data.Set as Set
5051import Data.Default
5152import Text.Pandoc.Highlighting (Style, pygments)
53+import qualified Data.ByteString.Lazy as BL
54+import qualified Data.Map as M
5255
5356-- | Individually selectable syntax extensions.
5457data Extension =
@@ -274,6 +277,9 @@ data TrackChanges = AcceptChanges
274277 | AllChanges
275278 deriving (Show, Read, Eq)
276279
280+-- | A map of media paths to their binary representations.
281+type MediaBag = M.Map String BL.ByteString
282+
277283-- | Options for writers
278284data WriterOptions = WriterOptions
279285 { writerStandalone :: Bool -- ^ Include header and footer
src/Text/Pandoc/Shared.hs−11
@@ -48,8 +48,6 @@ module Text.Pandoc.Shared (
4848 toRomanNumeral,
4949 escapeURI,
5050 tabFilter,
51− -- * Media Handling
52− MediaBag,
5351 -- * Date/time
5452 normalizeDate,
5553 -- * Pandoc block and inline list processing
@@ -119,7 +117,6 @@ import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),
119117 renderOptions)
120118import qualified Data.ByteString as BS
121119import qualified Data.ByteString.Char8 as B8
122−import qualified Data.ByteString.Lazy as BL
123120import Text.Pandoc.Compat.Monoid
124121import Data.ByteString.Base64 (decodeLenient)
125122import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)
@@ -286,14 +283,6 @@ tabFilter tabStop =
286283 x : go (spsToNextStop - 1) xs
287284 in go tabStop
288285
289−---
290−--- Media handling
291−---
292−
293−-- | A map of media paths to their binary representations.
294−
295−type MediaBag = M.Map String BL.ByteString
296−
297286--
298287-- Date/time
299288--