Commit Graph

57 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
b92ceba9a1 Honor trailing spaces in LabelString and friends
Remove the trimming operation on LabelString, LabelStringAppendix,
EndLabelString and LabelCounter. This trimming meant that quotes
strings were not preserved, which is wrong.

To preserve layouts, the Layout format has been updated to 64, so that
layout2layout can remove extra spaces on existing strings, which
ensures that behavior is unchanged for old layouts (courtesy of rgheck).

It is now possible to re-add spaces in label strings where it makes
sense.

Fixes bug #10723.

(cherry picked from commit 5c54557350)
2017-09-02 16:08:56 +02:00
Juergen Spitzmueller
a33157331b Bump layout formats 2017-01-13 10:09:20 +01:00
Guillaume Munch
d1c1a4520c Fine tune AddToToc options for Sweave, Knitr 2017-01-09 18:22:22 +01:00
Juergen Spitzmueller
95db20e008 Bump layout formats 2016-10-22 09:25:01 +02:00
Jean-Marc Lasgouttes
6196645cce Update documents and layouts after fd1ee3b4. 2016-04-01 10:08:39 +02:00
Guillaume Munch
4fa5cbddce Update layouts
3c9b62a69 only added new keywords, so nothing changes, as it should be.
2016-01-11 16:27:46 +00:00
Richard Heck
4d6f9eb089 Update layout files to format 58. 2015-12-05 18:14:38 -05:00
Scott Kostyshak
82cf4838dc Update layouts to 2.2.0alpha1 format 2015-11-13 13:19:22 -05:00
Georg Baum
486c7cc069 Convert layout files to current format 2015-01-11 20:25:58 +01:00
Juergen Spitzmueller
43c0149796 Update layouts to current format 2014-12-08 09:24:44 +01:00
Georg Baum
6b49b6b129 Fix conflicting inset font defaults (bug #8874)
This makes the defaults of Inset::inheritFont() and Inset::resetFontEdit()
compatible. There is no user visible change except for the Chunk inset which
does not produce invalid LaTeX after editing operations anymore.
This is the safe version for 2.1.0, for later there are still open questions:
- All insets with ResetsFont true should be audited: Is this really needed,
  or do they show similar editing problems as the Chunk inset?
- Does inheritFont() need to be customizable in the layout file as well?
- Is resetFontEdit() != !inheritFont() needed at all?
I did not use change tracking for the docs, since I updated all existing
translations.
2014-02-10 22:06:32 +01:00
Vincent van Ravesteijn
d27668841b Update layouts to latest fileformat 2013-06-04 19:48:19 +02:00
Richard Heck
4106fe37ac Use counter for new chunk insets, and set it to 2 in knitr and
sweave modules.
2013-06-01 17:42:36 -04:00
Richard Heck
8f044f3c95 Patch to convert Sweave chunk paragraphs to insets (bug #8588). Work
by Liviu (C++) and Richard (Python).
2013-05-30 10:20:34 -04:00
Georg Baum
eb53c60a8f Complete the NoInsetLayout format change 2013-02-21 21:57:59 +01:00
Richard Heck
460b44b8f5 Update all layouts to format 44. 2013-02-09 13:44:06 -05:00
Juergen Spitzmueller
2a62a2c395 update layout format 2012-12-30 18:35:23 +01:00
Juergen Spitzmueller
b0aa0db10a Bump layout format 2012-12-22 11:39:04 +01:00
Juergen Spitzmueller
ff42273bb5 Bump layout formats 2012-11-23 09:50:22 +01:00
Richard Heck
7195abcb4f Update all layouts to format 40. 2012-10-10 13:24:02 -04:00
Richard Heck
8ba08a53b2 Update all layouts to format 36.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40428 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-07 22:41:38 +00:00
Uwe Stöhr
4fbe32b0fd sweave.module: more precise description text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39610 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-06 03:14:51 +00:00
Jean-Marc Lasgouttes
c9d9bde0b2 Sweave support cleanup (patch from yihui, see #7555)
http://www.lyx.org/trac/ticket/7555

This part is a simple cleanup:

 * rename variables to start with a dot
 * reset encoding after running sweave
 * improve on-screen display of code chunks



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39506 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-23 09:52:21 +00:00
Jean-Marc Lasgouttes
02705c524c Small cleanups to sweave module, as discussed in bug #7555.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39180 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-21 12:55:20 +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