From 7db2cf5d2f637fc73377e32af776002e3670ef50 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 21 Nov 2020 12:24:37 -0800
Subject: LaTeX reader: more robust parsing of bracketed options.

Improves on 9a40976.  Closes #6873.
---
 src/Text/Pandoc/Readers/LaTeX.hs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 2ec191154..9b6cc0e3f 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -559,9 +559,14 @@ tok = try $ spaces >> grouped inline <|> inlineCommand' <|> singleChar'
           return $ str t
 
 opt :: PandocMonad m => LP m Inlines
-opt = bracketed inline
-      <|>
-      (str . T.dropWhile (=='[') . T.dropWhileEnd (==']') <$> rawopt)
+opt = do
+  toks <- try (sp *> bracketedToks <* sp)
+  -- now parse the toks as inlines
+  st <- getState
+  parsed <- runParserT (mconcat <$> many inline) st "bracketed option" toks
+  case parsed of
+    Right result -> return result
+    Left e       -> throwError $ PandocParsecError (untokenize toks) e
 
 paropt :: PandocMonad m => LP m Inlines
 paropt = parenWrapped inline
-- 
cgit v1.2.3