f67a80c · typeable/pandoc

git.iko.soy/typeable/pandoc

Removed blaze_html_05 flag -- require blaze >= 0.5 by default.

commitf67a80cea27286ba17b3696198602a6bbdae014d authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 24 Apr 2012, 19:34 (15 years ago) parenta0fa8f9

3 files changed+8−34

compare with master

unifiedsplit

pandoc.cabal+6−24 src/Text/Pandoc/Templates.hs+1−5 src/Text/Pandoc/Writers/HTML.hs+1−5

pandoc.cabal+6−24

@@ -185,9 +185,6 @@ Flag library

185185Flag tests

186186 Description: Build test-pandoc.

187187 Default: False

188−Flag blaze_html_0_5

189− Description: Use blaze-html 0.5 and blaze-markup 0.5

190− Default: False

191188

192189Library

193190 -- Note: the following is duplicated in all stanzas.

@@ -195,6 +192,8 @@ Library

195192 -- BEGIN DUPLICATED SECTION

196193 Build-Depends: containers >= 0.1 && < 0.5,

197194 parsec >= 3.1 && < 3.2,

195+ blaze-html >= 0.5 && < 0.6,

196+ blaze-markup >= 0.5.1 && < 0.6,

198197 mtl >= 1.1 && < 2.2,

199198 network >= 2 && < 2.4,

200199 filepath >= 1.1 && < 1.4,

@@ -218,13 +217,6 @@ Library

218217 zlib >= 0.5 && < 0.6,

219218 highlighting-kate >= 0.5.0.2 && < 0.6,

220219 temporary >= 1.1 && < 1.2

221− if flag(blaze_html_0_5)

222− build-depends:

223− blaze-html >= 0.5 && < 0.6,

224− blaze-markup >= 0.5.1 && < 0.6

225− else

226− build-depends:

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

228220 if impl(ghc >= 6.10)

229221 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

230222 else

@@ -299,6 +291,8 @@ Executable pandoc

299291 -- It needs to be duplicated because of the library & executable flags.

300292 -- BEGIN DUPLICATED SECTION

301293 Build-Depends: containers >= 0.1 && < 0.5,

294+ blaze-html >= 0.5 && < 0.6,

295+ blaze-markup >= 0.5.1 && < 0.6,

302296 parsec >= 3.1 && < 3.2,

303297 mtl >= 1.1 && < 2.2,

304298 network >= 2 && < 2.4,

@@ -323,13 +317,6 @@ Executable pandoc

323317 zlib >= 0.5 && < 0.6,

324318 highlighting-kate >= 0.5.0.2 && < 0.6,

325319 temporary >= 1.1 && < 1.2

326− if flag(blaze_html_0_5)

327− build-depends:

328− blaze-html >= 0.5 && < 0.6,

329− blaze-markup >= 0.5.1 && < 0.6

330− else

331− build-depends:

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

333320 if impl(ghc >= 6.10)

334321 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

335322 else

@@ -363,6 +350,8 @@ Executable test-pandoc

363350 -- It needs to be duplicated because of the library & executable flags.

364351 -- BEGIN DUPLICATED SECTION

365352 Build-Depends: containers >= 0.1 && < 0.5,

353+ blaze-html >= 0.5 && < 0.6,

354+ blaze-markup >= 0.5.1 && < 0.6,

366355 parsec >= 3.1 && < 3.2,

367356 mtl >= 1.1 && < 2.2,

368357 network >= 2 && < 2.4,

@@ -387,13 +376,6 @@ Executable test-pandoc

387376 zlib >= 0.5 && < 0.6,

388377 highlighting-kate >= 0.5.0.2 && < 0.6,

389378 temporary >= 1.1 && < 1.2

390− if flag(blaze_html_0_5)

391− build-depends:

392− blaze-html >= 0.5 && < 0.6,

393− blaze-markup >= 0.5.1 && < 0.6

394− else

395− build-depends:

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

397379 if impl(ghc >= 6.10)

398380 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

399381 else

src/Text/Pandoc/Templates.hs+1−5

@@ -1,4 +1,4 @@

1−{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP #-}

1+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}

22{-

@@ -72,12 +72,8 @@ import Text.ParserCombinators.Parsec

7272import Control.Monad (liftM, when, forM)

7373import System.FilePath

7474import Data.List (intercalate, intersperse)

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

7675import Text.Blaze.Html (Html)

7776import Text.Blaze.Internal (preEscapedString)

78−#else

79−import Text.Blaze (preEscapedString, Html)

80−#endif

8177import Data.ByteString.Lazy.UTF8 (ByteString, fromString)

8278import Text.Pandoc.Shared (readDataFile)

8379import qualified Control.Exception.Extensible as E (try, IOException)

src/Text/Pandoc/Writers/HTML.hs+1−5

@@ -1,4 +1,4 @@

1−{-# LANGUAGE OverloadedStrings, CPP #-}

1+{-# LANGUAGE OverloadedStrings #-}

22{-# OPTIONS_GHC -fno-warn-deprecations #-}

33{-

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

4646import Data.String ( fromString )

4747import Data.Maybe ( catMaybes )

4848import Control.Monad.State

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

5049import Text.Blaze.Html hiding(contents)

5150import Text.Blaze.Internal(preEscapedString)

52−#else

53−import Text.Blaze

54−#endif

5551import qualified Text.Blaze.Html5 as H5

5652import qualified Text.Blaze.XHtml1.Transitional as H

5753import qualified Text.Blaze.XHtml1.Transitional.Attributes as A