LaTeX reader: evaluate theorem name when used...

rather than evaluating it when the `\newtheorem` command
is encountered. It may include macros only defined later.
Closes #11608.

Author: jgm

src/Text/Pandoc/Readers/LaTeX.hs

@@ -985,7 +985,7 @@ blockCommands = M.fromList
    , ("address", mempty <$ (skipopts *> tok >>= addMeta "address"))
    , ("signature", mempty <$ (skipopts *> authors))
    , ("date", mempty <$ (skipopts *> tok >>= addMeta "date"))
-   , ("newtheorem", newtheorem inline)
+   , ("newtheorem", newtheorem)
    , ("theoremstyle", theoremstyle)
    -- KOMA-Script metadata commands
    , ("extratitle", mempty <$ (skipopts *> tok >>= addMeta "extratitle"))
@@ -1156,7 +1156,7 @@ environment = try $ do
   name <- untokenize <$> braced
   M.findWithDefault mzero name environments <|>
     langEnvironment name <|>
-    theoremEnvironment blocks opt name <|>
+    theoremEnvironment blocks inlines opt name <|>
     if M.member name (inlineEnvironments
                        :: M.Map Text (LP PandocPure Inlines))
        then mzero

src/Text/Pandoc/Readers/LaTeX/Math.hs

@@ -135,14 +135,14 @@ theoremstyle = do
     Just sty -> updateState $ \s -> s{ sLastTheoremStyle = sty }
   return mempty
 
-newtheorem :: PandocMonad m => LP m Inlines -> LP m Blocks
-newtheorem inline = do
+newtheorem :: PandocMonad m => LP m Blocks
+newtheorem = do
   number <- option True (False <$ symbol '*' <* sp)
   name <- untokenize <$> braced
   sp
   series <- option Nothing $ Just . untokenize <$> bracketedToks
   sp
-  showName <- tokWith inline
+  showName <- braced <|> ((:[]) <$> anyTok)
   sp
   syncTo <- option Nothing $ Just . untokenize <$> bracketedToks
   sty <- sLastTheoremStyle <$> getState
@@ -168,8 +168,12 @@ extractLabelFromBlock (Para inlines) = extractLabel Nothing inlines
 extractLabelFromBlock _ = Nothing
 
 theoremEnvironment :: PandocMonad m
-                   => LP m Blocks -> LP m Inlines -> Text -> LP m Blocks
-theoremEnvironment blocks opt name = do
+                   => LP m Blocks
+                   -> LP m Inlines
+                   -> LP m Inlines
+                   -> Text
+                   -> LP m Blocks
+theoremEnvironment blocks inlines opt name = do
   resetCaption
   tmap <- sTheoremMap <$> getState
   case M.lookup name tmap of
@@ -206,7 +210,8 @@ theoremEnvironment blocks opt name = do
                          PlainStyle      -> B.strong
                          DefinitionStyle -> B.strong
                          RemarkStyle     -> B.emph
-       let title = titleEmph (theoremName tspec <> number)
+       tname <- parseFromToks inlines (theoremName tspec)
+       let title = titleEmph (tname <> number)
                       <> optTitle <> "." <> space
        return $ divWith (fromMaybe "" mblabel, [name], [])
               $ addTitle title

src/Text/Pandoc/Readers/LaTeX/Parsing.hs

@@ -141,7 +141,7 @@ data TheoremStyle =
 
 data TheoremSpec =
   TheoremSpec
-    { theoremName    :: Inlines
+    { theoremName    :: [Tok]
     , theoremStyle   :: TheoremStyle
     , theoremSeries  :: Maybe Text
     , theoremSyncTo  :: Maybe Text

test/command/11608.md

@@ -0,0 +1,54 @@
+```
+% pandoc -f latex -t plain
+\documentclass[english]{article}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{amsthm}
+\theoremstyle{plain}
+\newtheorem{thm}{\protect\theoremname}
+\newtheorem{prop}[thm]{\protect\propositionname}
+\usepackage{babel}
+\providecommand{\propositionname}{Proposition}
+\providecommand{\theoremname}{Theorem}
+
+\begin{document}
+\begin{thm}
+first theorem
+\end{thm}
+\begin{prop}
+first proposition
+\end{prop}
+
+\end{document}
+<div class="thm">
+<p><strong>Theorem 1</strong>. <em>first theorem</em></p>
+</div>
+<div class="prop">
+<p><strong>Proposition 2</strong>. <em>first proposition</em></p>
+</div>
+jgm@Johns-MacBook-Air:~/src/pandoc % `make binpath` -f latex -t plain
+\documentclass[english]{article}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{amsthm}
+\theoremstyle{plain}
+\newtheorem{thm}{\protect\theoremname}
+\newtheorem{prop}[thm]{\protect\propositionname}
+\usepackage{babel}
+\providecommand{\propositionname}{Proposition}
+\providecommand{\theoremname}{Theorem}
+
+\begin{document}
+\begin{thm}
+first theorem
+\end{thm}
+\begin{prop}
+first proposition
+\end{prop}
+
+\end{document}
+^D
+Theorem 1. first theorem
+
+Proposition 2. first proposition
+```