Fix PR: pandocbounded should be used when...

no width or height is given, not the reverse.
jgm · Apr 18, 2024 · 108a2c0 · 108a2c0
1 parent afc552b
commit 108a2c0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -1095,8 +1095,8 @@ inlineToLaTeX (Image attr@(_,_,kvs) _ (source, _)) = do
  return $
  (if inHeading then "\\protect" else "") <>
  (case dimension Width attr `mplus` dimension Height attr of
- Nothing -> id
- Just _ -> ("\\pandocbounded" <>) . braces)
+ Just _ -> id
+ Nothing -> ("\\pandocbounded" <>) . braces)
  ((if isSVG then "\\includesvg" else "\\includegraphics") <>
  options <> braces (literal source''))
 inlineToLaTeX (Note contents) = do

diff --git a/test/Tests/Writers/LaTeX.hs b/test/Tests/Writers/LaTeX.hs
@@ -70,7 +70,7 @@ tests = [ testGroup "code blocks"
  "\\begin{description}\n\\item[foo] ~ \n\\subsection{bar}\n\nbaz\n\\end{description}"
  , "containing image" =:
  header 1 (image "imgs/foo.jpg" "" (text "Alt text")) =?>
- "\\section{\\texorpdfstring{\\protect\\includegraphics{imgs/foo.jpg}}{Alt text}}"
+ "\\section{\\texorpdfstring{\\protect\\pandocbounded{\\includegraphics{imgs/foo.jpg}}}{Alt text}}"
  ]
  , testGroup "inline code"
  [ "struck out and highlighted" =:

diff --git a/test/command/3450.md b/test/command/3450.md
@@ -8,5 +8,5 @@
 % pandoc -fmarkdown-implicit_figures -t latex
 ![image](lalune.jpg){height=2em}
 ^D
-\pandocbounded{\includegraphics[width=\textwidth,height=2em]{lalune.jpg}}
+\includegraphics[width=\textwidth,height=2em]{lalune.jpg}
 ```
diff --git a/test/command/5476.md b/test/command/5476.md
@@ -4,7 +4,7 @@
 ^D
 \begin{figure}
 \centering
-\includegraphics{test/lalune.jpg}
+\pandocbounded{\includegraphics{test/lalune.jpg}}
 \caption[moon]{moon\footnotemark{}}
 \end{figure}
 \footnotetext{the moon}

diff --git a/test/command/7181.md b/test/command/7181.md
@@ -4,7 +4,7 @@
 ^D
 \begin{figure}
 \centering
-\includegraphics[page=13,trim=1cm,clip,width=4cm]{slides.pdf}
+\pandocbounded{\includegraphics[page=13,trim=1cm,clip,width=4cm]{slides.pdf}}
 \caption{Global frog population.}
 \end{figure}
 

diff --git a/test/command/9045.md b/test/command/9045.md
@@ -4,7 +4,7 @@
 ^D
 \begin{figure}
 \centering
-\includegraphics{there.jpg}
+\pandocbounded{\includegraphics{there.jpg}}
 \caption{hi}\label{foo}
 \end{figure}
 ```
diff --git a/test/writer.latex b/test/writer.latex
@@ -927,11 +927,11 @@ From ``Voyage dans la Lune'' by Georges Melies (1902):
 
 \begin{figure}
 \centering
-\includegraphics{lalune.jpg}
+\pandocbounded{\includegraphics{lalune.jpg}}
 \caption{lalune}
 \end{figure}
 
-Here is a movie \includegraphics{movie.jpg} icon.
+Here is a movie \pandocbounded{\includegraphics{movie.jpg}} icon.
 
 \begin{center}\rule{0.5\linewidth}{0.5pt}\end{center}