anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 14:04:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improvements to lyx sweave support

Browse Source 
- use a null device to avoid the extra Rplots.pdf file created by Sweave
- use directly setwd() instead of in the preamble of the module
- add lots of comments.

This finally fixes ticket #6623.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38359 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-04-13 10:04:20 +00:00
parent 931b6db933
commit 0a65e96ed3
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/layouts/sweave.module
View File

@ -21,7 +21,6 @@ End
Preamble Preamble
<<echo=F>>= <<echo=F>>=
if(exists("ls.dir")) setwd(ls.dir)
if(exists("ls.enc")) options(encoding=ls.enc) if(exists("ls.enc")) options(encoding=ls.enc)
@ @
EndPreamble EndPreamble

31
lib/scripts/lyxsweave.R
View File

@ -1,26 +1,41 @@
# 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 # Wrapper around Sweave that sets up some things for LyX
# argument 1 is the absolute name of the input file # argument 1 is the absolute name of the input file
# argument 2 is the absolute name of the output file # argument 2 is the absolute name of the output file
# argument 3 is the iconv name for the encoding of the file # argument 3 is the iconv name for the encoding of the file
# argument 4 is the original document directory # 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 # check whether Sweave.sty is seen by LaTeX. if it is not, we will
ls.sweavesty <- system("kpsewhich Sweave.sty", intern=T, ignore.stderr=T) # 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) ls.sp <- (length(ls.sweavesty) == 0)
# set default encoding to the one of the file; it will be reset to previous # set default encoding for input and output files; ls.enc is used in
# default by the sweave module # the sweave module preamble to reset the encoding to what it was.
ls.enc <- getOption("encoding") ls.enc <- getOption("encoding")
options(encoding=ls.args[3]) options(encoding=ls.args[3])
# pass document dir to sweave module # Change current directory to the document directory, so that R can find
ls.dir <- ls.args[4] # data files.
setwd(ls.args[4])
# this is used to tell where temporary files should go # this is passed as a prefix.string to tell where temporary files should go
ls.pr <- sub("\\.tex$", "", ls.args[2]) 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")
# finally run sweave # 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", stylepath=ls.sp, prefix.string=ls.pr)