diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-09-06 10:38:56 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-09-06 10:38:56 -0700 |
| commit | c9d1d97a28aed30ced534c486963e9fc62114396 (patch) | |
| tree | 091725c1b4469e5eb253809f49428dcd85fdc406 | |
| parent | c544f20d6fc2771a9a7bb4fe38e4cb9fe18e14d2 (diff) | |
Fixed footnotes bug in textile.
This affected notes occuring before punctuation, e.g.
`foo[1].`.
Closes #518.
| -rw-r--r-- | src/Text/Pandoc/Readers/Textile.hs | 5 | ||||
| -rw-r--r-- | tests/textile-reader.native | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs index 89f281ae8..5cda061ef 100644 --- a/src/Text/Pandoc/Readers/Textile.hs +++ b/src/Text/Pandoc/Readers/Textile.hs @@ -412,7 +412,7 @@ note = try $ do -- | Special chars markupChars :: [Char] -markupChars = "\\[]*#_@~-+^|%=" +markupChars = "\\*#_@~-+^|%=[]" -- | Break strings on following chars. Space tab and newline break for -- inlines breaking. Open paren breaks for mark. Quote, dash and dot @@ -430,7 +430,8 @@ hyphenedWords :: Parser [Char] ParserState String hyphenedWords = try $ do hd <- noneOf wordBoundaries tl <- many ( (noneOf wordBoundaries) <|> - try (oneOf markupChars <* lookAhead (noneOf wordBoundaries) ) ) + try (notFollowedBy' note *> oneOf markupChars + <* lookAhead (noneOf wordBoundaries) ) ) let wd = hd:tl option wd $ try $ (\r -> concat [wd, "-", r]) <$> (char '-' *> hyphenedWords) diff --git a/tests/textile-reader.native b/tests/textile-reader.native index 7532a8fda..84dc50516 100644 --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -155,4 +155,4 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) ,Para [Str "\174",Space,Str "Hi",Str "\174"] ,Para [Str "Hi",Str "\169",Str "2008",Space,Str "\169",Space,Str "2008"] ,Header 1 [Str "Footnotes"] -,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!",Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note."]],Str "."]]]] +,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note",Str "."]],Str "."]] |