aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2013-01-22 10:26:49 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2013-01-22 10:26:49 -0800
commit94ed282adf39a019a4c68dffd182e2743c651688 (patch)
treef2bdb4d82b0cd7c7b9a6f039dcf39464c83b9254 /src
parentb4232fdbda386478f394c10e16a7cb5216871828 (diff)
parentd52a1ec18f3344db5d2c835c0e2744a47042170e (diff)
downloadpandoc-94ed282adf39a019a4c68dffd182e2743c651688.tar.gz
Merge branch 'master' of github.com:jgm/pandoc
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs2
-rw-r--r--src/Text/Pandoc/Writers/EPUB.hs4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 2c6c47307..4eb17c16b 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -358,12 +358,12 @@ block = choice [ codeBlockFenced
, codeBlockBackticks
, guardEnabled Ext_latex_macros *> (mempty <$ macro)
, header
+ , lhsCodeBlock
, rawTeXBlock
, htmlBlock
, lineBlock
, table
, codeBlockIndented
- , lhsCodeBlock
, blockQuote
, hrule
, bulletList
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index 4155cca05..ea0e921cb 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -56,7 +56,11 @@ import Network.URI ( unEscapeString )
import Text.Pandoc.MIME (getMimeType)
import Prelude hiding (catch)
import Control.Exception (catch, SomeException)
+#if MIN_VERSION_blaze_html(0,5,0)
import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
+#else
+import Text.Blaze.Renderer.Utf8 (renderHtml)
+#endif
-- | Produce an EPUB file from a Pandoc document.
writeEPUB :: WriterOptions -- ^ Writer options