X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Flyxsweave.R;h=7573d315c1fd5d7b668edd23236757355ef6ae7a;hb=4268a9e8121b08f06706d733e8488e163286eab8;hp=c5d1135d79ec1421b46e7b85df6e53c26ea8e70c;hpb=c9d9bde0b21f59a66ef3096ecedb3fd224c63209;p=lyx.git

diff --git a/lib/scripts/lyxsweave.R b/lib/scripts/lyxsweave.R
index c5d1135d79..7573d315c1 100644
--- a/lib/scripts/lyxsweave.R
+++ b/lib/scripts/lyxsweave.R
@@ -14,6 +14,7 @@
 # argument 4 is the original document directory
 
 .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
@@ -22,14 +23,14 @@
 # The advantage compared to the use of stylepath, is that the exported
 # .tex file will be portable to another machine. (JMarc)
 if (!length(system("kpsewhich Sweave.sty", intern=TRUE, ignore.stderr=TRUE))) {
-  file.copy(file.path(R.home("share"), "texmf", "tex", "latex", "Sweave.sty"),
-    dirname(.cmdargs[2]), overwrite=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; .orig.enc is used in
-# the sweave module preamble to reset the encoding to what it was.
-.orig.enc <- getOption("encoding")
-options(encoding=.cmdargs[3])
 
 # Change current directory to the document directory, so that R can find 
 # data files.
@@ -42,15 +43,34 @@ tmpout <- gsub(".", "-", sub("\\.tex$", "", basename(.cmdargs[2])), fixed = TRUE
 .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=.cmdargs[1], output=.cmdargs[2], syntax="SweaveSyntaxNoweb", prefix.string=.prefix.str)
+
+# 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
-options(encoding=.cmdargs[3])  # encoding has 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)
+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)
+   ls.doc[ls.idx] <- sub(ls.cmd, "\\includegraphics{", ls.doc[ls.idx], fixed = TRUE)
    writeLines(ls.doc, .cmdargs[2])
 }