fix Rd2pdf for --latex installations with help figures

git-svn-id: https://svn.r-project.org/R/trunk@87661 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/NEWS.Rd

@@ -534,6 +534,9 @@
       \item \code{tools::Rd2latex()} now removes leading and trailing
       spaces from \verb{\alias} entries as documented, fixing indexing
       and linking hiccups in some PDF manuals.
+
+      \item \command{R CMD Rd2pdf} can now render the package manual from
+      a \option{--latex} installation also when the help contains figures.
     }
   }
 }

src/library/tools/R/Rd2pdf.R

@@ -344,6 +344,9 @@
                 graphicspath <- file.path(mandir, "figures")
             if (!silent) message(domain = NA)
         }
+    } else {
+        graphicspath <- file.path(pkgdir, "help", "figures")
+        hasFigures <- dir.exists(graphicspath)
     }
 
     ## There are some restrictions, but the former "[[:alnum:]]+\\.tex$" was
@@ -362,7 +365,7 @@
         cat("\n\\chapter{The \\texttt{", basename(pkgdir), "} package}\n",
             sep = "", file = outcon)
 
-    if (!is.null(graphicspath))
+    if (hasFigures && !is.null(graphicspath))
         cat(.file_path_to_LaTeX_graphicspath(graphicspath), "\n",
             sep = "", file = outcon)