lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-26 18:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement first optional argument for \newtheorem.

Browse Source 
This allows groups of theorem environments to be
put in the same numbering sequence.
This commit is contained in:
John MacFarlane
2020-07-22 23:30:41 -07:00
parent f014d71a2f
commit cdaaaa3f63
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text/Pandoc/Readers/LaTeX.hs
+30 -23
View File
@@ -1861,9 +1861,12 @@ newtheorem :: PandocMonad m => LP m Blocks
newtheorem = do
number <- option True (False <$ symbol '*' <* sp)
name <- untokenize <$> braced
series <- option Nothing $ Just <$> rawopt
sp
series <- option Nothing $ Just . untokenize <$> bracketedToks
sp
showName <- untokenize <$> braced
syncTo <- option Nothing $ Just <$> rawopt
sp
syncTo <- option Nothing $ Just . untokenize <$> bracketedToks
let spec = TheoremSpec { theoremName = showName
, theoremSeries = series
, theoremSyncTo = syncTo
@@ -1919,27 +1922,31 @@ lookupTheoremEnvironment name = do
mblabel <- option Nothing $ Just . untokenize <$>
try (spaces >> controlSeq "label" >> spaces >> braced)
bs <- env name blocks
number <- if theoremNumber tspec
then do
num <- getNextNumber
(fromMaybe (DottedNum [0]) .
fmap theoremLastNum .
M.lookup name . sTheoremMap)
updateState $ \s ->
s{ sTheoremMap =
M.insert name
tspec{ theoremLastNum = num }
(sTheoremMap s)
}
case mblabel of
Just ident ->
updateState $ \s ->
s{ sLabels = M.insert ident
[Str (theoremName tspec), Str "\160",
Str (renderDottedNum num)] (sLabels s) }
Nothing -> return ()
return $ space <> B.text (renderDottedNum num)
else return mempty
number <-
if theoremNumber tspec
then do
let name' = fromMaybe name $ theoremSeries tspec
num <- getNextNumber
(fromMaybe (DottedNum [0]) .
fmap theoremLastNum .
M.lookup name' . sTheoremMap)
updateState $ \s ->
s{ sTheoremMap =
M.adjust
(\spec -> spec{ theoremLastNum = num })
name'
(sTheoremMap s)
}
case mblabel of
Just ident ->
updateState $ \s ->
s{ sLabels = M.insert ident
[Str (theoremName tspec), Str "\160",
Str (renderDottedNum num)] (sLabels s) }
Nothing -> return ()
return $ space <> B.text (renderDottedNum num)
else return mempty
let title = B.strong (B.text (theoremName tspec) <> number)
<> optTitle <> space
return $ divWith ("", [name], []) $ addTitle title $