@@ -426,13 +426,13 @@ resetCaption = updateState $ \st -> st{ stateCaption = Nothing }
426426
427427authors :: PandocMonad m => LP m ()
428428authors = try $ do
429− char '{'
429+ bgroup
430430 let oneAuthor = mconcat <$>
431431 many1 (notFollowedBy' (controlSeq "and") >>
432432 (inline <|> mempty <$ blockCommand))
433433 -- skip e.g. \vspace{10pt}
434434 auths <- sepBy oneAuthor (controlSeq "and")
435− char '}'
435+ egroup
436436 addMeta "author" (map trimInlines auths)
437437
438438section :: PandocMonad m => Attr -> Int -> LP m Blocks
@@ -577,8 +577,8 @@ inlineCommands = M.fromList $
577577 , ("bar", lit "|")
578578 , ("textless", lit "<")
579579 , ("textgreater", lit ">")
580− , ("thanks", (note . mconcat) <$> (char '{' *> manyTill block (char '}')))
581− , ("footnote", (note . mconcat) <$> (char '{' *> manyTill block (char '}')))
580+ , ("thanks", note <$> grouped block)
581+ , ("footnote", note <$> grouped block)
582582 , ("verb", doverb)
583583 , ("lstinline", skipopts *> doverb)
584584 , ("Verb", doverb)
@@ -971,9 +971,6 @@ rawEnv name = do
971971
972972----
973973
974−braced' :: PandocMonad m => LP m String
975−braced' = try $ char '{' *> manyTill (satisfy (/='}')) (char '}')
976−
977974maybeAddExtension :: String -> FilePath -> FilePath
978975maybeAddExtension ext fp =
979976 if null (takeExtension fp)
@@ -989,7 +986,7 @@ include = do
989986 <|> string "usepackage"
990987 -- skip options
991988 skipMany $ try $ char '[' *> manyTill anyChar (char ']')
992− fs <- (map trim . splitBy (==',')) <$> braced'
989+ fs <- (map trim . splitBy (==',')) <$> braced
993990 return $ if name == "usepackage"
994991 then map (maybeAddExtension ".sty") fs
995992 else map (maybeAddExtension ".tex") fs
@@ -1339,7 +1336,7 @@ complexNatbibCitation mode = try $ do
13391336
13401337parseAligns :: PandocMonad m => LP m [(String, Alignment, String)]
13411338parseAligns = try $ do
1342− char '{'
1339+ bgroup
13431340 let maybeBar = skipMany $ sp <|> () <$ char '|' <|> () <$ (char '@' >> braced)
13441341 maybeBar
13451342 let cAlign = AlignCenter <$ char 'c'
@@ -1359,7 +1356,7 @@ parseAligns = try $ do
13591356 return (pref, ch, suff)
13601357 aligns' <- sepEndBy alignSpec maybeBar
13611358 spaces
1362− char '}'
1359+ egroup
13631360 spaces
13641361 return $ aligns'
13651362