Commit Graph

52 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
53436891f7 Let the Foot inset have a different Layout when inside a title
This allows to address two main issues
 * \thanks does only accept one paragraph, while \footnote allows several (ticket #2666)
 * footnotes in titling environments were not numbered on screen.

Moreover, the code reduces hardcoding of features, which is always a good thing.

There are several pieces in this commit:

 * new numbering type \fnsymbol for counters

 * the Foot inset changes its layoutName() to Foot:InTitle when inside a paragraph with InTitle property. This is set when running updateBuffer.

 * Foot:intitle uses the \thanks command, does not allow multiple paragraphs and marks its contents as moving argument.

 * The InsetLayouts for Foot now have properLaTeXName/Type, so that InsetFoot::latex can be removed; further code simplification is probably possible.

 * HTML preamble has been updated (thanks rgheck).

Fixes: #2666
2014-12-08 10:15:02 +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
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
Julien Rioux
b03d96a7f0 remove extra whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38429 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-17 18:52:49 +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
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
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
aff3907ec6 Fix output of formatted counters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33122 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 22:28:42 +00:00
Richard Heck
9f535f5a45 Missed one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33119 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 21:01:53 +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
8a444512fb Fix counter formats. We have to use quotes here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33116 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 20:50:35 +00:00
Richard Heck
d853aca254 Pretty formats for standard counters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33114 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 20:40:16 +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
Jean-Marc Lasgouttes
f1edcc0fe2 fix label for enumii
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30519 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 19:55:22 +00:00
Richard Heck
f28c1a2cce Allow customization of enumerate counters.
This patch is from JMarc, except the docs, which are due to me.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29906 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-02 16:02:29 +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
b32b4a545c Update counter containing files to new format.
Actually, not all of these do contain counters, but my grepping 
wasn't sophisticated enough to catch them. Not a big deal....

I don't think there are errors here, but if you see weird
behavior with counters in some file or other, it's possible I missed 
something.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26782 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 14:58:22 +00:00
Richard Heck
64baf4dedc Update the rest to format 9, as well. The counter stuff will
need a new format, if we do it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26767 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 03:20:16 +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
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
f86fc8d88c The counters labelstring patch. Part 3: adapt some layout files and documentation
* numarticle.inc:
	* numreport.inc: 
	* stdcounter.inc:
	* stdsections.inc:
	* stdstarsections.inc:
	* stdclass.inc:
	* scrbook.layout:
	* amsmath.inc: adapt: remove most of the LabelString in layouts,
	add the necessary stuff to counters.

	* lib/doc/Customization.lyx: document the new stuff.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19604 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 11:16:07 +00:00
Jean-Marc Lasgouttes
b0d1a6b717 Fix bug 409 (Add support for numbered footnotes)
* src/insets/InsetFoot.cpp (updateLabels): number the footnote if
	(1) the footnote counter exists and (2) it is not in a title
	layout

	* lib/layouts/stdcounters.inc: add a footnote counter.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19524 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 20:29:33 +00:00
José Matox
29d106fbf7 Convert layout files to utf8
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19189 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-24 17:16:35 +00:00
Bo Peng
72e0b87a90 Separate caption and label from InsetListingsParams and handle them separately in listings and Include dialog, from Jurgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18324 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 20:42:14 +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
ff521787b2 * layouts/*.inc: update to format 3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16984 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-31 19:02:52 +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
André Pönitz
3d00d04387 some more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7755 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-15 15:00:46 +00:00
André Pönitz
28f4beaefa cleanup stuff separated by Lars from the counter patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7754 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-15 14:29:22 +00:00