anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Almost finish fixing bug http://www.lyx.org/trac/ticket/6623

Browse Source 
Now we specify the output file for sweave explicitely for robustness reasons.
We also specify prefix.string (in order to have the temp files generated in lyx tmp directory.

The only annoying file now is Rplots.pdf, but I am not sure why it is generated... 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37984 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-03-21 14:48:22 +00:00
parent 7832d3c275
commit edd51121d8
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -627,7 +627,7 @@ def checkConverterEntries():
rc_entry = [r'''\converter literate latex "%%" "" rc_entry = [r'''\converter literate latex "%%" ""
\converter literate pdflatex "%%" ""''']) \converter literate pdflatex "%%" ""'''])
# #
checkProg('a Sweave -> LaTeX converter', ['Rscript --no-save --no-restore $$s/scripts/lyxsweave.R $$p$$i $$e $$r'], checkProg('a Sweave -> LaTeX converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxsweave.R $$p$$i $$p$$o $$e $$r'],
rc_entry = [r'''\converter sweave latex "%%" "" rc_entry = [r'''\converter sweave latex "%%" ""
\converter sweave pdflatex "%%" ""''']) \converter sweave pdflatex "%%" ""'''])
# #

21
lib/scripts/lyxsweave.R
View File

@ -1,7 +1,8 @@
# Wrapper around Sweave that sets up some things for LyX # Wrapper around Sweave that sets up some things for LyX
# argument 1 is the file name # argument 1 is the absolute name of the input file
# argument 2 is the iconv name for the encoding of the file # argument 2 is the absolute name of the output file
# argument 3 is the document directory # 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=T)
@ -11,11 +12,15 @@ ls.sp <- (length(ls.sweavesty) == 0)
# set default encoding to the one of the file; it will be reset to previous # set default encoding to the one of the file; it will be reset to previous
# default by the sweave module # default by the sweave module
ls.enc=getOption("encoding") ls.enc <- getOption("encoding")
options(encoding=ls.args[2]) options(encoding=ls.args[3])
# pass document dir to sweave module # pass document dir to sweave module
ls.dir <- ls.args[3] ls.dir <- ls.args[4]
#run sweave # this is used to tell where temporary files should go
Sweave(ls.args[1], stylepath=ls.sp) ls.pr <- sub("\\.tex$", "", ls.args[2])
# finally run sweave
Sweave(file=ls.args[1], output=ls.args[2], syntax="SweaveSyntaxNoweb", stylepath=ls.sp, prefix.string=ls.pr)