Update to work with pandoc >= 1.10. Hopefully this is not another annoying change in which people cannot get 1.10 working on their machine.
commitdb7e6177e08bc103f06fa04091c3540a2b460841
authorevancz <info@elm-lang.org>
dateFri 25 Jan 2013, 02:31 (14 years ago)
parent484e7ab
elm/Elm.cabal+2−2
@@ -71,7 +71,7 @@ Library
7171 text,
7272 template-haskell,
7373 shakespeare >= 1,
74− pandoc,
74+ pandoc >= 1.10,
7575 bytestring,
7676 hjsmin,
7777 indents,
@@ -116,7 +116,7 @@ Executable elm
116116 blaze-markup == 0.5.1.*,
117117 deepseq,
118118 cmdargs,
119− pandoc,
119+ pandoc >= 1.10,
120120 bytestring,
121121 hjsmin,
122122 indents,
elm/src/Gen/CompileToJS.hs+1−2
@@ -242,8 +242,7 @@ instance ToJS Expr where
242242
243243 Markdown doc -> return $ "text('" ++ pad ++ md ++ pad ++ "')"
244244 where pad = "<div style=\"height:0;width:0;\"> </div>"
245− md = formatMarkdown $
246− Pan.writeHtmlString Pan.defaultWriterOptions doc
245+ md = formatMarkdown $ Pan.writeHtmlString Pan.def doc
247246
248247formatMarkdown = concatMap f
249248 where f '\'' = "\\'"
elm/src/Gen/ExtractNoscript.hs+1−1
@@ -48,7 +48,7 @@ instance Extract Expr where
4848 Var _ -> []
4949 Case e cases -> concatMap (f . snd) cases
5050 Data _ es -> concatMap f es
51− Markdown doc -> [ Pan.writeHtmlString Pan.defaultWriterOptions doc ]
51+ Markdown doc -> [ Pan.writeHtmlString Pan.def doc ]
5252 _ -> []
5353
5454linkExtract src txt =
elm/src/Parse/Expr.hs+1−1
@@ -61,7 +61,7 @@ listTerm :: IParser Expr
6161listTerm =
6262 (do { try $ string "[markdown|"
6363 ; md <- filter (/='\r') <$> manyTill anyChar (try $ string "|]")
64− ; return . Markdown $ Pan.readMarkdown Pan.defaultParserState md })
64+ ; return . Markdown $ Pan.readMarkdown Pan.def md })
6565 <|> (braces $ choice
6666 [ try $ do { lo <- expr; whitespace; string ".." ; whitespace
6767 ; Range lo <$> expr }