Commit Graph

27 Commits

Author SHA1 Message Date
Kornel Benko
526380da04 Revert "Remove dependences from .layout files"
Some styles are not second-level dependencies

This reverts commit 92c8a86407.
2018-07-07 16:10:45 +02:00
Kornel Benko
92c8a86407 Remove dependences from .layout files 2018-07-07 14:13:40 +02:00
Juergen Spitzmueller
bbf287a3c6 Allow for cite engine and format definitions/modifications in layouts
Now layout files and modules can extend the cite engines or completely
overwrite them, and modify the cite formats.

Any CiteEngine definition in a layout/module will completely overwrite
those by cite engine files.

AddToCiteEngine will extend them (add if they do not exist yet).

Any CiteFormat definition in a layout will be preferred to those in cite
engines. CiteFormat definitions that are not touched by the former are
still active, though (so, as opposed to CiteEngine, a CiteFormat does
not completely overwrite those by the engine files).

Layout format change.
2018-05-21 12:46:53 +02:00
Juergen Spitzmueller
e11bda2cea Layout format update after 2ba584957c 2018-04-14 10:28:22 +02:00
Juergen Spitzmueller
8d8ee12e64 Update layout format 2018-01-02 11:53:01 +01:00
Juergen Spitzmueller
4345331870 Collapsable -> Collapsible (part 4)
The current spelling is not strictly wrong, but flagged as unusual or
historical by some authorities. It is also found fault with many
spell checkers. Thus we decided to move to the more standard "-ible"
form once and for all.

See #10678 for discussion

This last part updates the layout format and changes collapsable color.

This will all also all be backported to 2.3.x, for the sake of backwards
compatibility (cherry-picking).
2017-10-16 10:30:04 +02:00
Jean-Marc Lasgouttes
5c54557350 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.
2017-08-31 13:59:37 +02:00
Juergen Spitzmueller
a33157331b Bump layout formats 2017-01-13 10:09:20 +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
Scott Kostyshak
ea89d17dd4 Put RJournal.layout in the report category
Also add author details.
2013-10-13 15:12:45 -04:00
Scott Kostyshak
3ebdbe65d3 Update RJournal.layout to v0.12 of RJournal.sty
Without this, the template gives a BibTeX error because
there are two \bibstyle commands in the .aux.

This would have broken backwards compatibility but RJournal.layout
has not yet been in a LyX release. Further, the journal made a
significant change (moving to a single column instead of two)
so any submitter would need to update the .sty anyway.
2013-08-21 16:15:15 -04:00
Scott Kostyshak
0ccde6590d RJournal.layout: package 'url' is already provided
This fixes an option conflict error when using
RJournal.sty v0.12 (the newest).

Previous versions of the .sty also provided 'url'
so they should still work with the layout.
2013-08-21 15:53:47 -04:00
Vincent van Ravesteijn
d27668841b Update layouts to latest fileformat 2013-06-04 19:48:19 +02:00
Scott Kostyshak
32a5a06db5 RJournal.layout: remove unneeded code
Part of this code was moved to the template in a previous commit
and part was removed because it is no longer needed.

Patch by Yihui Xie.
2013-05-21 01:28:26 -04:00
Scott Kostyshak
9e425a0547 RJournal: use 'classic' decoration for email inset
This makes it clear that

  (1) the emails are in their own insets
  (2) the \email command is embedded in the \address command
2013-05-16 22:56:56 -04:00
Scott Kostyshak
43f52ccd64 RJournal: set ForcePlain to 'true' for email inset
This prevents the user from some mistakes, such as
embedding an itemize or ennumerate environment.
2013-05-16 22:56:31 -04:00
Scott Kostyshak
f40322081b RJournal: change 'Address' Flex inset into a Style
This looks better and gives natural separation between multiple
authors.
2013-05-16 22:55:56 -04:00
Scott Kostyshak
9d7d7c3816 RJournal: change 'Abstract' from a Flex to a Style
This looks more consistent with other templates to me.
2013-05-16 22:55:03 -04:00
Scott Kostyshak
4beba4e8f8 RJournal template and layout: move ERTs to layout
The layout now takes care of \begin{article} and \end{article}
by using \AtBeginDocument and \AtEndDocument.

This cleans up the template a little by removing some ERT. The
user no longer needs to read the two notes explaining why the
ERT boxes were necessary. The user also does not need to think
about why this LaTeX environment exists.
2013-05-16 22:51:22 -04:00
Scott Kostyshak
0d434033ec Add a layout and template for the R Journal
Patch by Yihui Xie.
2013-05-16 22:49:24 -04:00