Commit Graph

134 Commits

Author SHA1 Message Date
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
Uwe Stöhr
7f7534403b layouts/modules: use the new PassThru tag
This fixes problems like bug #10434
2016-10-22 03:01:44 +02:00
Günter Milde
b4dcad83b2 New layout for aastex6.cls. Fixes #10027.
Some more work for new and improved styles optional.
2016-04-08 21:34:23 +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
Juergen Spitzmueller
9d824a04d1 Properly define MultiPar status of caption in the layout definition.
Also remove hardcoded paragraph break disabling.

Candidate for branch.
2015-03-10 18:31:55 +01:00
Uwe Stöhr
6594289d3d aastex: fix optional argument of a command
- aastex.layout: fix name and hint of \figcaption
- aastex.lyx: improved template file
2015-01-23 00:23:37 +01:00
Georg Baum
486c7cc069 Convert layout files to current format 2015-01-11 20:25:58 +01:00
Jean-Marc Lasgouttes
1e18ab586e Fixes to InsetCaption \protect-ion
* \caption does not need to be protected in general
* the contents of \caption arguments need to be protected, though.

All styles related to caoption inset have been audited and updated.

The special casing of captions in longtables has been removed, since there is no special case.

Fixes bug: #9177
2015-01-10 19:48:56 +01:00
Juergen Spitzmueller
43c0149796 Update layouts to current format 2014-12-08 09:24:44 +01:00
Juergen Spitzmueller
20bcaec061 Add layout tag that determines if/when a paragraph can be indented.
Fixes: #7327, #7458, #8670
2014-05-29 14:10:32 +02: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
Uwe Stöhr
d12f7440fb aastex.layout: cleanup the file
- rearrange the style definitions in the order they should appear
- remove the hackish ordering
2013-05-29 00:20:53 +02: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
Richard Heck
f623ded109 Fix bug #7948 by not hardcoding XHTML info for captions but instead
using InsetLayout.
2013-02-08 09:30:31 -05:00
Kornel Benko
534efc5139 Added categories for style Standard, Title, Abstract, ShortTitle,
Author, FourAuthors, Affiliation, FourAffiliations, Acknowledgements,
     Itemize, Enumerate, Seriate
to layouts, where they were missing. More to follow
2012-12-30 19:33:20 +01:00
Juergen Spitzmueller
2a62a2c395 update layout format 2012-12-30 18:35:23 +01:00
Juergen Spitzmueller
c246076ed5 Fix the 'caption inset mess' (bug #4647) 2012-12-30 18:29:02 +01:00
Juergen Spitzmueller
b0aa0db10a Bump layout format 2012-12-22 11:39:04 +01:00
Uwe Stöhr
0c622a5c58 aastex: update layout and example file
- also fix an issue in the generic lyx2lyx InsetArgument routines
2012-11-26 03:39:40 +01:00
Juergen Spitzmueller
182d13ee6a Do not separate the shortcut from the label string 2012-11-23 18:26:02 +01:00
Juergen Spitzmueller
ff42273bb5 Bump layout formats 2012-11-23 09:50:22 +01:00
Juergen Spitzmueller
b6a041643d Label string tweaks (capitalization etc.) 2012-11-20 14:10:19 +01:00
Juergen Spitzmueller
2e69c66195 InsetArgument revision, first working version 2012-11-19 14:21:02 +01:00
Richard Heck
7195abcb4f Update all layouts to format 40. 2012-10-10 13:24:02 -04:00
Juergen Spitzmueller
72ee3a1b17 Categorize existing layouts
* Add \DeclareCategory statement
* Rewrite descriptions
2012-10-09 07:24:32 +02: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
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
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
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
Richard Heck
a9411446ee Add NoCounter to layouts that need it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37195 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:19:02 +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
Uwe Stöhr
25b3a8c611 layout files:
- remove dependencies of standard LaTeX-packages like article, fontenc, babel, etc.
- The class need only be specified as optional argument if the name of the LaTeX class file and the name of the layout file are different or if there are no packages to load.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35139 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-14 01:28:47 +00:00
Richard Heck
f5e2d78792 Layout dependencies patch from Julien Rioux.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35054 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 20:07:56 +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
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
Uwe Stöhr
a5973d539a aastex.layout: correct author note
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27182 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-28 22:30:53 +00:00
Uwe Stöhr
ec47a45d21 - beamer.layout: add inset for \inst
- beamer-conference-ornate-20min.lyx: use new inset instead of ERT
- aastex.layout, braille.module: fix silly mistake from me

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27130 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-26 02:20:09 +00:00
Uwe Stöhr
1ba47caf04 - aastex.layout: introduce new environments and insets to get rid of unnecessary ERT
- aas_sample.lyx: update file and remove unneeded ERT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27124 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-26 00:50:15 +00:00
Richard Heck
a2f4949d38 Update format 10 layouts to format 11.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27042 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:28:36 +00:00
Richard Heck
0b95498ef4 Update non-counter layouts to format 10.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26781 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 14:45:21 +00:00
Richard Heck
be34425828 Update format number for layouts not using counters. The reason
is that the counter info will be updated later, without changing
the format number again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26765 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 03:00:26 +00:00
Richard Heck
2bb93b6c54 Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25881 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 16:33:04 +00:00
Richard Heck
d252730dff New AddToPreamble tag for layout files. This tag will ADD some information to the document premable rather than completely over-write it, as the Preamble tag does.
Increment layout format to 7.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23916 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:11:16 +00:00
Jürgen Spitzmüller
9e5eebc14c *** Requires tag for classes, layouts and custom insets ***
* src/TextClass{cpp,h}:
	- implement Requires tag for class and InsetLayout.
* src/Layout.{cpp,h}:
	- implement Requires tag for layouts.
	- increase layouts format to 6.
* src/Paragraph.cpp:
	- request required features for paragraph layouts.
* src/LaTeXFeatures.cpp:
	- add some packages needed by modules.
	- remove Preamble method for InsetLayout. This is now done
	  in InsetFlex::validate.
* src/BufferParams.cpp (validate):
	- request required features for the class.
* src/insets/InsetLayout.h:
	- new member "requires".
* src/insets/InsetFlex.{cpp,h}:
	- implement validate method and request required features and preamble snippets.

* lib/layouts/*.{layout,module,inc}:
	- increase layouts format to 6.
	- use Requires tags in some modules (more can be done later).

* lib/doc/Customization.lyx:
	- document Requires tag.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22414 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-07 16:59:10 +00:00
Richard Heck
0e4e230f01 Remove redundant AlignPossible lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20437 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-22 18:00:36 +00:00
Martin Vermeer
18299149f5 some more inclusions of stdinsets.inc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19850 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-28 14:32:06 +00:00
Martin Vermeer
8eb22fd082 Updated versions to 5; added stdinsets.inc where I felt confident
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19804 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-26 09:10:52 +00:00
Jean-Marc Lasgouttes
04efe3c40a New framework for declaring generic features in textclasses.
* src/LaTeXFeatures.C (mustProvide): new method; returns true when
	isRequired is true and the feature is not provided by the
	textclass. 
	(getPackages, getLyXSGMLEntities): use mustProvide when relevant.

	* src/bufferparams.C (getEngine):
	* src/buffer.C (validate): adapt to change below.

	* src/lyxtextclass.C (read): replace tags ProvidesNatbib,
	ProvidesMakeidx, ProvidesUrl and ProvidesAmsmath by a generic
	"Provides".
	(provides): take a string as argument.
	
	* lib/scripts/layout2layout.py (convert): convert "ProvidesXxx" tags
	to "Provides xxx".

	* lib/layouts/*: update to format 4.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17740 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-06 09:02:23 +00:00
Michael Schmitt
2f9bf6b92b * layouts/*.layout: update to format 3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16983 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-31 18:58:41 +00:00
Georg Baum
98595ca7c2 From Jean-Marc: Make sure that standard sectioning styles have proper counters
* lib/layouts/stdsections.inc: include numarticle.inc here instead
	of the following files:
	* lib/layouts/kluwer.layout
	* lib/layouts/aapaper.layout
	* lib/layouts/llncs.layout
	* lib/layouts/docbook.layout
	* lib/layouts/article.layout
	* lib/layouts/IEEEtran.layout
	* lib/layouts/ijmpd.layout
	* lib/layouts/paper.layout
	* lib/layouts/aa.layout
	* lib/layouts/aastex.layout
	* lib/layouts/cl2emult.layout
	* lib/layouts/docbook-section.layout
	* lib/layouts/svjour.inc
	* lib/layouts/amsart.layout
	* lib/layouts/spie.layout
	* lib/layouts/docbook-chapter.layout
	* lib/layouts/aguplus.inc
	* lib/layouts/scrartcl.layout
	* lib/layouts/dtk.layout
	* lib/layouts/agu-dtd.layout
	* lib/layouts/elsart.layout
	* lib/layouts/mwart.layout
	* lib/layouts/seminar.layout


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13589 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-07 15:43:56 +00:00
Georg Baum
7adc8beb4d Convert bib_environment in layout2layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10715 a592a061-630c-0410-9148-cb99ea01b6c8
2006-01-08 15:35:38 +00:00
Georg Baum
3e885523c3 layout file converter for layout files in old format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10565 a592a061-630c-0410-9148-cb99ea01b6c8
2005-10-21 16:11:36 +00:00
Michael Schmitt
a250929930 remove spaces from label strings; part 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10267 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-17 09:22:25 +00:00
Jean-Marc Lasgouttes
4894a7be98 put labelstrings in quotes (from Michael)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10055 a592a061-630c-0410-9148-cb99ea01b6c8
2005-06-13 09:36:58 +00:00
Jean-Marc Lasgouttes
4e100ec148 update to aastex 5.2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9600 a592a061-630c-0410-9148-cb99ea01b6c8
2005-02-08 10:41:58 +00:00
Angus Leeming
a60b5c0b72 Whitespace only.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7905 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-13 09:50:10 +00:00
André Pönitz
af57c176a6 more
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7757 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-15 15:11:39 +00:00
André Pönitz
12d02d04b2 re-indent (tab for logical indentation, spaces for alignment)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6920 a592a061-630c-0410-9148-cb99ea01b6c8
2003-05-02 08:55:48 +00:00
Lars Gullik Bjønnes
3776958094 add stdfloats.inc and stdcounters.inc to a lot of layout files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5500 a592a061-630c-0410-9148-cb99ea01b6c8
2002-10-24 14:09:08 +00:00
Jean-Marc Lasgouttes
5456e99e72 ProvideNatbib patch from Mike; convert a bunch of example/template files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4050 a592a061-630c-0410-9148-cb99ea01b6c8
2002-04-23 22:34:24 +00:00
Jean-Marc Lasgouttes
db0716f666 Backup file patch from Dekel; Update to scr layout files from Hartmut Goebel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@621 a592a061-630c-0410-9148-cb99ea01b6c8
2000-03-20 14:49:54 +00:00
Lars Gullik Bjønnes
27de1486ca Initial revision
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@140 a592a061-630c-0410-9148-cb99ea01b6c8
1999-09-27 18:44:28 +00:00