Fix bug #7552: Use of expression() in plot R command fails

[lyx.git] / lib / scripts / lyxsweave.R

diff --git a/lib/scripts/lyxsweave.R b/lib/scripts/lyxsweave.R
index a8ab1849842204492793b5c16a79478aa3f6ac56..bdc3d500d21b862d9863a59e5b51d95aaf914518 100644 (file)
--- a/lib/scripts/lyxsweave.R
+++ b/lib/scripts/lyxsweave.R
@@ -1,15 +1,37 @@
+# file lyxsweave.R
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+
+# author Jean-Marc Lasgouttes
+
+# Full author contact details are available in file CREDITS
+
 # Wrapper around Sweave that sets up some things for LyX
-# argument 1 is the file name
-# argument 2 is the iconv name for the encoding of the file
+# argument 1 is the absolute name of the input file
+# argument 2 is the absolute name of the output file
+# argument 3 is the iconv name for the encoding of the file
+# argument 4 is the original document directory
 
-ls.args <- commandArgs(trailingOnly=T)
+ls.args <- commandArgs(trailingOnly=TRUE)
 
-# check whether Sweave.sty is seen by LaTeX
-ls.sweavesty <- system("kpsewhich Sweave.sty", intern=T, ignore.stderr=T)
+# check whether Sweave.sty is seen by LaTeX. if it is not, we will
+# pass the option stylepath=TRUE to sweave so that a full path is given
+# to \usepackage.
+ls.sweavesty <- system("kpsewhich Sweave.sty", intern=TRUE, ignore.stderr=TRUE)
 ls.sp <- (length(ls.sweavesty) == 0)
 
-# set default encoding to the one of the file
-options(encoding=ls.args[2])
+# 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])
+
+# this is passed as a prefix.string to tell where temporary files should go
+ls.pr <- gsub('\\.([^/]*)$', '-\\1', sub("\\.tex$", "", ls.args[2]))
+
 
-#run sweave
-Sweave(ls.args[1], stylepath=ls.sp)
+# finally run sweave
+Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb", stylepath=ls.sp, prefix.string=ls.pr)