diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-04-24 19:34:53 -0400 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-04-24 19:34:53 -0400 |
| commit | f67a80cea27286ba17b3696198602a6bbdae014d (patch) | |
| tree | 132b39479dd070ca8637fabcaf8b153dde28292d | |
| parent | a0fa8f92f1eb1e2678f1d1e1bd9f86d6a1bfa9d5 (diff) | |
| download | pandoc-f67a80cea27286ba17b3696198602a6bbdae014d.tar.gz | |
Removed blaze_html_05 flag -- require blaze >= 0.5 by default.
| -rw-r--r-- | pandoc.cabal | 30 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 6 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 6 |
3 files changed, 8 insertions, 34 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index e6e3a48cd..2a9b3efa6 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -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 diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index dfdcd8e63..6e3369797 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -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) diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 59666da08..b647dcd4b 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -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 |