git.iko.soy/typeable/pandoc
on master help sign in
Implemented "unnumbered" headers in LaTeX writer.

Starred variants of section commands used when header has "unnumbered" class.

commit0d1fa0a763a95d222476837efecca9aa8ca526d9 authorJohn MacFarlane <fiddlosopher@gmail.com> dateThu 14 Feb 2013, 19:50 (14 years ago) parent90f0dd1
1 file changed+11−8
src/Text/Pandoc/Writers/LaTeX.hs+11−8
src/Text/Pandoc/Writers/LaTeX.hs+11−8
@@ -171,8 +171,8 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do
171171-- | Convert Elements to LaTeX
172172elementToLaTeX :: WriterOptions -> Element -> State WriterState Doc
173173elementToLaTeX _ (Blk block) = blockToLaTeX block
174−elementToLaTeX opts (Sec level _ (id',_,_) title' elements) = do
175− header' <- sectionHeader id' level title'
174+elementToLaTeX opts (Sec level _ (id',classes,_) title' elements) = do
175+ header' <- sectionHeader ("unnumbered" `elem` classes) id' level title'
176176 innerContents <- mapM (elementToLaTeX opts) elements
177177 return $ vsep (header' : innerContents)
178178
@@ -236,7 +236,7 @@ toSlides bs = do
236236
237237elementToBeamer :: Int -> Element -> State WriterState [Block]
238238elementToBeamer _slideLevel (Blk b) = return [b]
239−elementToBeamer slideLevel (Sec lvl _num (ident,_,_) tit elts)
239+elementToBeamer slideLevel (Sec lvl _num (ident,classes,_) tit elts)
240240 | lvl > slideLevel = do
241241 bs <- concat `fmap` mapM (elementToBeamer slideLevel) elts
242242 return $ Para ( RawInline "latex" "\\begin{block}{"
@@ -244,7 +244,7 @@ elementToBeamer slideLevel (Sec lvl _num (ident,_,_) tit elts)
244244 : bs ++ [RawBlock "latex" "\\end{block}"]
245245 | lvl < slideLevel = do
246246 bs <- concat `fmap` mapM (elementToBeamer slideLevel) elts
247− return $ (Header lvl (ident,[],[]) tit) : bs
247+ return $ (Header lvl (ident,classes,[]) tit) : bs
248248 | otherwise = do -- lvl == slideLevel
249249 -- note: [fragile] is required or verbatim breaks
250250 let hasCodeBlock (CodeBlock _ _) = [True]
@@ -404,7 +404,8 @@ blockToLaTeX (DefinitionList lst) = do
404404 "\\end{description}"
405405blockToLaTeX HorizontalRule = return $
406406 "\\begin{center}\\rule{3in}{0.4pt}\\end{center}"
407−blockToLaTeX (Header level (id',_,_) lst) = sectionHeader id' level lst
407+blockToLaTeX (Header level (id',classes,_) lst) =
408+ sectionHeader ("unnumbered" `elem` classes) id' level lst
408409blockToLaTeX (Table caption aligns widths heads rows) = do
409410 modify $ \s -> s{ stInTable = True, stTableNotes = [] }
410411 headers <- if all null heads
@@ -475,15 +476,17 @@ defListItemToLaTeX (term, defs) = do
475476 return $ "\\item" <> brackets term' $$ def'
476477
477478-- | Craft the section header, inserting the secton reference, if supplied.
478−sectionHeader :: [Char]
479+sectionHeader :: Bool -- True for unnumbered
480+ -> [Char]
479481 -> Int
480482 -> [Inline]
481483 -> State WriterState Doc
482−sectionHeader ref level lst = do
484+sectionHeader unnumbered ref level lst = do
483485 txt <- inlineListToLaTeX lst
484486 let noNote (Note _) = Str ""
485487 noNote x = x
486488 let lstNoNotes = bottomUp noNote lst
489+ let star = if unnumbered then text "*" else empty
487490 -- footnotes in sections don't work unless you specify an optional
488491 -- argument: \section[mysec]{mysec\footnote{blah}}
489492 optional <- if lstNoNotes == lst
@@ -491,7 +494,7 @@ sectionHeader ref level lst = do
491494 else do
492495 res <- inlineListToLaTeX lstNoNotes
493496 return $ char '[' <> res <> char ']'
494− let stuffing = optional <> char '{' <> txt <> char '}'
497+ let stuffing = star <> optional <> char '{' <> txt <> char '}'
495498 book <- gets stBook
496499 opts <- gets stOptions
497500 let level' = if book || writerChapters opts then level - 1 else level