X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Flyxsweave.R;h=7573d315c1fd5d7b668edd23236757355ef6ae7a;hb=11cb8997fcfe72a4d48a7ab0fc4cc6d81336d2eb;hp=25cfcb3ac31e7e2a0d0b1ccee29e1f832348ac20;hpb=ebb85745a9ee478d9c59e368b789f3008220e8a0;p=lyx.git

diff --git a/lib/scripts/lyxsweave.R b/lib/scripts/lyxsweave.R
index 25cfcb3ac3..7573d315c1 100644
--- a/lib/scripts/lyxsweave.R
+++ b/lib/scripts/lyxsweave.R
@@ -13,7 +13,8 @@
 # argument 3 is the iconv name for the encoding of the file
 # argument 4 is the original document directory
 
-ls.args <- commandArgs(trailingOnly=TRUE)
+.cmdargs <- commandArgs(trailingOnly=TRUE)
+.doc.enc <- .cmdargs[3]
 
 # check whether Sweave.sty is seen by LaTeX. if it is not, we will
 # copy it alongside the .tex file (in general in the temporary
@@ -21,35 +22,55 @@ ls.args <- commandArgs(trailingOnly=TRUE)
 # but this is a problem of installation of R on the user's machine.
 # The advantage compared to the use of stylepath, is that the exported
 # .tex file will be portable to another machine. (JMarc)
-ls.sweavesty <- system("kpsewhich Sweave.sty", intern=TRUE, ignore.stderr=TRUE)
-if (!length(ls.sweavesty)) {
-   stypath <- file.path(R.home("share"), "texmf", "tex", "latex", "Sweave.sty")
-   file.copy(stypath, dirname(ls.args[2]), overwrite=TRUE)
+if (!length(system("kpsewhich Sweave.sty", intern=TRUE, ignore.stderr=TRUE))) {
+  .texmf.path <- file.path(R.home("share"), "texmf")
+  if (!file.exists(.sweave.sty <- file.path(.texmf.path, "Sweave.sty"))) {
+    .sweave.sty <- file.path(.texmf.path, "tex", "latex", "Sweave.sty")
+  } 
+  file.copy(.sweave.sty, dirname(.cmdargs[2]), overwrite=TRUE)
+  rm(list = c('.sweave.sty', '.texmf.path'))
 }
 
-# set default encoding for input and output files; ls.enc is used in
-# the sweave module preamble to reset the encoding to what it was.
-ls.enc <- getOption("encoding")
-options(encoding=ls.args[3])
 
 # Change current directory to the document directory, so that R can find 
 # data files.
-setwd(ls.args[4])
+setwd(.cmdargs[4])
 
 # this is passed as a prefix.string to tell where temporary files should go
 # the output file without extension and without '.'
-tmpout <- gsub(".", "-", sub("\\.tex$", "", basename(ls.args[2])), fixed = TRUE)
-# replace 
-ls.pr <- paste(dirname(ls.args[2]), tmpout, sep="/")
+tmpout <- gsub(".", "-", sub("\\.tex$", "", basename(.cmdargs[2])), fixed = TRUE)
+# replace
+.prefix.str <- paste(dirname(.cmdargs[2]), tmpout, sep="/")
+rm(tmpout)
+
+# avoid the default Rplots.pdf
+options(device = function(...) {
+  pdf(file = tempfile())
+})
 
 # finally run sweave
-Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb", prefix.string=ls.pr)
+
+# The Sweave version provided with R >= 0.13.1 has proper handling for
+# encodings and our workaround for previous versions does not work
+# anymore. Therefore, the invocation has to be different.
+if (is.null(formals(Sweave)$encoding)) {
+  # set default encoding for input and output files; .orig.enc is used in
+  # the sweave module preamble to reset the encoding to what it was.
+  .orig.enc <- getOption("encoding")
+  options(encoding=.doc.enc)
+  Sweave(file=.cmdargs[1], output=.cmdargs[2], syntax="SweaveSyntaxNoweb", 
+         prefix.string=.prefix.str)
+} else {
+  Sweave(file=.cmdargs[1], output=.cmdargs[2], syntax="SweaveSyntaxNoweb", 
+         prefix.string=.prefix.str, encoding=.doc.enc)
+}
 
 # remove absolute path from \includegraphics
-ls.doc = readLines(ls.args[2])
-ls.cmd = paste('\\includegraphics{', dirname(ls.args[2]), "/", sep = "")
-ls.idx = grep(ls.cmd, ls.doc, fixed = TRUE)
+options(encoding=.doc.enc) # encoding may have been changed in the preamble chunk
+ls.doc <- readLines(.cmdargs[2])
+ls.cmd <- paste('\\includegraphics{', dirname(.cmdargs[2]), "/", sep = "")
+ls.idx <- grep(ls.cmd, ls.doc, fixed = TRUE)
 if (length(ls.idx)) {
-   ls.doc[ls.idx] = sub(ls.cmd, "\\includegraphics{", ls.doc[ls.idx], fixed = TRUE)
-   writeLines(ls.doc, ls.args[2])
+   ls.doc[ls.idx] <- sub(ls.cmd, "\\includegraphics{", ls.doc[ls.idx], fixed = TRUE)
+   writeLines(ls.doc, .cmdargs[2])
 }