diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.3.23 + +- Center subfigures in LaTeX + + Probably since 0.3.21 due to an inconsistency between `subfig` and + `subcaption`, subfigures were no longer properly centered in LaTeX. + ## 0.3.22 ### Changes diff --git a/lib-internal/Text/Pandoc/CrossRef/References/Blocks/Subfigures.hs b/lib-internal/Text/Pandoc/CrossRef/References/Blocks/Subfigures.hs --- a/lib-internal/Text/Pandoc/CrossRef/References/Blocks/Subfigures.hs +++ b/lib-internal/Text/Pandoc/CrossRef/References/Blocks/Subfigures.hs @@ -196,8 +196,10 @@ filterWidth = filter $ (/= "width") . fst img = Image (fromMaybe "" (refLabel ref), cls, filterWidth attrs) alt (src, title') in concat [ - [ RawInline (Format "latex") ("\\begin{subfigure}{" <> T.pack (show width) <> "\\linewidth}") ] - , [ img ] + [ RawInline (Format "latex") ("\\begin{subfigure}{" <> T.pack (show width) <> "\\linewidth}") + , RawInline (Format "latex") "\\centering" + , img + ] , texalt , [RawInline (Format "latex") "\\end{subfigure}%\n"] ] diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal --- a/pandoc-crossref.cabal +++ b/pandoc-crossref.cabal @@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: pandoc-crossref -version: 0.3.22 +version: 0.3.23 synopsis: Pandoc filter for cross-references description: pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them. category: Text diff --git a/test/m2m/listOfHidden/expect.tex b/test/m2m/listOfHidden/expect.tex --- a/test/m2m/listOfHidden/expect.tex +++ b/test/m2m/listOfHidden/expect.tex @@ -119,9 +119,9 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.495\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure1}]{figs/fig_s2.jpg}}\caption{hidden! +\begin{subfigure}{0.495\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure1}]{figs/fig_s2.jpg}}\caption{hidden! subfigure1\label{fig:fig_sss1}}\end{subfigure}% -\begin{subfigure}{0.495\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure2}]{figs/fig_s2.jpg}}\caption{hidden! +\begin{subfigure}{0.495\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure2}]{figs/fig_s2.jpg}}\caption{hidden! subfigure2\label{fig:fig_sss2}}\end{subfigure}% \caption[]{hidden! subfigures}\label{fig:subfigs} diff --git a/test/m2m/refsInObjects/expect.tex b/test/m2m/refsInObjects/expect.tex --- a/test/m2m/refsInObjects/expect.tex +++ b/test/m2m/refsInObjects/expect.tex @@ -34,13 +34,13 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={tbl.~ fig.~ fig.~ fig.~ lst.~}]{fig1.png}}\caption{tbl.~\ref{tbl:table} +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={tbl.~ fig.~ fig.~ fig.~ lst.~}]{fig1.png}}\caption{tbl.~\ref{tbl:table} fig.~\ref{fig:subfigures} fig.~\ref{fig:subfig1} fig.~\ref{fig:subfig2} lst.~\ref{lst:lst}\label{fig:subfig1}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={tbl.~ fig.~ fig.~ fig.~ lst.~}]{fig2.png}}\caption{tbl.~\ref{tbl:table} +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={tbl.~ fig.~ fig.~ fig.~ lst.~}]{fig2.png}}\caption{tbl.~\ref{tbl:table} fig.~\ref{fig:subfigures} fig.~\ref{fig:subfig1} fig.~\ref{fig:subfig2} lst.~\ref{lst:lst}\label{fig:subfig2}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% \caption{Caption tbl.~\ref{tbl:table} fig.~\ref{fig:subfigures} fig.~\ref{fig:subfig1} fig.~\ref{fig:subfig2} diff --git a/test/m2m/subfigures-ccsDelim/expect.tex b/test/m2m/subfigures-ccsDelim/expect.tex --- a/test/m2m/subfigures-ccsDelim/expect.tex +++ b/test/m2m/subfigures-ccsDelim/expect.tex @@ -2,17 +2,17 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% \caption{Caption}\label{fig:subfigures2} diff --git a/test/m2m/subfigures-columns/expect.tex b/test/m2m/subfigures-columns/expect.tex --- a/test/m2m/subfigures-columns/expect.tex +++ b/test/m2m/subfigures-columns/expect.tex @@ -2,17 +2,17 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% \caption{Caption}\label{fig:subfigures2} diff --git a/test/m2m/subfigures-grid/expect.tex b/test/m2m/subfigures-grid/expect.tex --- a/test/m2m/subfigures-grid/expect.tex +++ b/test/m2m/subfigures-grid/expect.tex @@ -2,17 +2,17 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{0.3\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{0.3\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% \caption{Caption}\label{fig:subfigures2} diff --git a/test/m2m/subfigures-one-row/expect.tex b/test/m2m/subfigures-one-row/expect.tex --- a/test/m2m/subfigures-one-row/expect.tex +++ b/test/m2m/subfigures-one-row/expect.tex @@ -5,9 +5,9 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.4\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={cool caption}]{/tmp/LaTeX_logo.svg.png}}\caption{cool +\begin{subfigure}{0.4\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={cool caption}]{/tmp/LaTeX_logo.svg.png}}\caption{cool caption\label{fig:logo1}}\end{subfigure}% -\begin{subfigure}{0.4\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={cooler caption}]{/tmp/LaTeX_logo.svg.png}}\caption{cooler +\begin{subfigure}{0.4\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={cooler caption}]{/tmp/LaTeX_logo.svg.png}}\caption{cooler caption\label{fig:logo2}}\end{subfigure}% \caption{Copies of the LaTeX logo}\label{fig:latex} diff --git a/test/m2m/subfigures/expect.tex b/test/m2m/subfigures/expect.tex --- a/test/m2m/subfigures/expect.tex +++ b/test/m2m/subfigures/expect.tex @@ -2,17 +2,17 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig1}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig2}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig4}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig6}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{0.33\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig7}}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{0.33\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig9}}\end{subfigure}% \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\caption{1\label{fig:subfig21}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\caption{2\label{fig:subfig22}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}\caption{3}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\caption{4\label{fig:subfig24}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}\caption{5}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\caption{6\label{fig:subfig26}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\caption{7\label{fig:subfig27}}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}\caption{8}\end{subfigure}% -\begin{subfigure}{1.0\linewidth}\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% +\begin{subfigure}{1.0\linewidth}\centering\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\caption{9\label{fig:subfig29}}\end{subfigure}% \caption{Caption}\label{fig:subfigures2}