- Fix Sweave support for document encoding with R >= 2.13.1 (bug 7876).

(backport from trunk)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40328 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/scripts/lyxsweave.R b/lib/scripts/lyxsweave.R
index c5d1135d79ec1421b46e7b85df6e53c26ea8e70c..fd41a4422ed82df146428b0f46112f51ac0b183f 100644 (file)
--- 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
@@ -26,10 +27,6 @@ if (!length(system("kpsewhich Sweave.sty", intern=TRUE, ignore.stderr=TRUE))) {
     dirname(.cmdargs[2]), overwrite=TRUE)
 }
 
-# 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.
@@ -43,14 +40,28 @@ tmpout <- gsub(".", "-", sub("\\.tex$", "", basename(.cmdargs[2])), fixed = TRUE
 rm(tmpout)
 
 # 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])
 }

diff --git a/status.20x b/status.20x
index 3478f075f749dc47e5514015e638518d91274eea..048b1ed8bdcd437d07bb32cd7f7900bd88be2e42 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -24,6 +24,7 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
+- Fix Sweave support for document encoding with R >= 2.13.1 (bug 7876).
 
 * TEX2LYX IMPROVEMENTS