mirror of
https://github.com/jgm/pandoc.git
synced 2026-09-24 15:44:59 +08:00
Fixed footnotes bug in textile.
This affected notes occuring before punctuation, e.g. `foo[1].`. Closes #518.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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 "."]]
|
||||
|
||||
Reference in New Issue
Block a user