ba1e74d · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Removed blaze_html_0_5 flag, require blaze-html >= 0.5.

ba1e74dJohn MacFarlane14 years ago

pandoc.cabal+1−9

compare with master

unifiedsplit

@@ -215,9 +215,6 @@ Source-repository head

215 type: git

216 location: git://github.com/jgm/pandoc.git

217

218−Flag blaze_html_0_5

219− Description: Use blaze-html >= 0.5 and blaze-markup >= 0.5

220− Default: True

221Flag embed_data_files

218Flag embed_data_files

222 Description: Embed data files in binary for relocatable executable.

219 Description: Embed data files in binary for relocatable executable.

223 Default: False

220 Default: False

@@ -250,14 +247,9 @@ Library

250 zlib >= 0.5 && < 0.6,

247 zlib >= 0.5 && < 0.6,

251 highlighting-kate >= 0.5.3.7 && < 0.6,

248 highlighting-kate >= 0.5.3.7 && < 0.6,

252 data-default >= 0.4 && < 0.6,

249 data-default >= 0.4 && < 0.6,

253− temporary >= 1.1 && < 1.2

250+ temporary >= 1.1 && < 1.2,

254− if flag(blaze_html_0_5)

255− build-depends:

256 blaze-html >= 0.5 && < 0.7,

251 blaze-html >= 0.5 && < 0.7,

257 blaze-markup >= 0.5.1 && < 0.6

252 blaze-markup >= 0.5.1 && < 0.6

258− else

259− build-depends:

260− blaze-html >= 0.4.3.0 && < 0.5

261 if flag(embed_data_files)

253 if flag(embed_data_files)

262 cpp-options: -DEMBED_DATA_FILES

254 cpp-options: -DEMBED_DATA_FILES

263 -- build-tools: hsb2hs

255 -- build-tools: hsb2hs

src/Text/Pandoc/Writers/HTML.hs−4

@@ -47,12 +47,8 @@ import Data.List ( isPrefixOf, intersperse )

47import Data.String ( fromString )

48import Data.Maybe ( catMaybes )

49import Control.Monad.State

50−#if MIN_VERSION_blaze_html(0,5,0)

51import Text.Blaze.Html hiding(contents)

50import Text.Blaze.Html hiding(contents)

52import Text.Blaze.Internal(preEscapedString)

51import Text.Blaze.Internal(preEscapedString)

53−#else

54−import Text.Blaze

55−#endif

56#if MIN_VERSION_blaze_html(0,5,1)

52#if MIN_VERSION_blaze_html(0,5,1)

57import qualified Text.Blaze.XHtml5 as H5

53import qualified Text.Blaze.XHtml5 as H5

58#else

54#else