7d9f2d3 · typeable/pandoc

git.iko.soy/typeable/pandoc

Remove blaze-html CPP conditional.

This tests for a min value >= 0.5. But we have a lower bound of 0.5 in pandoc.cabal, so the test will always pass. (If we bump the lower bound to 0.5.1, we can remove a conditional in the HTML writer as well.)

commit7d9f2d36570b9a910853985251079f0aa032cc9e authorJesse Rosenthal <jrosenthal@jhu.edu> dateSat 3 Sep 2016, 08:32 (10 years ago) parentdf1ca2b

1 file changed+1−5

compare with master

unifiedsplit

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

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

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

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

1+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances,

22 OverloadedStrings, GeneralizedNewtypeDeriving #-}

33{-

@@ -108,12 +108,8 @@ import qualified Data.Map as M

108108import qualified Data.HashMap.Strict as H

109109import Data.Foldable (toList)

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

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

112111import Text.Blaze.Html (Html)

113112import Text.Blaze.Internal (preEscapedText)

114−#else

115−import Text.Blaze (preEscapedText, Html)

116−#endif

117113import Data.ByteString.Lazy (ByteString, fromChunks)

118114import Text.Pandoc.Shared (readDataFileUTF8, ordNub)

119115import Data.Vector ((!?))