diff options
| -rw-r--r-- | pandoc.cabal | 9 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 3 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 160f864ad..2a9b3efa6 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -192,7 +192,8 @@ Library -- BEGIN DUPLICATED SECTION Build-Depends: containers >= 0.1 && < 0.5, parsec >= 3.1 && < 3.2, - blaze-html >= 0.4.3.0 && < 0.5, + 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, @@ -290,8 +291,9 @@ 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, - blaze-html >= 0.4.3.0 && < 0.5, mtl >= 1.1 && < 2.2, network >= 2 && < 2.4, filepath >= 1.1 && < 1.4, @@ -348,8 +350,9 @@ 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, - blaze-html >= 0.4.3.0 && < 0.5, mtl >= 1.1 && < 2.2, network >= 2 && < 2.4, filepath >= 1.1 && < 1.4, diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index 336efe453..6e3369797 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -72,7 +72,8 @@ import Text.ParserCombinators.Parsec import Control.Monad (liftM, when, forM) import System.FilePath import Data.List (intercalate, intersperse) -import Text.Blaze (preEscapedString, Html) +import Text.Blaze.Html (Html) +import Text.Blaze.Internal (preEscapedString) 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 f9bbe8796..b647dcd4b 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -46,7 +46,8 @@ import Data.List ( isPrefixOf, intersperse ) import Data.String ( fromString ) import Data.Maybe ( catMaybes ) import Control.Monad.State -import Text.Blaze +import Text.Blaze.Html hiding(contents) +import Text.Blaze.Internal(preEscapedString) import qualified Text.Blaze.Html5 as H5 import qualified Text.Blaze.XHtml1.Transitional as H import qualified Text.Blaze.XHtml1.Transitional.Attributes as A |