summaryrefslogtreecommitdiff
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
parentb4232fdbda386478f394c10e16a7cb5216871828 (diff)
parentd52a1ec18f3344db5d2c835c0e2744a47042170e (diff)
Merge branch 'master' of github.com:jgm/pandoc
-rw-r--r--README2
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs2
-rw-r--r--src/Text/Pandoc/Writers/EPUB.hs4
-rw-r--r--windows/make-windows-installer.bat4
4 files changed, 8 insertions, 4 deletions
diff --git a/README b/README
index 9b9c1c153..10683b352 100644
--- a/README
+++ b/README
@@ -1007,7 +1007,7 @@ other block quotes. That is, block quotes can be nested:
>
> > A block quote within a block quote.
-**Extension: `blank_line_before_blockquote`**
+**Extension: `blank_before_blockquote`**
Standard markdown syntax does not require a blank line before a block
quote. Pandoc does require this (except, of course, at the beginning of the
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
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 3611ee2db..5b38b4432 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -2,9 +2,9 @@
cd ..
cabal update
cabal-dev clean
-cabal-dev install --reinstall --force-reinstall --disable-library-for-ghci highlighting-kate
+cabal-dev install --reinstall --force-reinstall highlighting-kate
cabal-dev install --reinstall --force-reinstall --flags="embed_data_files" citeproc-hs
-cabal-dev install --flags="embed_data_files"
+cabal-dev install --reinstall --force-reinstall --flags="embed_data_files"
strip cabal-dev\bin\pandoc.exe
cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
copy COPYING COPYING.txt