Commit Graph

34 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
4cdaaa409d Backport r39180 (small sweave cleanups). No status entry necessary.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39181 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-21 13:00:19 +00:00
Julien Rioux
68ad320f76 * sweave.module
Use AddToPreamble here. We don't want to overwrite the preamble from the layout file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38427 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-17 18:12:31 +00:00
Richard Heck
2d2d946fc6 Update all layouts to format 35.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38392 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 02:51:32 +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
Julien Rioux
bd77f3b8e2 we don't allow mixing different literate formats for now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38146 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 00:32:11 +00:00
Richard Heck
3ccd0abf7e Update all layouts to format 34.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38097 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 15:18:40 +00:00
Richard Heck
f9b4dde589 Update all layouts to format 33.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37431 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 22:29:32 +00:00
Richard Heck
41d858b88c Update all layouts to format 32.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37425 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 17:13:37 +00:00
Jean-Marc Lasgouttes
8a84eeb27a forbid spellchecking in code layouts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37324 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-25 14:17:07 +00:00
Pavel Sanda
9d76ec23d5 Add comment to sweave
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37219 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-15 20:11:02 +00:00
Richard Heck
874e867953 Update all layouts to format 31.
Should have done this first!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37196 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:20:07 +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
Pavel Sanda
58805a5132 Kill literate programming strings
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg163726.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 23:17:44 +00:00
Pavel Sanda
276170fd6f Synchronize naming of modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36488 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:40:28 +00:00
Jean-Marc Lasgouttes
b9b619641b This patch implements proper ERT behaviour for normal layouts.
In particular, it makes paragraph breaks generate single \n in latex output
when ParbreakIsNewline is true

This means that it is not necessary anymore to use newlines to break lines. 
Plain paragraph breaks can be used instead, like is done now in ERT/Listings. 
This is mainly aimed at sweave support.

lyx2lyx support courtesy of Richard Heck



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 15:06:19 +00:00
Richard Heck
69b1ea0ecf Update layouts to format 30.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35629 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 16:54:57 +00:00
Richard Heck
5142d1c86a Now update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35614 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 15:41:55 +00:00
Richard Heck
de815f594e Revert update of formats. There is more to be done first.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35612 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 15:11:04 +00:00
Richard Heck
b653286691 Update layouts to new format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35610 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 15:06:50 +00:00
Richard Heck
3b716ae11e Update all layouts to current format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35481 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-22 12:21:42 +00:00
Jean-Marc Lasgouttes
6aa26820fd Introduce new tag ParbreakIsNewline in Layout and InsetLayout (not yet used)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 21:20:29 +00:00
Richard Heck
f9377c8bcc Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34595 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:28:21 +00:00
Jean-Marc Lasgouttes
b8fb599130 Fix ticket #6634: LyX should pass the "noae" option to Sweave.sty
We pass it as a global document option.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 21:34:22 +00:00
Richard Heck
e392cff392 Update layouts to format 26.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33922 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 18:51:41 +00:00
Richard Heck
2dfaebd243 Update layouts to format 25.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33796 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 22:21:56 +00:00
Richard Heck
99bbf5b42a Update layouts to format 24.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33634 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 23:02:24 +00:00
Richard Heck
b7d665da7f Update all layouts to format 22.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33118 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 21:01:07 +00:00
Richard Heck
082bdf47c9 Update all layout files to format 21.
Note: Anyone on *nix can do this by running development/tools/updatelayouts.sh.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33028 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 14:03:59 +00:00
Richard Heck
c48c33cf3a Update all layout files to format 19.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32369 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 22:55:38 +00:00
Richard Heck
7035f4cabb Module categories, for Pavel.
Do free free to change the categories. I just did these ones for testing, really.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31033 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 15:20:11 +00:00
Jean-Marc Lasgouttes
4a2a25c5b7 simplify the sweave module description
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30496 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 10:19:51 +00:00
Jean-Marc Lasgouttes
c6ae2eac9c I forgot than in my earlier commit to these files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30217 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 09:42:46 +00:00
Jean-Marc Lasgouttes
864773d7d9 Allow literate documents other than noweb to work out of the box. Currently
only sweave is supported (for building documentation, not programs).

Layout files allow a new OutputFormat tag 

Modules can be conditionned on a feature of the type from->to, indicating that
it should be possible to convert from format 'from' to format 'to'.

Layout format incremented to 15.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29874 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-28 08:59:25 +00:00
Jean-Marc Lasgouttes
6d08a75d62 New literate programming modules.
These modules allow to use Sweave or Noweb with any LyX textclass.
They will eventually allow to get rid of literate-* classes.

The sweave modules will benefit in trunk from a forthcoming patch which allows 
to select the output format for a literate OutputType. This will allow to
support Sweave out-of-the-box.

For branch, this pair of modules is IMO a candidate for LyX 1.6.4 (no need to
hurry).

Thanks to Gregor Gorjanc for his work on this subject. There is
undoubtlessly some additional work that has to be done here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29657 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-13 21:23:05 +00:00