Backport r38895, r38896 and r39068

This fixes bugs #7551 and #7552


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39069 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-06-15 15:04:42 +00:00
parent dbc96f33e6
commit 8c5e13335c

View File

@ -30,12 +30,10 @@ options(encoding=ls.args[3])
setwd(ls.args[4])
# this is passed as a prefix.string to tell where temporary files should go
ls.pr <- sub("\\.tex$", "", ls.args[2])
# Replace the default pdf device by the null device (tip from Yihui Xie)
# See: http://yihui.name/en/2010/12/a-special-graphics-device-in-r-the-null-device/
.Call("R_GD_nullDevice", PACKAGE = "grDevices")
# 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="/")
# finally run sweave
Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb", stylepath=ls.sp, prefix.string=ls.pr)