Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
John MacFarlane 2012-04-24 19:34:53 -04:00
parent a0fa8f92f1
commit f67a80cea2
3 changed files with 8 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pandoc.cabal
View file

@ -185,9 +185,6 @@ Flag library
Flag tests
Description: Build test-pandoc.
Default: False
Flag blaze_html_0_5
Description: Use blaze-html 0.5 and blaze-markup 0.5
Default: False
Library
-- Note: the following is duplicated in all stanzas.
@ -195,6 +192,8 @@ Library
-- BEGIN DUPLICATED SECTION
Build-Depends: containers >= 0.1 && < 0.5,
parsec >= 3.1 && < 3.2,
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6,
mtl >= 1.1 && < 2.2,
network >= 2 && < 2.4,
filepath >= 1.1 && < 1.4,
@ -218,13 +217,6 @@ Library
zlib >= 0.5 && < 0.6,
highlighting-kate >= 0.5.0.2 && < 0.6,
temporary >= 1.1 && < 1.2
if flag(blaze_html_0_5)
build-depends:
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6
else
build-depends:
blaze-html >= 0.4.3.0 && < 0.5
if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4
else
@ -299,6 +291,8 @@ Executable pandoc
-- It needs to be duplicated because of the library & executable flags.
-- BEGIN DUPLICATED SECTION
Build-Depends: containers >= 0.1 && < 0.5,
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6,
parsec >= 3.1 && < 3.2,
mtl >= 1.1 && < 2.2,
network >= 2 && < 2.4,
@ -323,13 +317,6 @@ Executable pandoc
zlib >= 0.5 && < 0.6,
highlighting-kate >= 0.5.0.2 && < 0.6,
temporary >= 1.1 && < 1.2
if flag(blaze_html_0_5)
build-depends:
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6
else
build-depends:
blaze-html >= 0.4.3.0 && < 0.5
if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4
else
@ -363,6 +350,8 @@ Executable test-pandoc
-- It needs to be duplicated because of the library & executable flags.
-- BEGIN DUPLICATED SECTION
Build-Depends: containers >= 0.1 && < 0.5,
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6,
parsec >= 3.1 && < 3.2,
mtl >= 1.1 && < 2.2,
network >= 2 && < 2.4,
@ -387,13 +376,6 @@ Executable test-pandoc
zlib >= 0.5 && < 0.6,
highlighting-kate >= 0.5.0.2 && < 0.6,
temporary >= 1.1 && < 1.2
if flag(blaze_html_0_5)
build-depends:
blaze-html >= 0.5 && < 0.6,
blaze-markup >= 0.5.1 && < 0.6
else
build-depends:
blaze-html >= 0.4.3.0 && < 0.5
if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4
else

6
src/Text/Pandoc/Templates.hs
View file

@ -1,4 +1,4 @@
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP #-}
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
{-
Copyright (C) 2009-2010 John MacFarlane <jgm@berkeley.edu>
@ -72,12 +72,8 @@ import Text.ParserCombinators.Parsec
import Control.Monad (liftM, when, forM)
import System.FilePath
import Data.List (intercalate, intersperse)
#if MIN_VERSION_blaze_html(0,5,0)
import Text.Blaze.Html (Html)
import Text.Blaze.Internal (preEscapedString)
#else
import Text.Blaze (preEscapedString, Html)
#endif
import Data.ByteString.Lazy.UTF8 (ByteString, fromString)
import Text.Pandoc.Shared (readDataFile)
import qualified Control.Exception.Extensible as E (try, IOException)

6
src/Text/Pandoc/Writers/HTML.hs
View file

@ -1,4 +1,4 @@
{-# LANGUAGE OverloadedStrings, CPP #-}
{-# LANGUAGE OverloadedStrings #-}
{-# OPTIONS_GHC -fno-warn-deprecations #-}
{-
Copyright (C) 2006-2010 John MacFarlane <jgm@berkeley.edu>
@ -46,12 +46,8 @@ import Data.List ( isPrefixOf, intersperse )
import Data.String ( fromString )
import Data.Maybe ( catMaybes )
import Control.Monad.State
#if MIN_VERSION_blaze_html(0,5,0)
import Text.Blaze.Html hiding(contents)
import Text.Blaze.Internal(preEscapedString)
#else
import Text.Blaze
#endif
import qualified Text.Blaze.Html5 as H5
import qualified Text.Blaze.XHtml1.Transitional as H
import qualified Text.Blaze.XHtml1.Transitional.Attributes as A