From bceb5e2099dd9ad4b4c76d08e634570dad87dbeb Mon Sep 17 00:00:00 2001
From: smeyer <smeyer@00db46b3-68df-0310-9c12-caf00c1e9a41>
Date: Thu, 6 Feb 2025 15:36:29 +0000
Subject: [PATCH] replace outdated LaTeX package in installed Rnw file and test
 rendering

git-svn-id: https://svn.r-project.org/R/trunk@87698 00db46b3-68df-0310-9c12-caf00c1e9a41
---
 src/library/utils/inst/Sweave/Sweave-test-1.Rnw |  4 ++--
 src/library/utils/tests/Sweave-tst.R            | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/library/utils/inst/Sweave/Sweave-test-1.Rnw b/src/library/utils/inst/Sweave/Sweave-test-1.Rnw
index ae5bd354486..bc4ac912b74 100644
--- a/src/library/utils/inst/Sweave/Sweave-test-1.Rnw
+++ b/src/library/utils/inst/Sweave/Sweave-test-1.Rnw
@@ -1,11 +1,11 @@
 % -*- mode: noweb; noweb-default-code-mode: R-mode; -*-
-\documentclass[a4paper]{article}
+\documentclass{article}
 
 \title{A Test File}
 \author{Friedrich Leisch}
 
 \SweaveOpts{echo=FALSE}
-\usepackage{a4wide}
+\usepackage[a4paper,margin=1in]{geometry}
 
 \begin{document}
 
diff --git a/src/library/utils/tests/Sweave-tst.R b/src/library/utils/tests/Sweave-tst.R
index 2444325a8e9..34e843b4b9c 100644
--- a/src/library/utils/tests/Sweave-tst.R
+++ b/src/library/utils/tests/Sweave-tst.R
@@ -16,18 +16,17 @@
 
 ## Testing Sweave
 
-.proctime00 <- proc.time()
 library(utils)
 options(digits = 5) # to avoid trivial printed differences
 options(show.signif.stars = FALSE) # avoid fancy quotes in o/p
 
 SweaveTeX <- function(file, ...) {
     if(!file.exists(file))
-        stop("File", file, "does not exist in", getwd())
+        stop("File ", sQuote(file), " does not exist in ", getwd())
     texF <- sub("\\.[RSrs]nw$", ".tex", file)
     Sweave(file, ...)
     if(!file.exists(texF))
-        stop("File", texF, "does not exist in", getwd())
+        stop("File ", sQuote(texF), " does not exist in ", getwd())
     readLines(texF)
 }
 
@@ -80,5 +79,10 @@ Sweave("customgraphics.Rnw")
 Sweave(f <- "Sexpr-verb-ex.Rnw")
 tools::texi2pdf(sub("Rnw$","tex", f))# used to fail
 
-
-cat('Time elapsed: ', proc.time() - .proctime00,'\n')
+### ------------------------------------ 5 ----------------------------------
+## render the installed Rnw file from example(Sweave), using R CMD Sweave
+testfile <- system.file("Sweave", "Sweave-test-1.Rnw", package = "utils")
+stopifnot(exprs = {
+    tools::Rcmd(c("Sweave", "--help")) == 0L
+    tools::Rcmd(c("Sweave", "--pdf", testfile)) == 0L
+})