6c32afc · typeable/pandoc

git.iko.soy/typeable/pandoc

Updated to use cmark >= 0.4.

commit6c32afc3c4c6b4d37759c2c197a6a3350c8f32d4 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 14 Jul 2015, 22:51 (11 years ago) parent9e0fb84

2 files changed+5−5

unifiedsplit

pandoc.cabal+1−1

@@ -275,7 +275,7 @@ Library

275275 deepseq-generics >= 0.1 && < 0.2,

276276 JuicyPixels >= 3.1.6.1 && < 3.3,

277277 filemanip >= 0.3 && < 0.4,

278− cmark >= 0.3.4 && < 0.4

278+ cmark >= 0.4.0.1 && < 0.5

279279 if flag(old-locale)

280280 Build-Depends: old-locale >= 1 && < 1.1,

281281 time >= 1.2 && < 1.5

src/Text/Pandoc/Writers/CommonMark.hs+4−4

@@ -76,8 +76,8 @@ blocksToCommonMark opts bs = return $

7676 $ node DOCUMENT (blocksToNodes bs)

7777 where cmarkOpts = [optHardBreaks | isEnabled Ext_hard_line_breaks opts]

7878 colwidth = if writerWrapText opts

79− then writerColumns opts

80− else 0

79+ then Just $ writerColumns opts

80+ else Nothing

8181

8282inlinesToCommonMark :: WriterOptions -> [Inline] -> Identity String

8383inlinesToCommonMark opts ils = return $

@@ -85,8 +85,8 @@ inlinesToCommonMark opts ils = return $

8585 $ node PARAGRAPH (inlinesToNodes ils)

8686 where cmarkOpts = [optHardBreaks | isEnabled Ext_hard_line_breaks opts]

8787 colwidth = if writerWrapText opts

88− then writerColumns opts

89− else 0

88+ then Just $ writerColumns opts

89+ else Nothing

9090

9191blocksToNodes :: [Block] -> [Node]

9292blocksToNodes = foldr blockToNodes []