Commit Graph

108 Commits

Author SHA1 Message Date
Richard Heck
b0097bcddb Introduce a new "RequiredArgs" tag for layouts. This functions much as
the OptionalArgs tag does and is implemented by the now misnamed
InsetOptArgs, except that its content gets wrapped in "{}" rather than
"[]". Required arguments do not actually have to be provided, but they
are always output. 

This will allow e.g. beamer's Block environment to be implemented
without ERT.

Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34591 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 21:50:08 +00:00
Richard Heck
f1912e1c33 Read the citation formats from a file, rather than hardcoding them. This
allows for layout- or module-level customization of the display in the
citation dialog and of the XHTML bibliography output.

There is more of this to come, by the way. The next step is to allow
macros. That will make it easier to deal with translation issues, which
ought to be the final step.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33920 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 18:37:25 +00:00
Richard Heck
4cd5bcefe9 Introduce a RefPrefix tag for Style, InsetLayout, and Float, that
indicates what prefix to use when constructing formatted references.
Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33784 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-17 12:23:24 +00:00
Richard Heck
abc81b5c07 Rework and partially revert r33631.
This patch introduces a "ListCommand" tag for Float layout. This tag
defines the command used to generate a list of such floats, in the cases
where float.sty is not used (i.e., where NeedsFloatPkg is true). We were
previously hardcoding the commands \listoftables and \listoffigures. But
in other cases, such as achemso.layout, which defines lists of schemes,
charts, etc, we could not output such lists.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33633 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 22:58:29 +00:00
Richard Heck
b64e2d4103 Change the LaTeXBuiltin tag to a NeedsFloatPkg tag. Discussion on the
list revealed that the former is confusing to people. The latter
indicates more clearly what the tag does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33626 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 17:24:38 +00:00
Jürgen Spitzmüller
8168e27362 * new InsetLayout tag to disallow spell checking. This actually brings Inset::allowSpellCheck() to use.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33467 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-13 15:44:17 +00:00
Richard Heck
c2ac70552c Introduce a "formatted counter" for use with formatted reference during
XHTML output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33113 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 20:33:36 +00:00
Richard Heck
1832a388c5 Collect the title for XHTML output, and use it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33097 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 19:43:15 +00:00
Richard Heck
c4aa7b9c7d Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33029 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 14:05:50 +00:00
Richard Heck
4221b1a7f4 Whoops again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32994 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:42:16 +00:00
Richard Heck
c3a05da0e5 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:39:49 +00:00
Richard Heck
fdbd6064e9 New layout tag for specifying the style used for TOCs, etc, in XHTML
output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32991 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 19:38:31 +00:00
Richard Heck
d6fe6cba94 Done now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32848 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-07 17:32:42 +00:00
Richard Heck
08b63ad3c6 Enhance LyX by fixing bug 5587. We add a new ContentAsLabel tag to
InsetLayout, per Jurgen's suggestion, so that insets can be told to
display an abbreviated form of their content when closed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32575 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-18 00:29:22 +00:00
Richard Heck
f1d54dd07c Formatting for layout2layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32370 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 22:56:16 +00:00
Richard Heck
da47b99f39 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32278 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-01 14:36:48 +00:00
Richard Heck
9929f89856 Fix bug 5842: Add InPreamble tag for layouts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32277 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-01 14:34:05 +00:00
Richard Heck
22eab2f2c9 Some configure.py fixes from Guenter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31985 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 19:16:53 +00:00
Richard Heck
8042139ea5 Some renaming, from Guenter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31970 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-13 16:12:04 +00:00
Richard Heck
9afbd6d68d Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31774 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:03:30 +00:00
Richard Heck
40c9f9d9eb Fix bug 6140. Patch due to gmatht.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31018 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 19:17:41 +00:00
Richard Heck
1f8bf874aa IfStyle and IfCounter tags for layout. Docs to follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30989 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 14:50:01 +00:00
Enrico Forestieri
e31e71a7a9 Fix bug #6030: LyX does not take into account BOM in user layout files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30213 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 18:23:10 +00:00
Richard Heck
583e62836c And this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30181 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:11:06 +00:00
Richard Heck
3d022e92b4 Forgot these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30180 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:10:36 +00:00
Richard Heck
2fe18f567a Forgot this, too.
Documentation is Customization.lyx will follow, once this stabilizes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29973 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 20:07:16 +00:00
Richard Heck
aa2b14afce Forgot to update the layout format when transferring from branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29964 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:05:48 +00:00
Jean-Marc Lasgouttes
864773d7d9 Allow literate documents other than noweb to work out of the box. Currently
only sweave is supported (for building documentation, not programs).

Layout files allow a new OutputFormat tag 

Modules can be conditionned on a feature of the type from->to, indicating that
it should be possible to convert from format 'from' to format 'to'.

Layout format incremented to 15.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29874 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-28 08:59:25 +00:00
Richard Heck
ac93172e78 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29872 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-28 02:00:04 +00:00
Pavel Sanda
86e73ee668 Add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29745 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-19 23:34:12 +00:00
Georg Baum
9aad4bc27f Better fix for bug 1476 (following an idea by Jean-Marc).
Don't go into an endless loop if layout2layout cannot produce the desired file format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28529 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-17 20:25:56 +00:00
Richard Heck
5ee35ace6f Introduce the InToc tag for InsetLayout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28377 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-06 17:54:33 +00:00
Georg Baum
cd27d171d5 Partial fix of bug 1476:
Implement infrastructure to add translations to layout files and translate one .inc file.
Some others are missing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28356 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-04 20:06:50 +00:00
Richard Heck
9dfac74265 This patch introduces ProvidesModule and ExcludesModule layout tags.
See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145129.html.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27041 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:27:03 +00:00
Richard Heck
b0c6099330 Fix bug 5330, round 1.
The bug is that older layout files with lines like:
	Input amsmaths.inc
fail in 1.6, since that file no longer exists. This commit adds some 
layout2layout that will scan for such includes and add lines like
	UseModule theorems-ams
corresponding to the input lines. The downside to this commit is that
UseModule only becomes available on 25 July 2008, whereas the files
were removed in January.

My intention is to try to deal with these intermediate cases as well.
But I'm not sure that will ultimately work very well, so this will do
until I can figure that out.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26800 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-07 15:45:08 +00:00
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