94ed282 · typeable/pandoc

README+1−1

compare with master

unifiedsplit

@@ -1007,7 +1007,7 @@ other block quotes. That is, block quotes can be nested:

1007 >

1008 > > A block quote within a block quote.

1009

1010−**Extension: `blank_line_before_blockquote`**

1010+**Extension: `blank_before_blockquote`**

1011

1012Standard markdown syntax does not require a blank line before a block

1013quote. 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

358 , codeBlockBackticks

359 , guardEnabled Ext_latex_macros *> (mempty <$ macro)

360 , header

361+ , lhsCodeBlock

361 , rawTeXBlock

362 , rawTeXBlock

362 , htmlBlock

363 , htmlBlock

363 , lineBlock

364 , lineBlock

364 , table

365 , table

365 , codeBlockIndented

366 , codeBlockIndented

366− , lhsCodeBlock

367 , blockQuote

368 , hrule

369 , bulletList

src/Text/Pandoc/Writers/EPUB.hs+4

@@ -56,7 +56,11 @@ import Network.URI ( unEscapeString )

56import Text.Pandoc.MIME (getMimeType)

57import Prelude hiding (catch)

58import Control.Exception (catch, SomeException)

59+#if MIN_VERSION_blaze_html(0,5,0)

59import Text.Blaze.Html.Renderer.Utf8 (renderHtml)

60import Text.Blaze.Html.Renderer.Utf8 (renderHtml)

61+#else

62+import Text.Blaze.Renderer.Utf8 (renderHtml)

63+#endif

60

64

61-- | Produce an EPUB file from a Pandoc document.

65-- | Produce an EPUB file from a Pandoc document.

62writeEPUB :: WriterOptions -- ^ Writer options

66writeEPUB :: WriterOptions -- ^ Writer options

windows/make-windows-installer.bat+2−2

@@ -2,9 +2,9 @@

2cd ..

3cabal update

4cabal-dev clean

5−cabal-dev install --reinstall --force-reinstall --disable-library-for-ghci highlighting-kate

5+cabal-dev install --reinstall --force-reinstall highlighting-kate

6cabal-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"

8strip cabal-dev\bin\pandoc.exe

9cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html

10copy COPYING COPYING.txt