Handle figures in LaTeX reader.

Author: argent0

src/Text/Pandoc/Extensions.hs

@@ -554,6 +554,7 @@ getAllExtensions f = universalExtensions <> getAll f
     , Ext_raw_tex
     , Ext_task_lists
     , Ext_literate_haskell
+    , Ext_native_figures
     ]
   getAll "beamer"          = getAll "latex"
   getAll "context"         = autoIdExtensions <>

src/Text/Pandoc/Readers/LaTeX.hs

@@ -32,6 +32,7 @@ import Data.Maybe (fromMaybe, maybeToList)
 import qualified Data.Set as Set
 import Data.Text (Text)
 import qualified Data.Text as T
+import Data.Either (partitionEithers)
 import Skylighting (defaultSyntaxMap)
 import System.FilePath (addExtension, replaceExtension, takeExtension)
 import Text.Collate.Lang (renderLang)
@@ -1084,9 +1085,33 @@ letterContents = do
   return $ addr <> bs -- sig added by \closing
 
 figure :: PandocMonad m => LP m Blocks
-figure = try $ do
+figure = do
+  has_native_figures <-
+    extensionEnabled Ext_native_figures <$> getOption readerExtensions
+  if has_native_figures
+     then nativeFigure
+     else try $ do
+            resetCaption
+            blocks >>= addImageCaption
+
+nativeFigure :: PandocMonad m => LP m Blocks
+nativeFigure = try $ do
   resetCaption
-  blocks >>= addImageCaption
+  innerContent <- many $ try (Left <$> label) <|> (Right <$> block)
+  let content = walk go $ mconcat $ snd $ partitionEithers innerContent
+  labelResult <- sLastLabel <$> getState
+  let attr = case labelResult of
+                Just lab -> (lab, [], [])
+                _ -> nullAttr
+  captResult <- sCaption <$> getState
+  case captResult of
+    Nothing -> return $ B.figureWith attr (Caption Nothing []) content
+    Just capt -> return $ B.figureWith attr (B.caption Nothing $ B.plain capt) content
+
+  where
+  -- Remove the `Image` caption b.c. it's on the `Figure`
+  go (Para [Image attr _ target]) = Plain [Image attr [] target]
+  go x = x
 
 addImageCaption :: PandocMonad m => Blocks -> LP m Blocks
 addImageCaption = walkM go

test/command/figures/figures-latex.md

@@ -0,0 +1,45 @@
+# Figure with one image, caption and label
+
+```
+pandoc -f latex+native_figures -t native
+\begin{document}
+  \begin{figure}
+    \includegraphics{../../media/rId25.jpg}
+    \caption{CAP}
+    \label{LAB}
+  \end{figure}
+\end{document}
+^D
+[Figure ("LAB",[],[]) (Caption Nothing [Plain [Str "CAP"]]) [Plain [Image ("",[],[]) [] ("../../media/rId25.jpg","")]]]
+```
+
+# Nested figures
+
+```
+pandoc -f latex+native_figures -t native
+\begin{figure}
+  \begin{subfigure}[b]{0.5\textwidth}
+    \begin{subfigure}[b]{0.5\textwidth}
+      \centering
+      \includegraphics{test/media/rId25.jpg}
+      \caption{CAP1.1}
+    \end{subfigure}
+    \begin{subfigure}[b]{0.5\textwidth}
+      \centering
+      \includegraphics{test/media/rId25.jpg}
+      \caption{CAP1.2}
+    \end{subfigure}
+    \caption{CAP1}
+    \label{fig:inner1}
+  \end{subfigure}
+  \begin{subfigure}[b]{0.5\textwidth}
+    \includegraphics{test/media/rId25.jpg}
+    \caption{CAP2}
+    \label{fig:inner2}
+  \end{subfigure}
+  \caption{CAP}
+  \label{fig:outer}
+\end{figure}
+^D
+[Figure ("fig:outer",[],[]) (Caption Nothing [Plain [Str "CAP"]]) [Figure ("fig:inner1",[],[]) (Caption Nothing [Plain [Str "CAP1"]]) [Figure ("",[],[]) (Caption Nothing [Plain [Str "CAP1.1"]]) [Plain [Image ("",[],[]) [] ("test/media/rId25.jpg","")]],Figure ("",[],[]) (Caption Nothing [Plain [Str "CAP1.2"]]) [Plain [Image ("",[],[]) [] ("test/media/rId25.jpg","")]]],Figure ("fig:inner2",[],[]) (Caption Nothing [Plain [Str "CAP2"]]) [Plain [Image ("",[],[]) [] ("test/media/rId25.jpg","")]]]]
+```