d9584d7 · typeable/pandoc

src/Text/Pandoc/Parsing.hs+1

compare with master

unifiedsplit

@@ -180,6 +180,7 @@ module Text.Pandoc.Parsing ( takeWhileP,

180 sourceLine,

181 setSourceColumn,

182 setSourceLine,

183+ incSourceColumn,

183 newPos,

184 newPos,

184 Line,

185 Line,

185 Column

186 Column

src/Text/Pandoc/Readers/Markdown.hs+21−13

@@ -148,19 +148,27 @@ litChar = escapedChar'

148-- | Parse a sequence of inline elements between square brackets,

149-- including inlines between balanced pairs of square brackets.

150inlinesInBalancedBrackets :: PandocMonad m => MarkdownParser m (F Inlines)

151−inlinesInBalancedBrackets = try $ char '[' >> go 1

151+inlinesInBalancedBrackets =

152+ try $ char '[' >> withRaw (go 1) >>=

153+ parseFromString inlines . stripBracket . snd

154+ where stripBracket [] = []

155+ stripBracket xs = if last xs == ']' then init xs else xs

152− where go :: PandocMonad m => Int -> MarkdownParser m (F Inlines)

156+ go :: PandocMonad m => Int -> MarkdownParser m ()

153− go 0 = return mempty

157+ go 0 = return ()

154− go openBrackets =

158+ go openBrackets = do

155− (mappend <$> (bracketedSpan <|> link <|> image) <*>

159+ (() <$ (escapedChar <|>

160+ code <|>

161+ rawHtmlInline <|>

156− go openBrackets)

162+ rawLaTeXInline') >> go openBrackets)

157− <|> ((if openBrackets > 1

163+ <|>

158− then (return (B.str "]") <>)

164+ (do char ']'

159− else id) <$>

165+ if openBrackets > 1

160− (char ']' >> go (openBrackets - 1)))

166+ then go (openBrackets - 1)

161− <|> ((return (B.str "[") <>) <$>

167+ else return ())

168+ <|>

162− (char '[' >> go (openBrackets + 1)))

169+ (char '[' >> go (openBrackets + 1))

170+ <|>

163− <|> (mappend <$> inline <*> go openBrackets)

171+ (anyChar >> go openBrackets)

164

172

165--

173--

166-- document structure

174-- document structure

test/Tests/Readers/Markdown.hs+1−1

@@ -200,7 +200,7 @@ tests = [ testGroup "inline code"

200 ":smile: and :+1:" =?> para (text "😄 and 👍")

201 ]

202 , "unbalanced brackets" =:

203− "[[[[[[[[[[[hi" =?> para (text "[[[[[[[[[[[hi")

203+ "[[[[[[[[[[[[hi" =?> para (text "[[[[[[[[[[[[hi")

204 , testGroup "backslash escapes"

205 [ "in URL" =:

206 "[hi](/there\\))"

test/command/cite-in-inline-note.mdnew file+6

@@ -0,0 +1,6 @@

1+```

2+% pandoc -t native

3+foo^[bar [@doe]]

4+^D

5+[Para [Str "foo",Note [Para [Str "bar",Space,Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@doe]"]]]]]

6+```