Commit Graph

123 Commits

Author SHA1 Message Date
Richard Heck
d841355b7e Fix bug 5316 properly. The fix is to make the routine that reads a counter
update an existing counter rather than overwrite it.

This turns out to be more complicated than it might seem. There are two 
large parts to the patch. One moves the counter read routine out of TextClass
and into the Counter and Counters classes. The other changes the syntax of 
counters from:
	Counter
		Name whatever
	....
to:
	Counter whatever
	....
This allows us to get the name of the counter right away, so we can decide
whether it is an old one or a new one. So the layout format had to be 
changed (again), with corresponding layout2layout code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26779 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 14:37:28 +00:00
Richard Heck
63644744fd Whitespace and comment cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26777 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 12:16:17 +00:00
Richard Heck
7c61874c70 Forgot this bit from last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26758 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-05 19:39:09 +00:00
Richard Heck
5d95df6e39 Add CopyStyle tag for InsetLayout, per request of Steve Litt.
Update documentation for new tag.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25933 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-28 15:14:37 +00:00
Richard Heck
56a35c2c61 Add UseModule tag for layout files. This allows the AMS files, in particular, to "require" the
theorems-ams module, which is what most users will want. A later commit will allow users also
to "exclude" this module, in case they wanted to do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25880 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 15:51:27 +00:00
Richard Heck
2567314e44 Add some history to layout2layout.py.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23918 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:21:26 +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
Richard Heck
3112bed419 Fix layout2layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22459 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 03:59:39 +00:00
Martin Vermeer
a921f1b7ae layout2layout, changeover to version 5
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19723 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-22 14:36:07 +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
Georg Baum
c27dce2b16 support direct conversion from format 1 to format 3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17531 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-24 12:39:45 +00:00
Abdelrazak Younes
500a5f959f The caption inset patch by Georg, Martin and myself.
* buffer.C: increase LyX format to 257.

* lyxtextclass.C: increase FORMAT format to 3.

* buffer_funcs.C: 
  - setCaptionLabels(): new recursive function
  - setCaptions(): new function
  - updateLabels(): call setCaptions() for each paragraph.

* InsetCaption:
  - add a virtual destructor
  - overload InsetText' getStatus() and wide().
  - setLabel(): only set the new private member label_.
  - metrics(): don't set label here and correct for title metrics.
  - draw(): don't set label here
  - latex(): fix optional argument.
  - plaintext(): implement!

* InsetText:
  - add a virtual destructor
  - add virtual to getStatus() and wide().

*  output_latex.[Ch]: move latexOptArgInsets() out of anon namespace.

* text3.C: enable LFUN_CAPTION_INSERT


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16948 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-30 13:23:21 +00:00
Martin Vermeer
e656777a92 * layout2layout.py
(convert): remove spurious tabs



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15599 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 11:41:15 +00:00
José Matox
37dc5aeabe Convert python scripts to utf-8.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14565 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-08 10:42:59 +00:00
Bo Peng
2ae2c0db71 Remove hardcoded option -tt from python scripts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14478 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-17 19:41:32 +00:00
Georg Baum
4ae87a3bb8 Call python with the -tt switch to make mixed tab/space indentation an error
* src/support/os.[Ch]
	(python): new function, return the python command

	* lib/lyx2lyx/lyx_1_5.py
	(revert_font_settings): replace tabs with spaces

The rest is simply s/python/python -tt/ and
s/"python"/lyx::support::os::python()/ where appropriate.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14270 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-30 13:54:01 +00:00
Georg Baum
ad7e91e684 * lib/scripts/layout2layout.py
(convert): Change "LabelType Static" to "LabelType Itemize" for
	itemize environments
	(convert): Change "LabelType Counter_EnumI" to "LabelType Enumerate"
	for enumerate environments


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13659 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 08:54:50 +00:00
Georg Baum
9031ce6395 *lib/scripts/layout2layout.py: Fix section labelling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13588 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-07 15:25:34 +00:00
Georg Baum
ba7ba1b813 * lib/scripts/layout2layout.py
(concatenate_label): new, concatenate two labels in an intelligent way
	(convert): add the TocLevel for sectioning styles
	(convert): convert LabelString and StringAppendix for sectioning
	styles (append counter)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13533 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-29 18:49:27 +00:00
Georg Baum
ba4236f744 fix bibenvironment handling in layout2layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10755 a592a061-630c-0410-9148-cb99ea01b6c8
2006-01-19 08:40:10 +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
5d65c9bb09 fix line endings in layout2layout.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10570 a592a061-630c-0410-9148-cb99ea01b6c8
2005-10-24 14:13:45 +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