diff options
| -rw-r--r-- | MANUAL.txt | 8 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 7 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 7 | ||||
| -rw-r--r-- | test/Tests/Readers/Markdown.hs | 7 | ||||
| -rw-r--r-- | test/Tests/Writers/LaTeX.hs | 12 |
5 files changed, 34 insertions, 7 deletions
diff --git a/MANUAL.txt b/MANUAL.txt index 385aa3860..381069e06 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5643,9 +5643,13 @@ image's alt text will be used as the caption.  How this is rendered depends on the output format. Some output -formats (e.g. RTF) do not yet support figures. In those +formats (e.g. RTF) do not yet support figures. In those formats, you'll just get an image in a paragraph by itself, with -no caption. +no caption. For LaTeX output, you can specify a [figure's +positioning](https://www.overleaf.com/learn/latex/Positioning_images_and_tables#The_figure_environment) +by adding the `latex-pos` attribute. + + {latex-pos="ht"} If you just want a regular inline image, just make sure it is not the only thing in the paragraph. One way to do this is to insert a diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index b9451f2e1..61e843662 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1057,8 +1057,11 @@ implicitFigure (ident, classes, attribs) capt url title = let alt = case "alt" `lookup` attribs of Just alt' -> B.text alt' _ -> capt - attribs' = filter ((/= "alt") . fst) attribs - figattr = (ident, mempty, mempty) + attribs' = filter ((/= "latex-pos") . fst) (filter ((/= "alt") . fst) attribs) + figattribs = case lookup "latex-pos" attribs of + Just p -> [("latex-pos", p)] + _ -> mempty + figattr = (ident, mempty, figattribs) caption = B.simpleCaption $ B.plain capt figbody = B.plain $ B.imageWith ("", classes, attribs') url title alt in B.figureWith figattr caption figbody diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index fe549ad17..e1ae080f6 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -644,11 +644,14 @@ blockToLaTeX (Header level (id',classes,_) lst) = do blockToLaTeX (Table attr blkCapt specs thead tbodies tfoot) = tableToLaTeX inlineListToLaTeX blockListToLaTeX (Ann.toTable attr blkCapt specs thead tbodies tfoot) -blockToLaTeX (Figure (ident, _, _) captnode body) = do +blockToLaTeX (Figure (ident, _, kvs) captnode body) = do opts <- gets stOptions (capt, captForLof, footnotes) <- getCaption inlineListToLaTeX True captnode lab <- labelFor ident let caption = "\\caption" <> captForLof <> braces capt <> lab + placement = case lookup "latex-pos" kvs of + Just p -> brackets (text (T.unpack p)) + _ -> text "" isSubfigure <- gets stInFigure modify $ \st -> st{ stInFigure = True } @@ -680,7 +683,7 @@ blockToLaTeX (Figure (ident, _, _) captnode body) = do cr <> "\\begin{center}" $$ contents $+$ capt $$ "\\end{center}" _ | isSubfigure -> innards - _ -> cr <> "\\begin{figure}" $$ innards $$ "\\end{figure}") + _ -> cr <> "\\begin{figure}" <> placement $$ innards $$ "\\end{figure}") $$ footnotes toSubfigure :: PandocMonad m => Int -> Block -> LW m (Doc Text) diff --git a/test/Tests/Readers/Markdown.hs b/test/Tests/Readers/Markdown.hs index 20ab99e48..677fa8ccb 100644 --- a/test/Tests/Readers/Markdown.hs +++ b/test/Tests/Readers/Markdown.hs @@ -578,4 +578,11 @@ tests = [ testGroup "inline code" (str "@cita" <> space <> str "[foo]") ) ] + , testGroup "figures" + [ "latex placement" =: + "{latex-pos=\"htbp\" alt=\"alt text\"}" =?> + figureWith ("", [], [("latex-pos", "htbp")]) + (simpleCaption $ plain "caption") + (plain $ image (T.pack "img.jpg") (T.pack "") (text "alt text")) ] + ] diff --git a/test/Tests/Writers/LaTeX.hs b/test/Tests/Writers/LaTeX.hs index f9062e32e..c8d5fc130 100644 --- a/test/Tests/Writers/LaTeX.hs +++ b/test/Tests/Writers/LaTeX.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} module Tests.Writers.LaTeX (tests) where -import Data.Text (unpack) +import Data.Text (pack, unpack) import Test.Tasty import Test.Tasty.HUnit (HasCallStack) import Tests.Helpers @@ -242,4 +242,14 @@ tests = [ testGroup "code blocks" ] ] ] + , testGroup "figures" + [ "placement" =: + figureWith ("", [], [("latex-pos", "htbp")]) + (simpleCaption $ plain "caption") + (plain $ image (pack "img.jpg") (pack "") (text "alt text")) + =?> + "\\begin{figure}[htbp]\n\\centering\n" + <> "\\pandocbounded{\\includegraphics[keepaspectratio,alt={alt text}]{img.jpg}}\n" + <> "\\caption{caption}\n\\end{figure}" + ] ] |