db7e617 · elk · git.iko.soy

elm/Elm.cabal+2−2

compare with master

unifiedsplit

@@ -71,7 +71,7 @@ Library

71 text,

72 template-haskell,

73 shakespeare >= 1,

74− pandoc,

74+ pandoc >= 1.10,

75 bytestring,

76 hjsmin,

77 indents,

@@ -116,7 +116,7 @@ Executable elm

116 blaze-markup == 0.5.1.*,

117 deepseq,

118 cmdargs,

119− pandoc,

119+ pandoc >= 1.10,

120 bytestring,

121 hjsmin,

122 indents,

elm/src/Gen/CompileToJS.hs+1−2

@@ -242,8 +242,7 @@ instance ToJS Expr where

242

243 Markdown doc -> return $ "text('" ++ pad ++ md ++ pad ++ "')"

244 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

247

246

248formatMarkdown = concatMap f

247formatMarkdown = concatMap f

249 where f '\'' = "\\'"

248 where f '\'' = "\\'"

elm/src/Gen/ExtractNoscript.hs+1−1

@@ -48,7 +48,7 @@ instance Extract Expr where

48 Var _ -> []

49 Case e cases -> concatMap (f . snd) cases

50 Data _ es -> concatMap f es

51− Markdown doc -> [ Pan.writeHtmlString Pan.defaultWriterOptions doc ]

51+ Markdown doc -> [ Pan.writeHtmlString Pan.def doc ]

52 _ -> []

53

54linkExtract src txt =

elm/src/Parse/Expr.hs+1−1

@@ -61,7 +61,7 @@ listTerm :: IParser Expr

61listTerm =

62 (do { try $ string "[markdown|"

63 ; md <- filter (/='\r') <$> manyTill anyChar (try $ string "|]")

64− ; return . Markdown $ Pan.readMarkdown Pan.defaultParserState md })

64+ ; return . Markdown $ Pan.readMarkdown Pan.def md })

65 <|> (braces $ choice

66 [ try $ do { lo <- expr; whitespace; string ".." ; whitespace

67 ; Range lo <$> expr }