Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Markdown reader: Fixed bug in code block attribute parser.

Browse source 
Previously the ID attribute got lost if it didn't come first.
Now attributes can come in any order.
This commit is contained in:
John MacFarlane 2012-01-28 12:36:51 -08:00
parent d1ded4b026
commit 0487eae7ee
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Text/Pandoc/Readers/Markdown.hs
View file

@ -394,13 +394,14 @@ attributes = try $ do
attrs <- many (attribute >>~ many spaceChar) attrs <- many (attribute >>~ many spaceChar)
char '}' char '}'
let (ids, classes, keyvals) = unzip3 attrs let (ids, classes, keyvals) = unzip3 attrs
let id' = if null ids then "" else head ids let firstNonNull [] = ""
return (id', concat classes, concat keyvals) firstNonNull (x:xs) | not (null x) = x
| otherwise = firstNonNull xs
return (firstNonNull $ reverse ids, concat classes, concat keyvals)
attribute :: GenParser Char st ([Char], [[Char]], [([Char], [Char])]) attribute :: GenParser Char st ([Char], [[Char]], [([Char], [Char])])
attribute = identifierAttr <|> classAttr <|> keyValAttr attribute = identifierAttr <|> classAttr <|> keyValAttr
identifier :: GenParser Char st [Char] identifier :: GenParser Char st [Char]
identifier = do identifier = do
first <- letter first <- letter