555f9b7 · typeable/pandoc

src/Text/Pandoc.hs+1−1

compare with master

unifiedsplit

@@ -160,7 +160,7 @@ import Text.Pandoc.Writers.Haddock

160import Text.Pandoc.Writers.Custom

161import Text.Pandoc.Templates

162import Text.Pandoc.Options

163−import Text.Pandoc.Shared (safeRead, warn, MediaBag)

163+import Text.Pandoc.Shared (safeRead, warn)

164import Data.Aeson

165import qualified Data.ByteString.Lazy as BL

166import Data.List (intercalate)

src/Text/Pandoc/Options.hs+6

@@ -42,6 +42,7 @@ module Text.Pandoc.Options ( Extension(..)

42 , EPUBVersion (..)

43 , WriterOptions (..)

44 , TrackChanges (..)

45+ , MediaBag

45 , def

46 , def

46 , isEnabled

47 , isEnabled

47 ) where

48 ) where

@@ -49,6 +50,8 @@ import Data.Set (Set)

49import qualified Data.Set as Set

50import qualified Data.Set as Set

50import Data.Default

51import Data.Default

51import Text.Pandoc.Highlighting (Style, pygments)

52import Text.Pandoc.Highlighting (Style, pygments)

53+import qualified Data.ByteString.Lazy as BL

54+import qualified Data.Map as M

52

55

53-- | Individually selectable syntax extensions.

56-- | Individually selectable syntax extensions.

54data Extension =

57data Extension =

@@ -274,6 +277,9 @@ data TrackChanges = AcceptChanges

274 | AllChanges

277 | AllChanges

275 deriving (Show, Read, Eq)

278 deriving (Show, Read, Eq)

276

279

280+-- | A map of media paths to their binary representations.

281+type MediaBag = M.Map String BL.ByteString

282+

277-- | Options for writers

283-- | Options for writers

278data WriterOptions = WriterOptions

284data WriterOptions = WriterOptions

279 { writerStandalone :: Bool -- ^ Include header and footer

285 { writerStandalone :: Bool -- ^ Include header and footer

src/Text/Pandoc/Shared.hs−11

@@ -48,8 +48,6 @@ module Text.Pandoc.Shared (

48 toRomanNumeral,

49 escapeURI,

50 tabFilter,

51− -- * Media Handling

52− MediaBag,

53 -- * Date/time

51 -- * Date/time

54 normalizeDate,

52 normalizeDate,

55 -- * Pandoc block and inline list processing

53 -- * Pandoc block and inline list processing

@@ -119,7 +117,6 @@ import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),

119 renderOptions)

117 renderOptions)

120import qualified Data.ByteString as BS

118import qualified Data.ByteString as BS

121import qualified Data.ByteString.Char8 as B8

119import qualified Data.ByteString.Char8 as B8

122−import qualified Data.ByteString.Lazy as BL

123import Text.Pandoc.Compat.Monoid

120import Text.Pandoc.Compat.Monoid

124import Data.ByteString.Base64 (decodeLenient)

121import Data.ByteString.Base64 (decodeLenient)

125import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)

122import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)

@@ -286,14 +283,6 @@ tabFilter tabStop =

286 x : go (spsToNextStop - 1) xs

283 x : go (spsToNextStop - 1) xs

287 in go tabStop

284 in go tabStop

288

285

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−

297--

286--

298-- Date/time

287-- Date/time

299--

288--