06b5443 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Factored codeBlock into separate codeBlockIndented and codeBlockDelimited.

06b5443fiddlosopher19 years ago

Text/Pandoc/Readers/Markdown.hs+4−5

@@ -230,7 +230,7 @@ block = do

230 st <- getState

231 choice (if stateStrict st

232 then [ header

233− , codeBlock

233+ , codeBlockIndented

234 , blockQuote

235 , hrule

236 , bulletList

@@ -239,9 +239,10 @@ block = do

239 , para

240 , plain

241 , nullBlock ]

242+ else [ codeBlockDelimited

242− else [ header

243+ , header

243 , table

244 , table

244− , codeBlock

245+ , codeBlockIndented

245 , blockQuote

246 , blockQuote

246 , hrule

247 , hrule

247 , bulletList

248 , bulletList

@@ -295,8 +296,6 @@ hrule = try $ do

295

296

296indentedLine = indentSpaces >> manyTill anyChar newline >>= return . (++ "\n")

297indentedLine = indentSpaces >> manyTill anyChar newline >>= return . (++ "\n")

297

298

298−codeBlock = codeBlockIndented <|> codeBlockDelimited

299−

300codeBlockDelimiter len = try $ do

299codeBlockDelimiter len = try $ do

301 size <- case len of

300 size <- case len of

302 Just l -> count l (char '~') >> many (char '~') >> return l

301 Just l -> count l (char '~') >> many (char '~') >> return l