Commit Graph

9 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
5317533f9a - Fix Sweave support for document encoding with R >= 2.13.1 (bug 7876).
(backport from trunk)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40328 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-01 13:50:08 +00:00
Jean-Marc Lasgouttes
40979265ff Backport r39506 (see #7555)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39507 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-23 10:11:33 +00:00
Jean-Marc Lasgouttes
c87c1a06e8 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



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39141 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-20 12:15:30 +00:00
Jean-Marc Lasgouttes
8c5e13335c 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
2011-06-15 15:04:42 +00:00
Jean-Marc Lasgouttes
0a65e96ed3 Improvements to lyx sweave support
- 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
2011-04-13 10:04:20 +00:00
Jean-Marc Lasgouttes
edd51121d8 Almost finish fixing bug http://www.lyx.org/trac/ticket/6623
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
2011-03-21 14:48:22 +00:00
Jean-Marc Lasgouttes
425f46bea5 * add an extra parameter to lyxsweave.py that tells the document directory
and use it to be able to read data files in there (bug #6623). It is probably possible to use sweave hooks instead of the module preamble. Moreover, I want to investigate the use of prefix.string argument of sweave to make sure that the output files end up in the tmp dir.
  * be more subtle in the way to change default encoding to handle the case where a data file that is read does not use the same encoding as the .rnw file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 21:25:57 +00:00
Jean-Marc Lasgouttes
9ebd4405cf Make sweave process files with the correct encoding (#6625).
The required the introduction of the new converter token $$e, that holds
the iconv name of the latex file encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35772 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-22 07:51:39 +00:00
Jean-Marc Lasgouttes
be8cf7c98c Introduce helper script for Sweave. The first benefit is that
Sweave.sty path is hardcoded if LaTeX cannot find it.

More to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35750 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-21 17:02:05 +00:00