Markdown reader: Improved inlinesInBalancedBrackets.

The change both improves performance and fixes a
regression whereby normal citations inside inline notes
were not parsed correctly.

Closes jgm/pandoc-citeproc#315.

2 files changed, 22 insertions, 13 deletions

diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs
index 9573d7875..f1b823965 100644
--- a/src/Text/Pandoc/Parsing.hs
+++ b/src/Text/Pandoc/Parsing.hs
@@ -180,6 +180,7 @@ module Text.Pandoc.Parsing ( takeWhileP,
                              sourceLine,
                              setSourceColumn,
                              setSourceLine,
+                             incSourceColumn,
                              newPos,
                              Line,
                              Column
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index aaefa5ba1..b76ff498b 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -148,19 +148,27 @@ litChar = escapedChar'
 -- | Parse a sequence of inline elements between square brackets,
 -- including inlines between balanced pairs of square brackets.
 inlinesInBalancedBrackets :: PandocMonad m => MarkdownParser m (F Inlines)
-inlinesInBalancedBrackets = try $ char '[' >> go 1
-  where go :: PandocMonad m => Int -> MarkdownParser m (F Inlines)
-        go 0 = return mempty
-        go openBrackets =
-                    (mappend <$> (bracketedSpan <|> link <|> image) <*>
-                         go openBrackets)
-                   <|> ((if openBrackets > 1
-                            then (return (B.str "]") <>)
-                            else id) <$>
-                             (char ']' >> go (openBrackets - 1)))
-                   <|> ((return (B.str "[") <>) <$>
-                             (char '[' >> go (openBrackets + 1)))
-                   <|> (mappend <$> inline <*> go openBrackets)
+inlinesInBalancedBrackets =
+  try $ char '[' >> withRaw (go 1) >>=
+          parseFromString inlines . stripBracket . snd
+  where stripBracket [] = []
+        stripBracket xs = if last xs == ']' then init xs else xs
+        go :: PandocMonad m => Int -> MarkdownParser m ()
+        go 0 = return ()
+        go openBrackets = do
+          (() <$ (escapedChar <|>
+                  code <|>
+                  rawHtmlInline <|>
+                  rawLaTeXInline') >> go openBrackets)
+          <|>
+          (do char ']'
+              if openBrackets > 1
+                 then go (openBrackets - 1)
+                 else return ())
+          <|>
+          (char '[' >> go (openBrackets + 1))
+          <|>
+          (anyChar >> go openBrackets)
 
 --
 -- document structure