24f7076 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Improvements to markdown attributes syntax (on code blocks).

24f7076John MacFarlane15 years ago

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

@@ -390,8 +390,8 @@ blockDelimiter f len = try $ do

390attributes :: GenParser Char st ([Char], [[Char]], [([Char], [Char])])

391attributes = try $ do

392 char '{'

393− many spaceChar

393+ spnl

394− attrs <- many (attribute >>~ many spaceChar)

394+ attrs <- many (attribute >>~ spnl)

395 char '}'

396 let (ids, classes, keyvals) = unzip3 attrs

397 let firstNonNull [] = ""

@@ -424,8 +424,9 @@ keyValAttr :: GenParser Char st ([Char], [a], [([Char], [Char])])

424keyValAttr = try $ do

425 key <- identifier

426 char '='

427− char '"'

427+ val <- enclosed (char '"') (char '"') anyChar

428− val <- manyTill (satisfy (/='\n')) (char '"')

428+ <|> enclosed (char '\'') (char '\'') anyChar

429+ <|> many nonspaceChar

429 return ("",[],[(key,val)])

430 return ("",[],[(key,val)])

430

431

431codeBlockDelimited :: GenParser Char st Block

432codeBlockDelimited :: GenParser Char st Block