Merge branch 'master' of github.com:jgm/pandoc
commit94ed282adf39a019a4c68dffd182e2743c651688
authorJohn MacFarlane <jgm@berkeley.edu>
dateTue 22 Jan 2013, 10:26 (14 years ago)
parentb4232fdd52a1ec
README+1−1
@@ -1007,7 +1007,7 @@ other block quotes. That is, block quotes can be nested:
10071007 >
10081008 > > A block quote within a block quote.
10091009
1010−**Extension: `blank_line_before_blockquote`**
1010+**Extension: `blank_before_blockquote`**
10111011
10121012Standard markdown syntax does not require a blank line before a block
10131013quote. Pandoc does require this (except, of course, at the beginning of the
src/Text/Pandoc/Readers/Markdown.hs+1−1
@@ -358,12 +358,12 @@ block = choice [ codeBlockFenced
358358 , codeBlockBackticks
359359 , guardEnabled Ext_latex_macros *> (mempty <$ macro)
360360 , header
361+ , lhsCodeBlock
361362 , rawTeXBlock
362363 , htmlBlock
363364 , lineBlock
364365 , table
365366 , codeBlockIndented
366− , lhsCodeBlock
367367 , blockQuote
368368 , hrule
369369 , bulletList
src/Text/Pandoc/Writers/EPUB.hs+4
@@ -56,7 +56,11 @@ import Network.URI ( unEscapeString )
5656import Text.Pandoc.MIME (getMimeType)
5757import Prelude hiding (catch)
5858import Control.Exception (catch, SomeException)
59+#if MIN_VERSION_blaze_html(0,5,0)
5960import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
61+#else
62+import Text.Blaze.Renderer.Utf8 (renderHtml)
63+#endif
6064
6165-- | Produce an EPUB file from a Pandoc document.
6266writeEPUB :: WriterOptions -- ^ Writer options
windows/make-windows-installer.bat+2−2
@@ -2,9 +2,9 @@
22cd ..
33cabal update
44cabal-dev clean
5−cabal-dev install --reinstall --force-reinstall --disable-library-for-ghci highlighting-kate
5+cabal-dev install --reinstall --force-reinstall highlighting-kate
66cabal-dev install --reinstall --force-reinstall --flags="embed_data_files" citeproc-hs
7−cabal-dev install --flags="embed_data_files"
7+cabal-dev install --reinstall --force-reinstall --flags="embed_data_files"
88strip cabal-dev\bin\pandoc.exe
99cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
1010copy COPYING COPYING.txt