From d252730dff10221be69df2a8c889cd311ae20e27 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 24 Mar 2008 13:11:16 +0000 Subject: [PATCH] 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 --- lib/layouts/IEEEtran.layout | 2 +- lib/layouts/aa.layout | 2 +- lib/layouts/aapaper.inc | 2 +- lib/layouts/aapaper.layout | 2 +- lib/layouts/aastex.layout | 2 +- lib/layouts/agu-dtd.layout | 2 +- lib/layouts/agu_stdclass.inc | 2 +- lib/layouts/agu_stdcounters.inc | 2 +- lib/layouts/agu_stdlists.inc | 2 +- lib/layouts/agu_stdsections.inc | 2 +- lib/layouts/agu_stdtitle.inc | 2 +- lib/layouts/agums.layout | 2 +- lib/layouts/aguplus.inc | 2 +- lib/layouts/amsart.layout | 2 +- lib/layouts/amsbook.layout | 2 +- lib/layouts/amsdefs.inc | 2 +- lib/layouts/apa.layout | 2 +- lib/layouts/arab-article.layout | 2 +- lib/layouts/armenian-article.layout | 2 +- lib/layouts/article.layout | 2 +- lib/layouts/beamer.layout | 2 +- lib/layouts/book.layout | 2 +- lib/layouts/braille.module | 4 ++-- lib/layouts/broadway.layout | 2 +- lib/layouts/chess.layout | 2 +- lib/layouts/cl2emult.layout | 2 +- lib/layouts/db_lyxmacros.inc | 2 +- lib/layouts/db_stdcharstyles.inc | 2 +- lib/layouts/db_stdclass.inc | 2 +- lib/layouts/db_stdcounters.inc | 2 +- lib/layouts/db_stdlayouts.inc | 2 +- lib/layouts/db_stdlists.inc | 2 +- lib/layouts/db_stdsections.inc | 2 +- lib/layouts/db_stdstarsections.inc | 2 +- lib/layouts/db_stdstruct.inc | 2 +- lib/layouts/db_stdtitle.inc | 2 +- lib/layouts/dinbrief.layout | 2 +- lib/layouts/docbook-book.layout | 2 +- lib/layouts/docbook-chapter.layout | 2 +- lib/layouts/docbook-section.layout | 2 +- lib/layouts/docbook.layout | 2 +- lib/layouts/dtk.layout | 2 +- lib/layouts/egs.layout | 2 +- lib/layouts/elsart.layout | 2 +- lib/layouts/endnotes.module | 2 +- lib/layouts/entcs.layout | 2 +- lib/layouts/europecv.layout | 2 +- lib/layouts/extarticle.layout | 2 +- lib/layouts/extbook.layout | 2 +- lib/layouts/extletter.layout | 2 +- lib/layouts/extreport.layout | 2 +- lib/layouts/foils.layout | 2 +- lib/layouts/foottoend.module | 4 ++-- lib/layouts/g-brief-de.layout | 2 +- lib/layouts/g-brief-en.layout | 2 +- lib/layouts/g-brief2.layout | 2 +- lib/layouts/hanging.module | 2 +- lib/layouts/heb-article.layout | 2 +- lib/layouts/heb-letter.layout | 2 +- lib/layouts/hollywood.layout | 2 +- lib/layouts/ijmpc.layout | 2 +- lib/layouts/ijmpd.layout | 2 +- lib/layouts/iopart.layout | 2 +- lib/layouts/isprs.layout | 2 +- lib/layouts/jgrga.layout | 2 +- lib/layouts/kluwer.layout | 2 +- lib/layouts/latex8.layout | 2 +- lib/layouts/letter.layout | 2 +- lib/layouts/linguistics.module | 2 +- lib/layouts/literate-article.layout | 2 +- lib/layouts/literate-book.layout | 2 +- lib/layouts/literate-report.layout | 2 +- lib/layouts/literate-scrap.inc | 2 +- lib/layouts/llncs.layout | 2 +- lib/layouts/logicalmkup.module | 2 +- lib/layouts/ltugboat.layout | 2 +- lib/layouts/lyxmacros.inc | 2 +- lib/layouts/manpage.layout | 2 +- lib/layouts/memoir.layout | 2 +- lib/layouts/minimalistic.module | 2 +- lib/layouts/moderncv.layout | 2 +- lib/layouts/mwart.layout | 2 +- lib/layouts/mwbk.layout | 2 +- lib/layouts/mwrep.layout | 2 +- lib/layouts/numarticle.inc | 2 +- lib/layouts/numreport.inc | 2 +- lib/layouts/numrevtex.inc | 2 +- lib/layouts/paper.layout | 2 +- lib/layouts/powerdot.layout | 2 +- lib/layouts/report.layout | 2 +- lib/layouts/revtex.layout | 2 +- lib/layouts/revtex4.layout | 2 +- lib/layouts/scrartcl.layout | 2 +- lib/layouts/scrbook.layout | 2 +- lib/layouts/scrclass.inc | 2 +- lib/layouts/scrlettr.layout | 2 +- lib/layouts/scrlttr2.layout | 2 +- lib/layouts/scrreprt.layout | 2 +- lib/layouts/seminar.layout | 2 +- lib/layouts/siamltex.layout | 2 +- lib/layouts/simplecv.layout | 2 +- lib/layouts/slides.layout | 2 +- lib/layouts/spie.layout | 2 +- lib/layouts/stdcharstyles.inc | 2 +- lib/layouts/stdclass.inc | 2 +- lib/layouts/stdcounters.inc | 2 +- lib/layouts/stdcustom.inc | 2 +- lib/layouts/stdfloats.inc | 2 +- lib/layouts/stdinsets.inc | 2 +- lib/layouts/stdlayouts.inc | 2 +- lib/layouts/stdletter.inc | 2 +- lib/layouts/stdlists.inc | 2 +- lib/layouts/stdsections.inc | 2 +- lib/layouts/stdstarsections.inc | 2 +- lib/layouts/stdstruct.inc | 2 +- lib/layouts/stdtitle.inc | 2 +- lib/layouts/svglobal.layout | 2 +- lib/layouts/svjog.layout | 2 +- lib/layouts/svjour.inc | 2 +- lib/layouts/svprobth.layout | 2 +- lib/layouts/theorems-ams-extended.module | 2 +- lib/layouts/theorems-ams.inc | 2 +- lib/layouts/theorems-ams.module | 4 ++-- lib/layouts/theorems-chap.module | 2 +- lib/layouts/theorems-order.inc | 2 +- lib/layouts/theorems-proof.inc | 2 +- lib/layouts/theorems-sec.module | 2 +- lib/layouts/theorems-starred-equivalents.inc | 2 +- lib/layouts/theorems-starred.inc | 2 +- lib/layouts/theorems-starred.module | 2 +- lib/layouts/theorems-std.module | 2 +- lib/layouts/theorems.inc | 2 +- lib/scripts/layout2layout.py | 8 +++++++- src/TextClass.cpp | 10 ++++++++-- 134 files changed, 150 insertions(+), 138 deletions(-) diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 29baafbc32..f6f5dc7632 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -14,7 +14,7 @@ # the author information area. There is a LaTeX 2.09 IEEEtran.sty available # also but LyX doesn't support 2.09 stuff so don't get that one. -Format 6 +Format 7 Style Standard Margin Static LatexType Paragraph diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 4b0a114c2a..28903f4497 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -11,7 +11,7 @@ # abstract is command -Format 6 +Format 7 Columns 2 Sides 2 SecNumDepth 3 diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc index d675152ea4..c55255f46c 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -5,7 +5,7 @@ # Author: Peter Sütterlin -Format 6 +Format 7 Style Subtitle Margin Static LatexType Command diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index d680f88620..0728cef1ea 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -14,7 +14,7 @@ # and reconfigure LyX (after running texhash, of course). -Format 6 +Format 7 Columns 2 Sides 2 SecNumDepth 3 diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 5a579414a0..a663b80c21 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -30,7 +30,7 @@ # Version 1.3 5/7/04 - Updated for AASTeX 5.2 -Format 6 +Format 7 Columns 1 Sides 1 #SecNumDepth 3 diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout index 93f7ed3c8b..dcbf4d866b 100644 --- a/lib/layouts/agu-dtd.layout +++ b/lib/layouts/agu-dtd.layout @@ -5,7 +5,7 @@ # Martin Vermeer -Format 6 +Format 7 Input agu_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc index eaa1d8e000..0ca23f2cfc 100644 --- a/lib/layouts/agu_stdclass.inc +++ b/lib/layouts/agu_stdclass.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 OutputType docbook Columns 1 diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc index f62f95319e..a2e0d4ed84 100644 --- a/lib/layouts/agu_stdcounters.inc +++ b/lib/layouts/agu_stdcounters.inc @@ -4,7 +4,7 @@ # This include file contains all the counters that are defined as standard # in AGU-Article LyX layouts. -Format 6 +Format 7 Counter Name sect1 Within section diff --git a/lib/layouts/agu_stdlists.inc b/lib/layouts/agu_stdlists.inc index c76eace0d7..388b5fdc11 100644 --- a/lib/layouts/agu_stdlists.inc +++ b/lib/layouts/agu_stdlists.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdlists.inc diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc index 25cd889111..4c12ce6861 100644 --- a/lib/layouts/agu_stdsections.inc +++ b/lib/layouts/agu_stdsections.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdsections.inc Style Part diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc index 20c1f3fe0f..af6a71368a 100644 --- a/lib/layouts/agu_stdtitle.inc +++ b/lib/layouts/agu_stdtitle.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdtitle.inc diff --git a/lib/layouts/agums.layout b/lib/layouts/agums.layout index 9a8de3121b..6fa9004c81 100644 --- a/lib/layouts/agums.layout +++ b/lib/layouts/agums.layout @@ -4,7 +4,7 @@ # Author: Martin Vermeer -Format 6 +Format 7 Input aguplus.inc ClassOptions diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc index c42c3a5d8f..e2cdc0be42 100644 --- a/lib/layouts/aguplus.inc +++ b/lib/layouts/aguplus.inc @@ -6,7 +6,7 @@ # ftp://ftp.agu.org/journals/latex/journals -Format 6 +Format 7 Input stdclass.inc SecNumDepth 4 diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index fbb6e851ed..96ae3cf109 100644 --- a/lib/layouts/amsart.layout +++ b/lib/layouts/amsart.layout @@ -9,7 +9,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan '08 by Richard Heck -Format 6 +Format 7 Columns 1 Sides 2 PageStyle Headers diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 5bf3c2a134..80f39ef083 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -10,7 +10,7 @@ # Modularized Jan '08 by Richard Heck -Format 6 +Format 7 Columns 1 Sides 2 PageStyle Headers diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index 7f1657814c..2b4df3275f 100644 --- a/lib/layouts/amsdefs.inc +++ b/lib/layouts/amsdefs.inc @@ -5,7 +5,7 @@ # Modularized Jan '08 by Richard Heck # Including the maths stuff -Format 6 +Format 7 # The AMS documentclasses use the package amsmath and provide the # functionality of makeidx.sty. diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index 7cfef3a140..2db4f1c991 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -2,7 +2,7 @@ # \DeclareLaTeXClass[apa,apacite.sty]{article (APA)} # Author: Randy Gobbel -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/arab-article.layout b/lib/layouts/arab-article.layout index 8dc50fd15e..ff169b73a3 100644 --- a/lib/layouts/arab-article.layout +++ b/lib/layouts/arab-article.layout @@ -3,5 +3,5 @@ # Arabic article textclass definition file. # Author: Dekel Tsur -Format 6 +Format 7 Input article diff --git a/lib/layouts/armenian-article.layout b/lib/layouts/armenian-article.layout index 83eb8dae81..289743b65c 100644 --- a/lib/layouts/armenian-article.layout +++ b/lib/layouts/armenian-article.layout @@ -3,7 +3,7 @@ # Arabic article textclass definition file. # Author: Uwe Stöhr (uwestoehr@web.de) -Format 6 +Format 7 Input article Style LatinOn diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index c898907aea..b6d4bcc063 100644 --- a/lib/layouts/article.layout +++ b/lib/layouts/article.layout @@ -5,7 +5,7 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdclass.inc SecNumDepth 3 diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 55d5b949d1..a91749729a 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -5,7 +5,7 @@ # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $ # Includes -Format 6 +Format 7 Input stdcounters.inc Input stdinsets.inc diff --git a/lib/layouts/book.layout b/lib/layouts/book.layout index a220c102c6..0fec421c79 100644 --- a/lib/layouts/book.layout +++ b/lib/layouts/book.layout @@ -6,7 +6,7 @@ # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index 6e99ec2af7..1d9c4a16eb 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -4,9 +4,9 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 6 +Format 7 -Preamble +AddToPreamble \usepackage{braille} \newcommand{\braillenormal}[1] {\setlength{\brailleunit}{2.4mm}\braille{#1}} diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 95dbd9fb55..7f5f966d08 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -3,7 +3,7 @@ # For theater plays -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/chess.layout b/lib/layouts/chess.layout index 62a0cbaf9f..fc2143b2ce 100644 --- a/lib/layouts/chess.layout +++ b/lib/layouts/chess.layout @@ -16,7 +16,7 @@ # \vspace*{-0.5in}) # -Format 6 +Format 7 Requires chess diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index f9d921ef48..298cf2fcfa 100644 --- a/lib/layouts/cl2emult.layout +++ b/lib/layouts/cl2emult.layout @@ -3,7 +3,7 @@ # Springer's cl2emult textclass definition file. # Author : André Poenitz -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc index 7f6c41a880..d4d2e59e27 100644 --- a/lib/layouts/db_lyxmacros.inc +++ b/lib/layouts/db_lyxmacros.inc @@ -5,7 +5,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input lyxmacros.inc Style Code diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc index e5672f7919..c0ef56c301 100644 --- a/lib/layouts/db_stdcharstyles.inc +++ b/lib/layouts/db_stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : José Abílio Oliveira Matos # Character Styles definition -Format 6 +Format 7 InsetLayout Element:Filename LyXType element LabelString Filename diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc index 2a22a563dc..12be9903ef 100644 --- a/lib/layouts/db_stdclass.inc +++ b/lib/layouts/db_stdclass.inc @@ -5,7 +5,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 OutputType docbook Columns 1 diff --git a/lib/layouts/db_stdcounters.inc b/lib/layouts/db_stdcounters.inc index 92f048fdb4..a99e560794 100644 --- a/lib/layouts/db_stdcounters.inc +++ b/lib/layouts/db_stdcounters.inc @@ -4,7 +4,7 @@ # This include file contains all the counters that are defined as standard # in Docbook LyX layouts. -Format 6 +Format 7 Counter Name sect1 Within chapter diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc index 900c8978d2..22e174233f 100644 --- a/lib/layouts/db_stdlayouts.inc +++ b/lib/layouts/db_stdlayouts.inc @@ -5,7 +5,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdlayouts.inc Style Literal diff --git a/lib/layouts/db_stdlists.inc b/lib/layouts/db_stdlists.inc index 06afbc1e69..6f9711051e 100644 --- a/lib/layouts/db_stdlists.inc +++ b/lib/layouts/db_stdlists.inc @@ -5,7 +5,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdlists.inc diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc index 53e1f22903..87c18838e9 100644 --- a/lib/layouts/db_stdsections.inc +++ b/lib/layouts/db_stdsections.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdsections.inc Style Part diff --git a/lib/layouts/db_stdstarsections.inc b/lib/layouts/db_stdstarsections.inc index 85a3ef7730..64951f75a9 100644 --- a/lib/layouts/db_stdstarsections.inc +++ b/lib/layouts/db_stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 6 +Format 7 Style Part* CopyStyle Part Margin Static diff --git a/lib/layouts/db_stdstruct.inc b/lib/layouts/db_stdstruct.inc index a7e3e5a1d8..590131e27e 100644 --- a/lib/layouts/db_stdstruct.inc +++ b/lib/layouts/db_stdstruct.inc @@ -5,7 +5,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdstruct.inc Style Abstract diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc index 3581ea630a..9acd23784f 100644 --- a/lib/layouts/db_stdtitle.inc +++ b/lib/layouts/db_stdtitle.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 6 +Format 7 Input stdtitle.inc diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index 5b155307a5..6be1cbf3de 100644 --- a/lib/layouts/dinbrief.layout +++ b/lib/layouts/dinbrief.layout @@ -6,7 +6,7 @@ # Modifies only some things from letter.layout -Format 6 +Format 7 Input letter.layout diff --git a/lib/layouts/docbook-book.layout b/lib/layouts/docbook-book.layout index 173eeffb34..96ae80e843 100644 --- a/lib/layouts/docbook-book.layout +++ b/lib/layouts/docbook-book.layout @@ -4,7 +4,7 @@ # Author : Jose' Matos # hacked for books: Luc Abom -Format 6 +Format 7 Input report Input db_stdclass.inc diff --git a/lib/layouts/docbook-chapter.layout b/lib/layouts/docbook-chapter.layout index 12eeb45b2b..107a5f83b4 100644 --- a/lib/layouts/docbook-chapter.layout +++ b/lib/layouts/docbook-chapter.layout @@ -3,7 +3,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 6 +Format 7 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook-section.layout b/lib/layouts/docbook-section.layout index d7898bb2d7..6755bf3689 100644 --- a/lib/layouts/docbook-section.layout +++ b/lib/layouts/docbook-section.layout @@ -3,7 +3,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 6 +Format 7 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout index cba01bcca5..b5cccce6e1 100644 --- a/lib/layouts/docbook.layout +++ b/lib/layouts/docbook.layout @@ -3,7 +3,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 6 +Format 7 Input db_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout index c3f7fe2afd..f492f8bcc2 100644 --- a/lib/layouts/dtk.layout +++ b/lib/layouts/dtk.layout @@ -6,7 +6,7 @@ # Author : Herbert Voss 2001/08/13 -Format 6 +Format 7 Columns 1 Sides 2 SecNumDepth -1 # no counting diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout index 0599bad86e..2c4068bd87 100644 --- a/lib/layouts/egs.layout +++ b/lib/layouts/egs.layout @@ -8,7 +8,7 @@ # Converted article -> egs Martin Vermeer -Format 6 +Format 7 Columns 2 Sides 1 PageStyle Plain diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index d1025b6f05..af9fb817d3 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -22,7 +22,7 @@ # numbered sections, as does the class file. -Format 6 +Format 7 Columns 1 Sides 2 PageStyle headings diff --git a/lib/layouts/endnotes.module b/lib/layouts/endnotes.module index 9f71e9613e..bfab10d833 100644 --- a/lib/layouts/endnotes.module +++ b/lib/layouts/endnotes.module @@ -4,7 +4,7 @@ #\theendnotes in ERT where you want the endnotes to appear. #DescriptionEnd -Format 6 +Format 7 InsetLayout Custom:Endnote LyXType custom diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout index 461fb20bda..c72dc1ddb0 100644 --- a/lib/layouts/entcs.layout +++ b/lib/layouts/entcs.layout @@ -3,7 +3,7 @@ # Based on LyX article class; modified to support ENTCS class # Reuben Thomas (rrt@sc3d.org) 27/5-2/6/01 -Format 6 +Format 7 Input article.layout # only font size 11pt is really available diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index ee4d8fe1ac..7c700c119d 100644 --- a/lib/layouts/europecv.layout +++ b/lib/layouts/europecv.layout @@ -5,7 +5,7 @@ # General textclass parameters -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/extarticle.layout b/lib/layouts/extarticle.layout index ad6df021f7..c85ca17855 100644 --- a/lib/layouts/extarticle.layout +++ b/lib/layouts/extarticle.layout @@ -2,7 +2,7 @@ # \DeclareLaTeXClass[extarticle]{article (more font sizes)} # Herbert Voss -Format 6 +Format 7 Input article.layout # change available fontsizes diff --git a/lib/layouts/extbook.layout b/lib/layouts/extbook.layout index d587c42e41..ea65bc3efd 100644 --- a/lib/layouts/extbook.layout +++ b/lib/layouts/extbook.layout @@ -3,7 +3,7 @@ # Extended book textclass definition file. # Herbert Voss -Format 6 +Format 7 Input book.layout # change available fontsizes diff --git a/lib/layouts/extletter.layout b/lib/layouts/extletter.layout index 5d773987a5..42211bd73a 100644 --- a/lib/layouts/extletter.layout +++ b/lib/layouts/extletter.layout @@ -3,7 +3,7 @@ # Extended article textclass definition file. # Herbert Voss -Format 6 +Format 7 Input letter.layout # change available fontsizes diff --git a/lib/layouts/extreport.layout b/lib/layouts/extreport.layout index bb4f2483f7..0b2151f327 100644 --- a/lib/layouts/extreport.layout +++ b/lib/layouts/extreport.layout @@ -3,7 +3,7 @@ # Extented report textclass definition file. # Herbert Voss -Format 6 +Format 7 Input report.layout # change available fontsizes diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout index 42775bec56..9e98b81f6d 100644 --- a/lib/layouts/foils.layout +++ b/lib/layouts/foils.layout @@ -6,7 +6,7 @@ # To do: Define class specific options. -Format 6 +Format 7 Columns 1 Sides 1 diff --git a/lib/layouts/foottoend.module b/lib/layouts/foottoend.module index 28e8a1e866..09b238c187 100644 --- a/lib/layouts/foottoend.module +++ b/lib/layouts/foottoend.module @@ -4,10 +4,10 @@ #in ERT where you want the endnotes to appear. #DescriptionEnd -Format 6 +Format 7 Requires endnotes -Preamble +AddToPreamble \let\footnote=\endnote EndPreamble diff --git a/lib/layouts/g-brief-de.layout b/lib/layouts/g-brief-de.layout index 15512ea46b..8788cc1c3c 100644 --- a/lib/layouts/g-brief-de.layout +++ b/lib/layouts/g-brief-de.layout @@ -3,7 +3,7 @@ # Letter textclass definition file. # Author : Thomas Hartkens -Format 6 +Format 7 Input stdinsets.inc Input stdfloats.inc Input stdcounters.inc diff --git a/lib/layouts/g-brief-en.layout b/lib/layouts/g-brief-en.layout index 322e40eb94..8b965e730c 100644 --- a/lib/layouts/g-brief-en.layout +++ b/lib/layouts/g-brief-en.layout @@ -3,7 +3,7 @@ # Letter textclass definition file. # Author : Thomas Hartkens -Format 6 +Format 7 Input stdinsets.inc Input stdfloats.inc Input stdcounters.inc diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout index b54c92f073..eab3345bde 100644 --- a/lib/layouts/g-brief2.layout +++ b/lib/layouts/g-brief2.layout @@ -11,7 +11,7 @@ Input stdcounters.inc Input stdinsets.inc # General textclass parameters -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Empty diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module index c6c6993efe..5cf9fa06fd 100644 --- a/lib/layouts/hanging.module +++ b/lib/layouts/hanging.module @@ -10,7 +10,7 @@ #Copyright Peter R. Wilson. #Released under the LaTeX Project Public License. -Format 6 +Format 7 Style Hanging LatexType Environment diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout index c9ccd8dace..fed2acc872 100644 --- a/lib/layouts/heb-article.layout +++ b/lib/layouts/heb-article.layout @@ -4,7 +4,7 @@ # Author: Dekel Tsur # Few changes by Baruch Even -Format 6 +Format 7 Input article Preamble diff --git a/lib/layouts/heb-letter.layout b/lib/layouts/heb-letter.layout index 97acbcd96a..bceffcf1af 100644 --- a/lib/layouts/heb-letter.layout +++ b/lib/layouts/heb-letter.layout @@ -3,7 +3,7 @@ # Hebrew letter textclass definition file. # Author: Dekel Tsur -Format 6 +Format 7 Input letter diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout index 656290d466..6e5e1d09a6 100644 --- a/lib/layouts/hollywood.layout +++ b/lib/layouts/hollywood.layout @@ -15,7 +15,7 @@ # Based on course given by Lars Davidson -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index 2e1842292a..ca04abf072 100644 --- a/lib/layouts/ijmpc.layout +++ b/lib/layouts/ijmpc.layout @@ -9,7 +9,7 @@ # # Version 1 2006-04-09 - First version, for LyX 1.4.0. -Format 6 +Format 7 Input stdclass.inc Input numarticle.inc diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index 2aca5e7d97..cf468be57f 100644 --- a/lib/layouts/ijmpd.layout +++ b/lib/layouts/ijmpd.layout @@ -12,7 +12,7 @@ # Version 3 2006-04-09 - Updated for LyX 1.4.0; all environments defined by # ijmpd are now supported by LyX. -Format 6 +Format 7 Input stdclass.inc Input numarticle.inc diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 9c2eb58dc8..9705914238 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -3,7 +3,7 @@ # IOP article textclass definition file. # Author: Uwe Stöhr (uwestoehr@web.de) -Format 6 +Format 7 Columns 1 Sides 1 diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout index 98f34b26b6..1cd6c96403 100644 --- a/lib/layouts/isprs.layout +++ b/lib/layouts/isprs.layout @@ -8,7 +8,7 @@ # Heavily modifed and enhanced by serveral developers. # Input general definitions -Format 6 +Format 7 Input stdclass.inc Sides 2 Columns 2 diff --git a/lib/layouts/jgrga.layout b/lib/layouts/jgrga.layout index e68e98cce4..616903ac6c 100644 --- a/lib/layouts/jgrga.layout +++ b/lib/layouts/jgrga.layout @@ -3,7 +3,7 @@ # AGUplus JGR textclass definition file. # Author: Martin Vermeer -Format 6 +Format 7 Input aguplus.inc ClassOptions diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout index 9e08bde248..19a8a09df1 100644 --- a/lib/layouts/kluwer.layout +++ b/lib/layouts/kluwer.layout @@ -14,7 +14,7 @@ # 2003-03-03 Updated for lyx 1.3.0. -Format 6 +Format 7 Columns 1 Sides 2 SecNumDepth 4 diff --git a/lib/layouts/latex8.layout b/lib/layouts/latex8.layout index edb7f8f4e4..a7b59e9c86 100644 --- a/lib/layouts/latex8.layout +++ b/lib/layouts/latex8.layout @@ -3,7 +3,7 @@ # Latex8 textclass definition file. # Author : Allan Rae -Format 6 +Format 7 Preamble \usepackage{latex8} \usepackage{times} diff --git a/lib/layouts/letter.layout b/lib/layouts/letter.layout index 509d4bdd2f..d349308877 100644 --- a/lib/layouts/letter.layout +++ b/lib/layouts/letter.layout @@ -4,7 +4,7 @@ # Author : Matthias Ettrich # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdinsets.inc Input stdletter.inc Input stdlists.inc diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index 51b379f2b2..b27a86a91c 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -6,7 +6,7 @@ # Author: Jürgen Spitzmüller -Format 6 +Format 7 # single numbered example with covington.sty Style Numbered_Example_(multiline) diff --git a/lib/layouts/literate-article.layout b/lib/layouts/literate-article.layout index 7a5cfe8204..7c3e12d503 100644 --- a/lib/layouts/literate-article.layout +++ b/lib/layouts/literate-article.layout @@ -3,7 +3,7 @@ # literate-article textclass definition file. # Author : Edmar Wienskoski Jr. -Format 6 +Format 7 Preamble \usepackage{noweb} EndPreamble diff --git a/lib/layouts/literate-book.layout b/lib/layouts/literate-book.layout index fb84d499da..9b3209e858 100644 --- a/lib/layouts/literate-book.layout +++ b/lib/layouts/literate-book.layout @@ -3,7 +3,7 @@ # literate-book textclass definition file. # Author : Edmar Wienskoski Jr. -Format 6 +Format 7 Preamble \usepackage{noweb} EndPreamble diff --git a/lib/layouts/literate-report.layout b/lib/layouts/literate-report.layout index fad25ca63b..3ce8197167 100644 --- a/lib/layouts/literate-report.layout +++ b/lib/layouts/literate-report.layout @@ -3,7 +3,7 @@ # literate-report textclass definition file. # Author : Edmar Wienskoski Jr. -Format 6 +Format 7 Preamble \usepackage{noweb} EndPreamble diff --git a/lib/layouts/literate-scrap.inc b/lib/layouts/literate-scrap.inc index c8304018a0..4dea724a4c 100644 --- a/lib/layouts/literate-scrap.inc +++ b/lib/layouts/literate-scrap.inc @@ -6,7 +6,7 @@ # resembles more closely the produced paper doc (more WYSIWYG) # -Format 6 +Format 7 OutputType literate Style Scrap diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index 00c261aa2b..74c5a0ec47 100644 --- a/lib/layouts/llncs.layout +++ b/lib/layouts/llncs.layout @@ -14,7 +14,7 @@ # Modified for LyX 12 by Jean-Marc Lasgouttes and MV. -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module index 4add152b7e..321d0e88d5 100644 --- a/lib/layouts/logicalmkup.module +++ b/lib/layouts/logicalmkup.module @@ -5,7 +5,7 @@ # Author : Martin vermeer -Format 6 +Format 7 InsetLayout CharStyle:Noun LyxType charstyle diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout index e38d11c93d..7c9f51d31e 100644 --- a/lib/layouts/ltugboat.layout +++ b/lib/layouts/ltugboat.layout @@ -5,7 +5,7 @@ # Author : Herbert Voss 2001/08/13 -Format 6 +Format 7 Columns 2 Sides 2 #SecNumDepth # no counting diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc index b9bc1b8e71..6376006a11 100644 --- a/lib/layouts/lyxmacros.inc +++ b/lib/layouts/lyxmacros.inc @@ -8,7 +8,7 @@ # be removed later. -Format 6 +Format 7 Style LyX-Code Category MainText Margin Static diff --git a/lib/layouts/manpage.layout b/lib/layouts/manpage.layout index 1dc001ae44..4d3eca9df0 100644 --- a/lib/layouts/manpage.layout +++ b/lib/layouts/manpage.layout @@ -4,7 +4,7 @@ # Author : José Matos -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index 7702fcbbb2..92e8fae23c 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -6,7 +6,7 @@ # feel free to contribute missing features! -Format 6 +Format 7 Columns 1 Sides 2 SecNumDepth 2 diff --git a/lib/layouts/minimalistic.module b/lib/layouts/minimalistic.module index e326ea5eea..518f2122c5 100644 --- a/lib/layouts/minimalistic.module +++ b/lib/layouts/minimalistic.module @@ -3,7 +3,7 @@ # Redefines several insets as being Minimalistic, for use by old-timers. #DescriptionEnd -Format 6 +Format 7 InsetLayout Index Decoration minimalistic diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 352ad2fd3c..742ffdcf7c 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -5,7 +5,7 @@ # General textclass parameters -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout index 6e71749960..a0d7441a72 100644 --- a/lib/layouts/mwart.layout +++ b/lib/layouts/mwart.layout @@ -5,7 +5,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by several developers. -Format 6 +Format 7 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/mwbk.layout b/lib/layouts/mwbk.layout index 16f169e248..d74e60b87f 100644 --- a/lib/layouts/mwbk.layout +++ b/lib/layouts/mwbk.layout @@ -5,7 +5,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/mwrep.layout b/lib/layouts/mwrep.layout index ece20f97c3..5494b8d855 100644 --- a/lib/layouts/mwrep.layout +++ b/lib/layouts/mwrep.layout @@ -5,7 +5,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index de7b146616..eb0d2e21b4 100644 --- a/lib/layouts/numarticle.inc +++ b/lib/layouts/numarticle.inc @@ -1,7 +1,7 @@ # Author : André Pönitz # This include file contains label definitions for an article-like numbering. -Format 6 +Format 7 # appendix applies to sections. Counter diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 70ceb9a902..7a54bf82ef 100644 --- a/lib/layouts/numreport.inc +++ b/lib/layouts/numreport.inc @@ -1,7 +1,7 @@ # Author : André Pönitz # This include file contains label definitions for a report-like numbering. -Format 6 +Format 7 Style Part TocLevel -1 diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc index eb8c19530b..a2b8337dd3 100644 --- a/lib/layouts/numrevtex.inc +++ b/lib/layouts/numrevtex.inc @@ -2,7 +2,7 @@ # This include files contains label definitions for a article-like numbering. -Format 6 +Format 7 Style Section LabelType Counter LabelCounter section diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 83b9216300..a945c8a4ba 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -4,7 +4,7 @@ # Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 3 diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout index 60d4dca7ed..3969138abf 100644 --- a/lib/layouts/powerdot.layout +++ b/lib/layouts/powerdot.layout @@ -8,7 +8,7 @@ ### # General textclass parameters ### -Format 6 +Format 7 Columns 1 Sides 1 Provides url 1 diff --git a/lib/layouts/report.layout b/lib/layouts/report.layout index 99b6a81872..7194770650 100644 --- a/lib/layouts/report.layout +++ b/lib/layouts/report.layout @@ -5,7 +5,7 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -Format 6 +Format 7 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/revtex.layout b/lib/layouts/revtex.layout index c25a92b68c..7bcaeb4347 100644 --- a/lib/layouts/revtex.layout +++ b/lib/layouts/revtex.layout @@ -9,7 +9,7 @@ # Amir Karger (LyX v11.34 style modifications - using changes # made by Jean-Marc Lasgouttes to amsart.layout) -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index ed7f656091..a9c1b1b7ca 100644 --- a/lib/layouts/revtex4.layout +++ b/lib/layouts/revtex4.layout @@ -10,7 +10,7 @@ # Amir Karger (RevTeX 4 beta) 9/1999, 7/2000 -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout index 971e6e8296..c6216b8bca 100644 --- a/lib/layouts/scrartcl.layout +++ b/lib/layouts/scrartcl.layout @@ -3,7 +3,7 @@ # KOMA scrartcl textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 6 +Format 7 Input scrclass.inc SecNumDepth 3 diff --git a/lib/layouts/scrbook.layout b/lib/layouts/scrbook.layout index df85692b4b..090718c976 100644 --- a/lib/layouts/scrbook.layout +++ b/lib/layouts/scrbook.layout @@ -3,7 +3,7 @@ # KOMA scrbook textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 6 +Format 7 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index 773504ae81..696bbb912b 100644 --- a/lib/layouts/scrclass.inc +++ b/lib/layouts/scrclass.inc @@ -7,7 +7,7 @@ # Guenter Milde -Format 6 +Format 7 SecNumDepth 2 TocDepth 2 DefaultStyle Standard diff --git a/lib/layouts/scrlettr.layout b/lib/layouts/scrlettr.layout index ae15cd7fd0..6fdb7e78e8 100644 --- a/lib/layouts/scrlettr.layout +++ b/lib/layouts/scrlettr.layout @@ -3,7 +3,7 @@ # KOMA scrlettr textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1999/2/17. -Format 6 +Format 7 Style Standard LatexName dummy ParSep 0.4 diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout index 48bf15d673..b8d4a894fe 100644 --- a/lib/layouts/scrlttr2.layout +++ b/lib/layouts/scrlttr2.layout @@ -4,7 +4,7 @@ # Juergen Spitzmueller , 2003/2/17. # Uwe Stöhr , 2008/2/03. -Format 6 +Format 7 Style Standard LatexName dummy ParSep 0.4 diff --git a/lib/layouts/scrreprt.layout b/lib/layouts/scrreprt.layout index 675a5b65f0..19652aa7ae 100644 --- a/lib/layouts/scrreprt.layout +++ b/lib/layouts/scrreprt.layout @@ -3,7 +3,7 @@ # KOMA scrreprt textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 6 +Format 7 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index 32637b48b7..80a3fbe63d 100644 --- a/lib/layouts/seminar.layout +++ b/lib/layouts/seminar.layout @@ -3,7 +3,7 @@ # Initial attemt at makeing a LyX layout file for the seminar class. # Author : Lars Gullik Bjønnes -Format 6 +Format 7 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index e42f118ef3..4de62745af 100644 --- a/lib/layouts/siamltex.layout +++ b/lib/layouts/siamltex.layout @@ -4,7 +4,7 @@ # Cut & paste from various LyX layouts plus some minor modifications # Author : Kornelia Pietsch -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout index 3a014ca860..2651aae3e1 100644 --- a/lib/layouts/simplecv.layout +++ b/lib/layouts/simplecv.layout @@ -4,7 +4,7 @@ # Author : Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout index abc36006bd..a0f9bbe59a 100644 --- a/lib/layouts/slides.layout +++ b/lib/layouts/slides.layout @@ -7,7 +7,7 @@ # -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index a00f40b137..1ec47c6407 100644 --- a/lib/layouts/spie.layout +++ b/lib/layouts/spie.layout @@ -5,7 +5,7 @@ # to be used with the spie.cls LaTex-style available at # http://public.lanl.gov/kmh/spie/ -Format 6 +Format 7 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc index 46d3e2da73..8e633f61bc 100644 --- a/lib/layouts/stdcharstyles.inc +++ b/lib/layouts/stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Character Styles definition -Format 6 +Format 7 # Error fallback: InsetLayout CharStyle diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 011012ad78..0383f7dad0 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -7,7 +7,7 @@ # ``standard'' layouts, like article and friends. -Format 6 +Format 7 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index 3951168e03..137a1bbff6 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 6 +Format 7 Counter Name part LabelString "\Roman{part}" diff --git a/lib/layouts/stdcustom.inc b/lib/layouts/stdcustom.inc index 07b8a6b67c..bece7bf9cf 100644 --- a/lib/layouts/stdcustom.inc +++ b/lib/layouts/stdcustom.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Custom Inset layouts definition -Format 6 +Format 7 # Error fallback: InsetLayout Custom diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc index a2c9044a9a..6da2d3cab9 100644 --- a/lib/layouts/stdfloats.inc +++ b/lib/layouts/stdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 6 +Format 7 Float Type table GuiName Table diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 5d1d3cd114..6a021ad813 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -47,7 +47,7 @@ # be comma-separated. #End -Format 6 +Format 7 Provides stdinsets 1 diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index a7d61d1bf9..6467fbb513 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 6 +Format 7 Style Quotation Category MainText Margin Static diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index b6cf7e44be..f2de311a58 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -3,7 +3,7 @@ # Heavily modifed and enhanced by several developers. -Format 6 +Format 7 Columns 1 Sides 1 PageStyle Empty diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index 12cf43466f..990944f9a2 100644 --- a/lib/layouts/stdlists.inc +++ b/lib/layouts/stdlists.inc @@ -7,7 +7,7 @@ # This include files contains various standard environments for lists. -Format 6 +Format 7 Style Itemize Category List Margin Static diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index f04b2b6527..9335da40da 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -7,7 +7,7 @@ # commands that are useful for article-like document classes, but not # for letters. -Format 6 +Format 7 Style Part Category Section Margin Dynamic diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index a3f87b20e0..39ca03c7d7 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 6 +Format 7 Style Part* CopyStyle Part Category Unnumbered diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index 83183c16cf..774200a5d9 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -8,7 +8,7 @@ # a document, like abstract, bibliography and such. -Format 6 +Format 7 Style Abstract Margin Static LatexType Environment diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index 915c115b76..ee2443e587 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -8,7 +8,7 @@ # a document, like title, author and such. -Format 6 +Format 7 Style Title Margin Static LatexType Command diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout index 1a6ba98964..d693a3cc9f 100644 --- a/lib/layouts/svglobal.layout +++ b/lib/layouts/svglobal.layout @@ -18,7 +18,7 @@ # see www.springer.de/author/tex/help-journals.html for class files # # The standard Springer Journal sections -Format 6 +Format 7 Input svjour.inc ClassOptions diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index 5377c6f37d..5b21265030 100644 --- a/lib/layouts/svjog.layout +++ b/lib/layouts/svjog.layout @@ -22,7 +22,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 6 +Format 7 Input svjour.inc diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc index e9860baace..cb6a0ddb25 100644 --- a/lib/layouts/svjour.inc +++ b/lib/layouts/svjour.inc @@ -18,7 +18,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 6 +Format 7 Columns 2 Sides 1 PageStyle Plain diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index 7a5edd44b6..b5561f5855 100644 --- a/lib/layouts/svprobth.layout +++ b/lib/layouts/svprobth.layout @@ -24,7 +24,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 6 +Format 7 Input svjour.inc ClassOptions diff --git a/lib/layouts/theorems-ams-extended.module b/lib/layouts/theorems-ams-extended.module index eaf4762139..e21193ee72 100644 --- a/lib/layouts/theorems-ams-extended.module +++ b/lib/layouts/theorems-ams-extended.module @@ -13,7 +13,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 6 +Format 7 Requires amsmath diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index cacb37c519..3b42925323 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -19,7 +19,7 @@ # - Proof # - Case (regular only -- defined as an enumeration) -Format 6 +Format 7 Style Theorem Category Theorem diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index 8781d7eb73..89df2fd989 100644 --- a/lib/layouts/theorems-ams.module +++ b/lib/layouts/theorems-ams.module @@ -13,7 +13,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 6 +Format 7 Requires amsmath,amsthm @@ -21,7 +21,7 @@ Counter Name theorem End -Preamble +AddToPreamble \theoremstyle{plain} EndPreamble diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module index a3d2ecd9dc..df1ac444cf 100644 --- a/lib/layouts/theorems-chap.module +++ b/lib/layouts/theorems-chap.module @@ -7,7 +7,7 @@ # Author: Richard Heck -Format 6 +Format 7 Counter Name theorem diff --git a/lib/layouts/theorems-order.inc b/lib/layouts/theorems-order.inc index d15c8e1f55..7f2a3318ef 100644 --- a/lib/layouts/theorems-order.inc +++ b/lib/layouts/theorems-order.inc @@ -1,7 +1,7 @@ # Sets the order of the main theorem environments # Author: Richard Heck -Format 6 +Format 7 #Get the order right Style Theorem diff --git a/lib/layouts/theorems-proof.inc b/lib/layouts/theorems-proof.inc index e16a25b1da..43635b786f 100644 --- a/lib/layouts/theorems-proof.inc +++ b/lib/layouts/theorems-proof.inc @@ -8,7 +8,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 6 +Format 7 Style Proof Category Theorem diff --git a/lib/layouts/theorems-sec.module b/lib/layouts/theorems-sec.module index 909a72baa8..eb18d3e67b 100644 --- a/lib/layouts/theorems-sec.module +++ b/lib/layouts/theorems-sec.module @@ -6,7 +6,7 @@ # Author: Richard Heck -Format 6 +Format 7 Counter Name theorem diff --git a/lib/layouts/theorems-starred-equivalents.inc b/lib/layouts/theorems-starred-equivalents.inc index 95d4c63b43..e9f3c49a4b 100644 --- a/lib/layouts/theorems-starred-equivalents.inc +++ b/lib/layouts/theorems-starred-equivalents.inc @@ -1,7 +1,7 @@ # Sets the order of the main theorem environments # Author: Richard Heck -Format 6 +Format 7 Style Theorem CopyStyle Theorem* diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc index 788c185355..c0d1281956 100644 --- a/lib/layouts/theorems-starred.inc +++ b/lib/layouts/theorems-starred.inc @@ -18,7 +18,7 @@ # - Claim # - Proof -Format 6 +Format 7 Style Theorem* Category Theorem diff --git a/lib/layouts/theorems-starred.module b/lib/layouts/theorems-starred.module index 0a7b63afa0..8842d4f93f 100644 --- a/lib/layouts/theorems-starred.module +++ b/lib/layouts/theorems-starred.module @@ -7,7 +7,7 @@ # Author: Richard Heck -Format 6 +Format 7 Input theorems-order.inc Input theorems-starred.inc diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index 87ba21cf4e..dafbeab455 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -8,7 +8,7 @@ # Author: Richard Heck -Format 6 +Format 7 Counter Name theorem diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index 14fff8755f..3eda416446 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -19,7 +19,7 @@ # - Proof # - Case (regular only -- defined as an enumeration) -Format 6 +Format 7 Style Theorem Category Theorem diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index af50d3bab5..251492b42f 100644 --- a/lib/scripts/layout2layout.py +++ b/lib/scripts/layout2layout.py @@ -15,7 +15,9 @@ import os, re, string, sys -currentFormat = 6 +# incremented 24 March 2008 by rgh +# AddToPreamble tag added to layout files +currentFormat = 7 def usage(prog_name): @@ -158,6 +160,10 @@ def convert(lines): i += 1 continue + if format == 6: + i += 1 + continue + if format == 5: i += 1 continue diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 9b5ff07431..da80c563ec 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -62,7 +62,7 @@ private: }; -int const FORMAT = 6; +int const FORMAT = 7; bool layout2layout(FileName const & filename, FileName const & tempfile) @@ -179,13 +179,15 @@ enum TextClassTags { TC_NOFLOAT, TC_TITLELATEXNAME, TC_TITLELATEXTYPE, - TC_FORMAT + TC_FORMAT, + TC_ADDTOPREAMBLE }; namespace { keyword_item textClassTags[] = { + { "addtopreamble", TC_ADDTOPREAMBLE }, { "classoptions", TC_CLASSOPTIONS }, { "columns", TC_COLUMNS }, { "counter", TC_COUNTER }, @@ -489,6 +491,10 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) preamble_ = from_utf8(lexrc.getLongString("EndPreamble")); break; + case TC_ADDTOPREAMBLE: + preamble_ += from_utf8(lexrc.getLongString("EndPreamble")); + break; + case TC_PROVIDES: { lexrc.next(); string const feature = lexrc.getString(); -- 2.39.5