diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 0.3.20 + +- Support Pandoc 3.7 + +- Minimal supported Pandoc version is 3.7.0.2 + + This is mostly because some changes in 3.7 break tests. + +No other changes since 0.3.19. + ## 0.3.19 ### New features diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal --- a/pandoc-crossref.cabal +++ b/pandoc-crossref.cabal @@ -1,11 +1,11 @@ cabal-version: 2.0 --- This file has been generated from package.yaml by hpack version 0.36.1. +-- This file has been generated from package.yaml by hpack version 0.37.0. -- -- see: https://github.com/sol/hpack name: pandoc-crossref -version: 0.3.19 +version: 0.3.20 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 @@ -158,7 +158,7 @@ build-depends: base >=4.16 && <5 , mtl >=1.1 && <2.4 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-crossref-internal , pandoc-types ==1.23.* , text >=1.2.2 && <2.2 @@ -211,7 +211,7 @@ , microlens-mtl >=0.2.0.1 && <0.3.0.0 , microlens-th >=0.4.3.10 && <0.5.0.0 , mtl >=1.1 && <2.4 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-types ==1.23.* , syb >=0.4 && <0.8 , template-haskell >=2.7.0.0 && <3.0.0.0 @@ -241,7 +241,7 @@ , gitrev >=1.3.1 && <1.4 , open-browser ==0.2.* , optparse-applicative >=0.13 && <0.19 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-crossref , pandoc-types ==1.23.* , template-haskell >=2.7.0.0 && <3.0.0.0 @@ -271,7 +271,7 @@ , directory >=1 && <1.4 , filepath >=1.1 && <1.6 , hspec >=2.4.4 && <3 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-crossref , pandoc-types ==1.23.* , text >=1.2.2 && <2.2 @@ -306,7 +306,7 @@ , hspec >=2.4.4 && <3 , microlens >=0.4.12.0 && <0.5.0.0 , mtl >=1.1 && <2.4 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-crossref , pandoc-crossref-internal , pandoc-types ==1.23.* @@ -335,7 +335,7 @@ build-depends: base >=4.16 && <5 , criterion >=1.5.9.0 && <1.7 - , pandoc >=3.1.8 && <3.7 + , pandoc >=3.7.0.2 && <3.8 , pandoc-crossref , pandoc-types ==1.23.* , text >=1.2.2 && <2.2 diff --git a/test/m2m/emptyChapterLabels/expect.tex b/test/m2m/emptyChapterLabels/expect.tex --- a/test/m2m/emptyChapterLabels/expect.tex +++ b/test/m2m/emptyChapterLabels/expect.tex @@ -4,7 +4,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{./image.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Figure1}]{./image.png}} \caption{Figure1}\label{fig:figure1} \end{figure} diff --git a/test/m2m/eqnInlineTableTemplate/expect.md b/test/m2m/eqnInlineTableTemplate/expect.md --- a/test/m2m/eqnInlineTableTemplate/expect.md +++ b/test/m2m/eqnInlineTableTemplate/expect.md @@ -1,8 +1,7 @@ ::: {#eq:euler} -+:-------------------------------------------------------------:+-----:+ -| $$ e^{i\pi} = -1 (1) (1) 1 1 $$ | $$( | -| | 1)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ e^{i\pi} = -1 (1) (1) 1 1 $$ | $$(1)$$ | ++---------------------------------------------------------------+---------+ ::: eq. 1 diff --git a/test/m2m/equations-tables-auto/expect.md b/test/m2m/equations-tables-auto/expect.md --- a/test/m2m/equations-tables-auto/expect.md +++ b/test/m2m/equations-tables-auto/expect.md @@ -2,10 +2,9 @@
-+:-------------------------------------------------------------:+-----:+ -| $$ this $$ | $$( | -| | 1)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ this $$ | $$(1)$$ | ++---------------------------------------------------------------+---------+
@@ -13,10 +12,9 @@
-+:-------------------------------------------------------------:+-----:+ -| $$ for example $$ | $$( | -| | 2)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ for example $$ | $$(2)$$ | ++---------------------------------------------------------------+---------+
@@ -26,10 +24,9 @@
-+:-------------------------------------------------------------:+-----:+ -| $$ start $$ | $$( | -| | 3)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ start $$ | $$(3)$$ | ++---------------------------------------------------------------+---------+
@@ -39,10 +36,9 @@
-+:-------------------------------------------------------------:+-----:+ -| $$ separate $$ | $$( | -| | 4)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ separate $$ | $$(4)$$ | ++---------------------------------------------------------------+---------+
@@ -51,19 +47,17 @@ This is a test file with some referenced equations, line ::: {#eq:0} -+:-------------------------------------------------------------:+-----:+ -| $$ this $$ | $$( | -| | 5)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ this $$ | $$(5)$$ | ++---------------------------------------------------------------+---------+ ::: Some equations might be inside of text, ::: {#eq:1} -+:-------------------------------------------------------------:+-----:+ -| $$ for example $$ | $$( | -| | 6)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ for example $$ | $$(6)$$ | ++---------------------------------------------------------------+---------+ ::: this one. @@ -71,10 +65,9 @@ Some equations might be on start of paragraphs: ::: {#eq:2} -+:-------------------------------------------------------------:+-----:+ -| $$ start $$ | $$( | -| | 7)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ start $$ | $$(7)$$ | ++---------------------------------------------------------------+---------+ ::: of paragraph. @@ -82,10 +75,9 @@ Other might be on separate paragraphs of their own: ::: {#eq:3} -+:-------------------------------------------------------------:+-----:+ -| $$ separate $$ | $$( | -| | 8)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ separate $$ | $$(8)$$ | ++---------------------------------------------------------------+---------+ ::: Then they can be referenced: diff --git a/test/m2m/equations-tables/expect.md b/test/m2m/equations-tables/expect.md --- a/test/m2m/equations-tables/expect.md +++ b/test/m2m/equations-tables/expect.md @@ -15,19 +15,17 @@ This is a test file with some referenced equations, line ::: {#eq:0} -+:-------------------------------------------------------------:+-----:+ -| $$ this $$ | $$( | -| | 1)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ this $$ | $$(1)$$ | ++---------------------------------------------------------------+---------+ ::: Some equations might be inside of text, ::: {#eq:1} -+:-------------------------------------------------------------:+-----:+ -| $$ for example $$ | $$( | -| | 2)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ for example $$ | $$(2)$$ | ++---------------------------------------------------------------+---------+ ::: this one. @@ -35,10 +33,9 @@ Some equations might be on start of paragraphs: ::: {#eq:2} -+:-------------------------------------------------------------:+-----:+ -| $$ start $$ | $$( | -| | 3)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ start $$ | $$(3)$$ | ++---------------------------------------------------------------+---------+ ::: of paragraph. @@ -46,10 +43,9 @@ Other might be on separate paragraphs of their own: ::: {#eq:3} -+:-------------------------------------------------------------:+-----:+ -| $$ separate $$ | $$( | -| | 4)$$ | -+---------------------------------------------------------------+------+ ++:-------------------------------------------------------------:+--------:+ +| $$ separate $$ | $$(4)$$ | ++---------------------------------------------------------------+---------+ ::: Then they can be referenced: diff --git a/test/m2m/label-precedence/expect.tex b/test/m2m/label-precedence/expect.tex --- a/test/m2m/label-precedence/expect.tex +++ b/test/m2m/label-precedence/expect.tex @@ -4,7 +4,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{image.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={A figure}]{image.png}} \caption{A figure}\label{fig:fig1} \end{figure} @@ -14,7 +14,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{image.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={A figure with custom label}]{image.png}} \caption{A figure with custom label}\label{fig:fig2} \end{figure} @@ -26,7 +26,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Figure}]{fig.png}} \caption{Figure}\label{fig:fig3} \end{figure} 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 @@ -5,7 +5,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first figure}]{figs/fig1.jpg}} \caption{first figure}\label{fig:fig1} \end{figure} @@ -13,7 +13,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second figure}]{figs/fig2.jpg}} \caption{second figure}\label{fig:fig2} \end{figure} @@ -21,7 +21,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig3.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={third figure}]{figs/fig3.jpg}} \caption{third figure}\label{fig:fig3} \end{figure} @@ -30,13 +30,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! first supp figure}]{figs/fig_s1.jpg}} \caption[]{hidden! first supp figure}\label{fig:fig_s1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! second supp figure}]{figs/fig_s2.jpg}} \caption[]{hidden! second supp figure}\label{fig:fig_s2} \end{figure} @@ -44,13 +44,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! first hidden figure}]{figs/fig_s1.jpg}} \caption[]{hidden! first hidden figure}\label{fig:fig_h1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! second hidden figure}]{figs/fig_s2.jpg}} \caption[]{hidden! second hidden figure}\label{fig:fig_h2} \end{figure} @@ -59,13 +59,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! first hidden subsection figure}]{figs/fig_s1.jpg}} \caption[]{hidden! first hidden subsection figure}\label{fig:fig_h1_s} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! second hidden subsection figure}]{figs/fig_s2.jpg}} \caption[]{hidden! second hidden subsection figure}\label{fig:fig_h2_s} \end{figure} @@ -73,13 +73,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first regular section figure}]{figs/fig_s1.jpg}} \caption{first regular section figure}\label{fig:fig_r1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second regular section figure}]{figs/fig_s2.jpg}} \caption{second regular section figure}\label{fig:fig_r2} \end{figure} @@ -87,13 +87,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first normal subsection figure}]{figs/fig_s1.jpg}} \caption{first normal subsection figure}\label{fig:fig_nss1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second normal subsection figure}]{figs/fig_s2.jpg}} \caption{second normal subsection figure}\label{fig:fig_nss2} \end{figure} @@ -101,28 +101,28 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! first hidden subsection figure}]{figs/fig_s1.jpg}} \caption[]{hidden! first hidden subsection figure}\label{fig:fig_ss1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! second hidden subsection figure}]{figs/fig_s2.jpg}} \caption[]{hidden! second hidden subsection figure}\label{fig:fig_ss2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s3.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={visible! overridden visibility}]{figs/fig_s3.jpg}} \caption{visible! overridden visibility}\label{fig:fig_ss3} \end{figure} \begin{pandoccrossrefsubfigures} \subfloat[hidden! -subfigure1]{\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}}\label{fig:fig_sss1}} +subfigure1]{\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure1}]{figs/fig_s2.jpg}}\label{fig:fig_sss1}} \subfloat[hidden! -subfigure2]{\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}}\label{fig:fig_sss2}} +subfigure2]{\pandocbounded{\includegraphics[keepaspectratio,alt={hidden! subfigure2}]{figs/fig_s2.jpg}}\label{fig:fig_sss2}} \caption[]{hidden! subfigures}\label{fig:subfigs} @@ -190,13 +190,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first other regular section figure}]{figs/fig_s1.jpg}} \caption{first other regular section figure}\label{fig:fig_or1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second other regular section figure}]{figs/fig_s2.jpg}} \caption{second other regular section figure}\label{fig:fig_or2} \end{figure} diff --git a/test/m2m/listOfLinked/expect.tex b/test/m2m/listOfLinked/expect.tex --- a/test/m2m/listOfLinked/expect.tex +++ b/test/m2m/listOfLinked/expect.tex @@ -1,54 +1,54 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}} \caption{1}\label{fig:1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}} \caption{2}\label{fig:2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}} \caption{3}\label{fig:3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}} \caption{4}\label{fig:4} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}} \caption{5}\label{fig:5} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}} \caption{6}\label{fig:6} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}} \caption{7}\label{fig:7} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}} \caption{8}\label{fig:8} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}} \caption{9}\label{fig:9} \end{figure} diff --git a/test/m2m/listOfOrdering/expect.tex b/test/m2m/listOfOrdering/expect.tex --- a/test/m2m/listOfOrdering/expect.tex +++ b/test/m2m/listOfOrdering/expect.tex @@ -5,7 +5,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first figure}]{figs/fig1.jpg}} \caption{first figure}\label{fig:fig1} \end{figure} @@ -13,7 +13,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second figure}]{figs/fig2.jpg}} \caption{second figure}\label{fig:fig2} \end{figure} @@ -21,7 +21,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig3.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={third figure}]{figs/fig3.jpg}} \caption{third figure}\label{fig:fig3} \end{figure} @@ -29,13 +29,13 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s1.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={first supp figure}]{figs/fig_s1.jpg}} \caption{first supp figure}\label{fig:fig_s1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figs/fig_s2.jpg}} +\pandocbounded{\includegraphics[keepaspectratio,alt={second supp figure}]{figs/fig_s2.jpg}} \caption{second supp figure}\label{fig:fig_s2} \end{figure} diff --git a/test/m2m/listOfTemplates-buillet-list/expect.tex b/test/m2m/listOfTemplates-buillet-list/expect.tex --- a/test/m2m/listOfTemplates-buillet-list/expect.tex +++ b/test/m2m/listOfTemplates-buillet-list/expect.tex @@ -1,54 +1,54 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}} \caption{1}\label{fig:1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}} \caption{2}\label{fig:2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}} \caption{3}\label{fig:3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}} \caption{4}\label{fig:4} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}} \caption{5}\label{fig:5} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}} \caption{6}\label{fig:6} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}} \caption{7}\label{fig:7} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}} \caption{8}\label{fig:8} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}} \caption{9}\label{fig:9} \end{figure} diff --git a/test/m2m/listOfTemplates-ord-list/expect.tex b/test/m2m/listOfTemplates-ord-list/expect.tex --- a/test/m2m/listOfTemplates-ord-list/expect.tex +++ b/test/m2m/listOfTemplates-ord-list/expect.tex @@ -1,54 +1,54 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}} \caption{1}\label{fig:1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}} \caption{2}\label{fig:2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}} \caption{3}\label{fig:3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}} \caption{4}\label{fig:4} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}} \caption{5}\label{fig:5} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}} \caption{6}\label{fig:6} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}} \caption{7}\label{fig:7} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}} \caption{8}\label{fig:8} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}} \caption{9}\label{fig:9} \end{figure} diff --git a/test/m2m/listOfTemplates/expect.tex b/test/m2m/listOfTemplates/expect.tex --- a/test/m2m/listOfTemplates/expect.tex +++ b/test/m2m/listOfTemplates/expect.tex @@ -1,54 +1,54 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}} \caption{1}\label{fig:1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}} \caption{2}\label{fig:2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}} \caption{3}\label{fig:3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}} \caption{4}\label{fig:4} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}} \caption{5}\label{fig:5} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}} \caption{6}\label{fig:6} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}} \caption{7}\label{fig:7} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}} \caption{8}\label{fig:8} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}} \caption{9}\label{fig:9} \end{figure} diff --git a/test/m2m/loxItemTitle/expect.tex b/test/m2m/loxItemTitle/expect.tex --- a/test/m2m/loxItemTitle/expect.tex +++ b/test/m2m/loxItemTitle/expect.tex @@ -1,54 +1,54 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}} \caption{1}\label{fig:1} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}} \caption{2}\label{fig:2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}} \caption{3}\label{fig:3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}} \caption{4}\label{fig:4} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}} \caption{5}\label{fig:5} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}} \caption{6}\label{fig:6} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}} \caption{7}\label{fig:7} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}} \caption{8}\label{fig:8} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}} \caption{9}\label{fig:9} \end{figure} diff --git a/test/m2m/numberOverride/expect.tex b/test/m2m/numberOverride/expect.tex --- a/test/m2m/numberOverride/expect.tex +++ b/test/m2m/numberOverride/expect.tex @@ -4,7 +4,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1}]{img2.png}} \caption{Image 1}\label{fig:img1} \end{figure} @@ -12,19 +12,19 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.6.2}]{img2.png}} \caption{Image 1.6.2}\label{fig:img2} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.6.100500}]{img2.png}} \caption{Image 1.6.100500}\label{fig:img3} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.6.100501}]{img2.png}} \caption{Image 1.6.100501}\label{fig:img4} \end{figure} @@ -32,18 +32,18 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.7.1}]{img2.png}} \caption{Image 1.7.1}\label{fig:img21} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.7.100500}]{img2.png}} \caption{Image 1.7.100500}\label{fig:img31} \end{figure} \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{img2.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Image 1.7.100501}]{img2.png}} \caption{Image 1.7.100501}\label{fig:img41} \end{figure} diff --git a/test/m2m/secLabels/expect.tex b/test/m2m/secLabels/expect.tex --- a/test/m2m/secLabels/expect.tex +++ b/test/m2m/secLabels/expect.tex @@ -4,7 +4,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{myfig.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={my figure}]{myfig.png}} \caption{my figure}\label{fig:myfig} \end{figure} diff --git a/test/m2m/setLabelAttribute/expect.tex b/test/m2m/setLabelAttribute/expect.tex --- a/test/m2m/setLabelAttribute/expect.tex +++ b/test/m2m/setLabelAttribute/expect.tex @@ -2,7 +2,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{./image.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={Figure}]{./image.png}} \caption{Figure}\label{fig:1} \end{figure} 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} -\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}}\label{fig:subfig1}} -\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}}\label{fig:subfig2}} -\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}}} +\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\label{fig:subfig1}} +\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\label{fig:subfig2}} +\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}} -\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}}\label{fig:subfig4}} -\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}}} -\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}}\label{fig:subfig6}} +\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\label{fig:subfig4}} +\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}} +\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\label{fig:subfig6}} -\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}}\label{fig:subfig7}} -\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}}} -\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}}\label{fig:subfig9}} +\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\label{fig:subfig7}} +\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}} +\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\label{fig:subfig9}} \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}}\label{fig:subfig21}} +\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\label{fig:subfig21}} -\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}}\label{fig:subfig22}} +\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\label{fig:subfig22}} -\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}}} +\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}} -\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}}\label{fig:subfig24}} +\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\label{fig:subfig24}} -\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}}} +\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}} -\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}}\label{fig:subfig26}} +\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\label{fig:subfig26}} -\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}}\label{fig:subfig27}} +\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\label{fig:subfig27}} -\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}}} +\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}} -\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}}\label{fig:subfig29}} +\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\label{fig:subfig29}} \caption{Caption}\label{fig:subfigures2} diff --git a/test/m2m/subfigures-grid/expect.md b/test/m2m/subfigures-grid/expect.md --- a/test/m2m/subfigures-grid/expect.md +++ b/test/m2m/subfigures-grid/expect.md @@ -1,37 +1,16 @@ You can define subfigures: :::: {#fig:subfigures .figure .subfigures} -+:------------------:+:------------------:+:------------------:+ -| :::: {#fi | :::: {#fi | :::: figure | -| g:subfig1 .figure} | g:subfig2 .figure} | ![c](fig3. | -| ![a](fig1. | ![b](fig2. | png){width="100%"} | -| png){width="100%"} | png){width="100%"} | | -| | | ::: caption | -| ::: caption | ::: caption | c | -| a | b | ::: | -| ::: | ::: | :::: | -| :::: | :::: | | -+--------------------+--------------------+--------------------+ -| :::: {#fi | :::: figure | :::: {#fi | -| g:subfig4 .figure} | ![e](fig5. | g:subfig6 .figure} | -| ![d](fig4. | png){width="100%"} | ![f](fig6. | -| png){width="100%"} | | png){width="100%"} | -| | ::: caption | | -| ::: caption | e | ::: caption | -| d | ::: | f | -| ::: | :::: | ::: | -| :::: | | :::: | -+--------------------+--------------------+--------------------+ -| :::: {#fi | :::: figure | :::: {#fi | -| g:subfig7 .figure} | ![h](fig8. | g:subfig9 .figure} | -| ![g](fig7. | png){width="100%"} | ![i](fig9. | -| png){width="100%"} | | png){width="100%"} | -| | ::: caption | | -| ::: caption | h | ::: caption | -| g | ::: | i | -| ::: | :::: | ::: | -| :::: | | :::: | -+--------------------+--------------------+--------------------+ ++:---------------------------:+:----------------------------:+:----------------------------:+ +| ![a](fig1.png){#fig:subfig1 | ![b](fig2.png){#fig:subfig2 | ![c](fig3.png){width="100%"} | +| width="100%"} | width="100%"} | | ++-----------------------------+------------------------------+------------------------------+ +| ![d](fig4.png){#fig:subfig4 | ![e](fig5.png){width="100%"} | ![f](fig6.png){#fig:subfig6 | +| width="100%"} | | width="100%"} | ++-----------------------------+------------------------------+------------------------------+ +| ![g](fig7.png){#fig:subfig7 | ![h](fig8.png){width="100%"} | ![i](fig9.png){#fig:subfig9 | +| width="100%"} | | width="100%"} | ++-----------------------------+------------------------------+------------------------------+ ::: caption Figure 1: Caption. a --- 1, b --- 2, c --- 3, d --- 4, e --- 5, f --- 6, 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} -\subfloat[1]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig1.png}\label{fig:subfig1}} -\subfloat[2]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig2.png}\label{fig:subfig2}} -\subfloat[3]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig3.png}} +\subfloat[1]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={1}]{fig1.png}\label{fig:subfig1}} +\subfloat[2]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={2}]{fig2.png}\label{fig:subfig2}} +\subfloat[3]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={3}]{fig3.png}} -\subfloat[4]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig4.png}\label{fig:subfig4}} -\subfloat[5]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig5.png}} -\subfloat[6]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig6.png}\label{fig:subfig6}} +\subfloat[4]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={4}]{fig4.png}\label{fig:subfig4}} +\subfloat[5]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={5}]{fig5.png}} +\subfloat[6]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={6}]{fig6.png}\label{fig:subfig6}} -\subfloat[7]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig7.png}\label{fig:subfig7}} -\subfloat[8]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig8.png}} -\subfloat[9]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio]{fig9.png}\label{fig:subfig9}} +\subfloat[7]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={7}]{fig7.png}\label{fig:subfig7}} +\subfloat[8]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={8}]{fig8.png}} +\subfloat[9]{\includegraphics[width=0.3\linewidth,height=\textheight,keepaspectratio,alt={9}]{fig9.png}\label{fig:subfig9}} \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}}\label{fig:subfig21}} +\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\label{fig:subfig21}} -\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}}\label{fig:subfig22}} +\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\label{fig:subfig22}} -\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}}} +\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}} -\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}}\label{fig:subfig24}} +\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\label{fig:subfig24}} -\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}}} +\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}} -\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}}\label{fig:subfig26}} +\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\label{fig:subfig26}} -\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}}\label{fig:subfig27}} +\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\label{fig:subfig27}} -\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}}} +\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}} -\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}}\label{fig:subfig29}} +\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\label{fig:subfig29}} \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 @@ -6,9 +6,9 @@ \begin{pandoccrossrefsubfigures} \subfloat[cool -caption]{\includegraphics[width=0.4\linewidth,height=\textheight,keepaspectratio]{/tmp/LaTeX_logo.svg.png}\label{fig:logo1}} +caption]{\includegraphics[width=0.4\linewidth,height=\textheight,keepaspectratio,alt={cool caption}]{/tmp/LaTeX_logo.svg.png}\label{fig:logo1}} \subfloat[cooler -caption]{\includegraphics[width=0.4\linewidth,height=\textheight,keepaspectratio]{/tmp/LaTeX_logo.svg.png}\label{fig:logo2}} +caption]{\includegraphics[width=0.4\linewidth,height=\textheight,keepaspectratio,alt={cooler caption}]{/tmp/LaTeX_logo.svg.png}\label{fig:logo2}} \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} -\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}}\label{fig:subfig1}} -\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}}\label{fig:subfig2}} -\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}}} +\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\label{fig:subfig1}} +\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\label{fig:subfig2}} +\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}} -\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}}\label{fig:subfig4}} -\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}}} -\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}}\label{fig:subfig6}} +\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\label{fig:subfig4}} +\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}} +\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\label{fig:subfig6}} -\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}}\label{fig:subfig7}} -\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}}} -\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}}\label{fig:subfig9}} +\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\label{fig:subfig7}} +\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}} +\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\label{fig:subfig9}} \caption{Caption}\label{fig:subfigures} @@ -20,23 +20,23 @@ \begin{pandoccrossrefsubfigures} -\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio]{fig1.png}}\label{fig:subfig21}} +\subfloat[1]{\pandocbounded{\includegraphics[keepaspectratio,alt={1}]{fig1.png}}\label{fig:subfig21}} -\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio]{fig2.png}}\label{fig:subfig22}} +\subfloat[2]{\pandocbounded{\includegraphics[keepaspectratio,alt={2}]{fig2.png}}\label{fig:subfig22}} -\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio]{fig3.png}}} +\subfloat[3]{\pandocbounded{\includegraphics[keepaspectratio,alt={3}]{fig3.png}}} -\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio]{fig4.png}}\label{fig:subfig24}} +\subfloat[4]{\pandocbounded{\includegraphics[keepaspectratio,alt={4}]{fig4.png}}\label{fig:subfig24}} -\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio]{fig5.png}}} +\subfloat[5]{\pandocbounded{\includegraphics[keepaspectratio,alt={5}]{fig5.png}}} -\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio]{fig6.png}}\label{fig:subfig26}} +\subfloat[6]{\pandocbounded{\includegraphics[keepaspectratio,alt={6}]{fig6.png}}\label{fig:subfig26}} -\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio]{fig7.png}}\label{fig:subfig27}} +\subfloat[7]{\pandocbounded{\includegraphics[keepaspectratio,alt={7}]{fig7.png}}\label{fig:subfig27}} -\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio]{fig8.png}}} +\subfloat[8]{\pandocbounded{\includegraphics[keepaspectratio,alt={8}]{fig8.png}}} -\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio]{fig9.png}}\label{fig:subfig29}} +\subfloat[9]{\pandocbounded{\includegraphics[keepaspectratio,alt={9}]{fig9.png}}\label{fig:subfig29}} \caption{Caption}\label{fig:subfigures2} diff --git a/test/m2m/titlesInRefs/expect.tex b/test/m2m/titlesInRefs/expect.tex --- a/test/m2m/titlesInRefs/expect.tex +++ b/test/m2m/titlesInRefs/expect.tex @@ -2,7 +2,7 @@ \begin{figure} \centering -\pandocbounded{\includegraphics[keepaspectratio]{figure.png}} +\pandocbounded{\includegraphics[keepaspectratio,alt={A Figure}]{figure.png}} \caption{A Figure}\label{fig:figure} \end{figure} diff --git a/test/test-pandoc-crossref.hs b/test/test-pandoc-crossref.hs --- a/test/test-pandoc-crossref.hs +++ b/test/test-pandoc-crossref.hs @@ -324,7 +324,7 @@ it "Image labels" $ figure "img.png" "" "Title" Nothing "figure_label1" <> para (citeGen "fig:figure_label" [1]) - `test` "\\begin{figure}\n\\centering\n\\pandocbounded{\\includegraphics[keepaspectratio]{img.png}}\n\\caption{Title}\\label{fig:figure_label1}\n\\end{figure}\n\nfig.~\\ref{fig:figure_label1}" + `test` "\\begin{figure}\n\\centering\n\\pandocbounded{\\includegraphics[keepaspectratio,alt={Title}]{img.png}}\n\\caption{Title}\\label{fig:figure_label1}\n\\end{figure}\n\nfig.~\\ref{fig:figure_label1}" #ifdef FLAKY it "Eqn labels" $