Author: lasgouttes
Date: Mon Jun 20 14:15:30 2011
New Revision: 39141
URL: http://www.lyx.org/trac/changeset/39141
Log:
Backport r39070 and r39140.
This fixes two sweave bugs (mainly under windows):
- latex error when the temp dir path contains a space
- latex error when the R dir path contains a space
Modified:
lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R Mon Jun 20
12:59:23 2011 (r39140)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R Mon Jun 20
14:15:30 2011 (r39141)
@@ -3,6 +3,7 @@
# Licence details can be found in the file COPYING.
# author Jean-Marc Lasgouttes
+# author Yihui Xie
# Full author contact details are available in file CREDITS
@@ -15,10 +16,16 @@
ls.args <- commandArgs(trailingOnly=TRUE)
# 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.
+# copy it alongside the .tex file (in general in the temporary
+# directory). This means that an exported LaTeX file will not work,
+# 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)
-ls.sp <- (length(ls.sweavesty) == 0)
+if (!length(ls.sweavesty)) {
+ stypath <- file.path(R.home("share"), "texmf", "tex", "latex", "Sweave.sty")
+ file.copy(stypath, dirname(ls.args[2]), overwrite=TRUE)
+}
# 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.
@@ -36,4 +43,13 @@
ls.pr <- paste(dirname(ls.args[2]), tmpout, sep="/")
# finally run sweave
-Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb",
stylepath=ls.sp, prefix.string=ls.pr)
+Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb",
prefix.string=ls.pr)
+
+# 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)
+if (length(ls.idx)) {
+ ls.doc[ls.idx] = sub(ls.cmd, "\\includegraphics{", ls.doc[ls.idx], fixed =
TRUE)
+ writeLines(ls.doc, ls.args[2])
+}
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Jun 20 12:59:23 2011
(r39140)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Jun 20 14:15:30 2011
(r39141)
@@ -116,6 +116,10 @@
- Fixed the latex flag set by the prefs2prefs script (bug 7610).
+- Fix LaTeX error with Sweave module when the file name contains a
+ dot (bug 7551).
+
+- Fix error with Sweave module when using some R features (bug 7552).
* USER INTERFACE
