LaTeX reader: allow ] inside group in option brackets.

Closes #3857.
2017-08-20 13:42:43 -07:00 · 2017-08-20 13:42:43 -07:00 · f2fdd275fd
commit f2fdd275fd
parent e334d7dc38
1 changed files with 2 additions and 3 deletions
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@ -1120,8 +1120,7 @@ opt = bracketed inline

 rawopt :: PandocMonad m => LP m Text
 rawopt = do
-  symbol '['
-  inner <- untokenize <$> manyTill anyTok (symbol ']')
+  inner <- untokenize <$> bracketedToks
  optional sp
  return $ "[" <> inner <> "]"

@ -1789,7 +1788,7 @@ newenvironment = do
 bracketedToks :: PandocMonad m => LP m [Tok]
 bracketedToks = do
  symbol '['
-  manyTill anyTok (symbol ']')
+  mconcat <$> manyTill (braced <|> (:[]) <$> anyTok) (symbol ']')

 bracketedNum :: PandocMonad m => LP m Int
 bracketedNum = do