ba1e74d · typeable/pandoc

git.iko.soy/typeable/pandoc

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

Reason: < 0.5 does not provide a monoid instance for Attribute, which is now needed by the HTML writer. Closes #803.

commitba1e74dcd7a3db8af3653f59416fc2740730b320 authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 26 Mar 2013, 11:38 (14 years ago) parent40f0a6d

2 files changed+1−13

compare with master

unifiedsplit

pandoc.cabal+1−9 src/Text/Pandoc/Writers/HTML.hs−4

pandoc.cabal+1−9

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

215215 type: git

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

217217

218−Flag blaze_html_0_5

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

220− Default: True

221218Flag embed_data_files

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

223220 Default: False

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

250247 zlib >= 0.5 && < 0.6,

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

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

253− temporary >= 1.1 && < 1.2

254− if flag(blaze_html_0_5)

255− build-depends:

250+ temporary >= 1.1 && < 1.2,

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

257252 blaze-markup >= 0.5.1 && < 0.6

258− else

259− build-depends:

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

261253 if flag(embed_data_files)

262254 cpp-options: -DEMBED_DATA_FILES

263255 -- build-tools: hsb2hs

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

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

4747import Data.String ( fromString )

4848import Data.Maybe ( catMaybes )

4949import Control.Monad.State

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

5150import Text.Blaze.Html hiding(contents)

5251import Text.Blaze.Internal(preEscapedString)

53−#else

54−import Text.Blaze

55−#endif

5652#if MIN_VERSION_blaze_html(0,5,1)

5753import qualified Text.Blaze.XHtml5 as H5

5854#else