more

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7757 a592a061-630c-0410-9148-cb99ea01b6c8

lib/layouts/aapaper.inc

@@ -4,7 +4,7 @@
 #
 # Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
 
-# Subitle style definition
+
 Style Subtitle
 	Margin                Static
 	LatexType             Command
@@ -19,15 +19,13 @@ Style Subtitle
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-
-	# standard font definition
 	Font 
 	  Size                Normal
 	  Series              Bold
 	EndFont
 End
 
-# Address style definition
+
 Style Address
 	Margin                Static
 	LatexType             Command
@@ -38,14 +36,13 @@ Style Address
 	Align                 Left
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
-
 	Font 
 	  Family              Sans
 	  Size                Small
 	EndFont
 End
 
-# Email address style definition
+
 Style Email
 	Margin                Static
 	LatexType             Command
@@ -57,14 +54,13 @@ Style Email
 	LabelType             Static
 	LabelString           email:
 	LabelSep              M
-
 	Font 
 	  Family              Sans
 	  Size                Small
 	EndFont
 End
 
-# Address for Offprints style definition
+
 Style Offprint
 	Margin                Static
 	LatexType             Command
@@ -76,14 +72,13 @@ Style Offprint
 	LabelType             Static
 	LabelString           "Offprint Requests to:"
 	LabelSep              M
-
 	Font 
 	  Family              Sans
 	  Size                Small
 	EndFont
 End
 
-# Acnowledgement style definition
+
 Style Acknowledgement
 	Margin                Static
 	LatexType             Environment
@@ -98,18 +93,16 @@ Style Acknowledgement
 	LabelType             Top_Environment
 	LabelString           Acknowledgements
 	LabelSep              M
-	# standard font definition
 	Font 
 	  Size                Small
 	EndFont
-
-	# label font definition
 	LabelFont 
 	  Size                Small
 	  Shape               Italic
 	EndFont
 End 
 
+	
 Style Thesaurus
 	LabelType             Static
 	LatexType             Command
@@ -129,6 +122,3 @@ Style Thesaurus
 	  Color               Red
 	EndFont
 End
-
-
-

lib/layouts/aapaper.layout

@@ -13,14 +13,14 @@
 #
 # and reconfigure LyX (after running texhash, of course).
 
-# General textclass parameters
+
 Columns                 2
 Sides                   2
-MaxCounter              Counter_Section
 SecNumDepth             3
 TocDepth                0
 PageStyle               Plain
 
+
 DefaultFont
 	Family                Roman
 	Series                Medium
@@ -29,7 +29,7 @@ DefaultFont
 	Color                 None
 EndFont
 
-# Standard style definition
+
 Style Standard
 	Margin                Static
 	LatexType             Paragraph
@@ -41,62 +41,80 @@ Style Standard
 	LabelType             No_Label
 End
 
+
 # I want to keep the entries in a logical order.
 # Therefore I'll define the entries first, then fill them
-
 Style Itemize
-	End
+End
+
 Style Enumerate
-	End
+End
+
 Style Description
-	End
+End
+
 Style List
-	End
+End
+
 Style Caption
-	End
+End
+
 Style LaTeX
-	End
+End
+
 Style Section
-	End
+End
+
 Style Subsection
-	End
+End
+
 Style Subsubsection
-	End
+End
+
 Style Title
-	End
+End
+
 Style Subtitle
-	End
+End
+
 Style Author
-	End
+End
+
 Style Address
-	End
+End
+
 Style Email
-	End
+End
+
 Style Offprint
-	End
+End
+
 Style Thesaurus
-	End
+End
+
 Style Date
-	End
+End
+
 Style Abstract 
-	End
+End
+
 Style Acknowledgement
-	End
+End
+
 Style Bibliography
-	End
+End
 
 # OK, now we have a more or less consistent Ordering. Now fill the
-# definitions. 
+# definitions.  First, the standard includes
-# First, the standard includes
 
 Input stdlists.inc
 Input stdlayouts.inc
 Input stdsections.inc
 Input stdtitle.inc
 Input stdstruct.inc
+Input numarticle.inc
 Input stdfloats.inc
 Input stdcounters.inc
-# Remove unwanted Styles
 
 NoStyle Quotation
 NoStyle Quote
@@ -106,12 +124,10 @@ NoStyle Paragraph
 NoStyle Subparagraph
 NoStyle Part
 
-# Definitions only valid for A&A style
+
 Input aapaper.inc
 
-# Redefine some things
 
-# Section style redefinition
 Style Section
 	TopSep                2.0
 	BottomSep             1.3
@@ -120,7 +136,7 @@ Style Section
 	EndFont
 End
 
-# Subsection style redefinition
+
 Style Subsection
 	TopSep                1.7
 	BottomSep             1.1
@@ -131,7 +147,7 @@ Style Subsection
 	EndFont
 End
 
-# Subsubsection style redefinition
+
 Style Subsubsection
 	TopSep                1.7
 	BottomSep             1.1
@@ -141,7 +157,7 @@ Style Subsubsection
 	EndFont
 End
 
-# Title style redefinition
+
 Style Title
 	TopSep                2
 	BottomSep             1.3
@@ -152,7 +168,7 @@ Style Title
 	EndFont
 End
 
-# Author style redefinition
+
 Style Author
 	Align                 Left
 	AlignPossible         Left
@@ -163,7 +179,7 @@ Style Author
 	EndFont
 End
 
-# Date style redefinition
+
 Style Date
 	LabelSep              ""
 	TopSep                1.2
@@ -174,7 +190,7 @@ Style Date
 	EndFont
 End
 
-# Abstract style redefinition
+
 Style Abstract 
 	LeftMargin            ""
 	RightMargin           ""
@@ -191,7 +207,7 @@ Style Abstract
 	EndFont
 End 
 
-# Bibliography style redefinition
+
 Style Bibliography
 	Align                 Left
 	AlignPossible         Left
@@ -199,4 +215,3 @@ Style Bibliography
 	  Series              Bold
 	EndFont
 End
-

lib/layouts/aastex.layout

@@ -28,29 +28,22 @@
 # Version 1.1   7/25/99 - Changed \url to take advantage of new layout option.
 # Version 1.2   4/18/02 - Updated for natbib in 1.2.0
 
-# General textclass parameters
+
 Columns                 1
 Sides                   1
-MaxCounter              Counter_Section
 #SecNumDepth            3
 TocDepth                0
 PageStyle               Plain
 ProvidesAmsmath         1
 ProvidesNatbib          1
 ProvidesUrl             1
+
+
 ClassOptions
 	PageStyle             ""      
 End
 
-DefaultFont
-	Family                Roman
-	Series                Medium
-	Shape                 Up
-	Size                  Normal
-	Color                 None
-EndFont
 
-# Standard style definition
 Style Standard
 	Margin                Static
 	LatexType             Paragraph
@@ -62,82 +55,107 @@ Style Standard
 	LabelType             No_Label
 End
 
+
 # I want to keep the entries in a logical order.
 # Therefore I'll define the entries first, then fill them in
 
 Style Section
-	End
+End
+
 Style Subsection
-	End
+End
+
 Style Subsubsection
-	End
+End
+
 Style Paragraph
-	End
+End
+
 Style Itemize
-	End
+End
+
 Style Enumerate
-	End
+End
+
 Style Description
-	End
+End
+
 Style List
-	End
+End
+
 Style Title
-	End
+End
+
 Style Author
-	End
+End
+
 Style Affiliation
-	End
+End
+
 Style Email
-	End
+End
+
 Style And
-	End
+End
+
 Style Date
-	End
+End
+
 Style Abstract 
-	End
+End
+
 Style Keywords
-	End
+End
+
 Style Acknowledgements
-	End
+End
+
 Style Appendix
-	End
+End
+
 Style References
-	End
+End
+
 Style PlaceFigure
-	End
+End
+
 Style PlaceTable
-	End
+End
+
 Style TableComments
-	End
+End
+
 Style TableRefs
-	End
+End
+
 Style Caption
-	End
+End
+
 Style MathLetters
-	End
+End
+
 Style NoteToEditor
-	End
+End
+
 
 # OK, now we have a more or less consistent Ordering. Now fill the
-# definitions. 
+# definitions. First, the standard includes
-# First, the standard includes
 
 Input stdsections.inc
+Input numarticle.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdlists.inc
 Input stdfloats.inc
 Input stdcounters.inc
-# Remove unwanted Styles
+
 NoStyle Part
 NoStyle Chapter
 NoStyle Subparagraph
 NoStyle List
 NoStyle Bibliography
 
-# Redefine some things
 
-# Section style redefinition
 Style Section
 	Align                 Center
 	AlignPossible         Center
@@ -150,7 +168,7 @@ Style Section
 	EndFont
 End
 
-# Subsection style redefinition
+
 Style Subsection
 	Align                 Center
 	AlignPossible         Center
@@ -163,7 +181,7 @@ Style Subsection
 	EndFont
 End
 
-# Subsubsection style redefinition
+
 Style Subsubsection
 	Align                 Center
 	AlignPossible         Center
@@ -177,7 +195,7 @@ Style Subsubsection
 	EndFont
 End
 
-# Title style redefinition
+
 Style Title
 	TopSep                2
 	BottomSep             1.3
@@ -190,7 +208,7 @@ Style Title
 	EndFont
 End
 
-# Author style redefinition
+
 Style Author
 	Align                 Center
 	AlignPossible         Center
@@ -203,7 +221,7 @@ Style Author
 	EndFont
 End
 
-# Date style redefinition
+
 Style Date
 	LabelSep              ""
 	TopSep                1.2
@@ -215,7 +233,7 @@ Style Date
 	EndFont
 End
 
-# Abstract style redefinition
+
 Style Abstract 
 	LeftMargin            "MMM"
 	RightMargin           "MMM"
@@ -234,7 +252,7 @@ Style Abstract
 	EndFont
 End 
 
-# Affiliation style definition
+
 Style Affiliation
 	Margin                Static
 	LatexType             Command
@@ -252,7 +270,7 @@ Style Affiliation
 	EndFont
 End
 
-# Keywords style definition
+
 Style Keywords
 	LeftMargin            MMM     
 	Margin                Dynamic
@@ -278,7 +296,7 @@ Style Keywords
 	EndFont
 End
 
-# Email style definition
+
 Style Email
 	Margin                Static
 	LatexType             Command
@@ -296,7 +314,7 @@ Style Email
 	EndFont
 End
 
-# Acknowledgements style definition
+
 Style Acknowledgements
 	Margin                Dynamic
 	LatexType             Command
@@ -318,7 +336,6 @@ Style Acknowledgements
 End
 
 	
-# And style definition
 Style And
 	Margin                Dynamic
 	LatexType             Command
@@ -338,7 +355,7 @@ Style And
 	EndFont
 End
  
-# Placefigure style definition
+
 Style PlaceFigure
 	Margin                Dynamic
 	LatexType             Command
@@ -358,7 +375,7 @@ Style PlaceFigure
 	EndFont
 End
 
-# Placetable style definition
+
 Style PlaceTable
 	Margin                Dynamic
 	LatexType             Command
@@ -378,7 +395,7 @@ Style PlaceTable
 	EndFont
 End
 
-# Appendix style definition
+
 Style Appendix
 	Margin                Dynamic
 	LatexType             Command
@@ -399,7 +416,7 @@ Style Appendix
 	EndFont
 End
 
-# MathLetters style redefinition
+
 Style MathLetters
 	LatexType             Environment     
 	LatexName             mathletters
@@ -411,7 +428,7 @@ Style MathLetters
 	EndFont
 End 
 
-# References style redefinition
+
 Style References
 	Margin                First_Dynamic   
 	LatexType             Item_Environment        
@@ -435,9 +452,9 @@ Style References
 	EndFont
 End 
 
+
 # Need reordering below here
 
-# Notetoeditor style definition
 Style NoteToEditor
 	Margin                Dynamic
 	LatexType             Command
@@ -457,7 +474,7 @@ Style NoteToEditor
 	EndFont
 End
 
-# TableRefs style definition
+
 Style TableRefs
 	Margin                First_Dynamic
 	LatexType             Command
@@ -476,7 +493,7 @@ Style TableRefs
 	EndFont
 End
 
-# TableComments style definition
+
 Style TableComments
 	Margin                First_Dynamic
 	LatexType             Command
@@ -495,7 +512,7 @@ Style TableComments
 	EndFont
 End
 
-# Caption style definition
+
 Style Caption
 	Margin                First_Dynamic
 	LatexType             Command
@@ -508,14 +525,12 @@ Style Caption
 	AlignPossible         Block, Left
 	LabelType             Sensitive
 	LabelString           Caption
-
-	# label font definition
 	LabelFont 
 	  Series              Bold
 	EndFont
 End
 
-# FigCaption style definition
+
 Style FigCaption
 	Margin                First_Dynamic
 	LatexType             Command

lib/layouts/agums.layout

@@ -3,11 +3,9 @@
 # AGUplus manuscript textclass definition file. 
 # Author: Martin Vermeer <martin.vermeer@hut.fi>
 
-# Input general definitions
+
 Input aguplus.inc
 
 ClassOptions
 	Other "agums"
 End
-
-

lib/layouts/aguplus.inc

@@ -4,216 +4,219 @@
 # Necessary LaTeX files to be found on
 #
 # ftp://ftp.agu.org/journals/latex/journals
-#
+
-# Input general definitions
+
 Input stdclass.inc
+Input numarticle.inc
+
+SecNumDepth             4
+
+Preamble
+	\usepackage{times}
+	\sectionnumbers
+EndPreamble
 
-SecNumDepth     4
-MaxCounter      Counter_Section
 
-# There are no chapters in an article.
 NoStyle Chapter
 NoStyle Chapter*
 
 NoStyle Subparagraph
 NoStyle Subparagraph*
 
-# Redefine these a bit:
 
 Style Section
 	Font
-	  Size        Large
+	  Size                Large
 	EndFont
 End
 
+
 Style Section*
 	Font
-	  Size        Large
+	  Size                Large
 	EndFont
 End
 
+
 Style Subsection
 	Font
-	  Size        Normal
+	  Size                Normal
 	EndFont
 End
 
+
 Style Subsection*
 	Font
-	  Size        Normal
+	  Size                Normal
 	EndFont
 End
 
-# Subsubsubsection style (re-)definition
+
 Style Paragraph
-	LatexName     subsubsection
+	LatexName             subsubsection
 End
 
-# SubSubsubsection* style (re-)definition
+
 Style Paragraph*
-	CopyStyle     Paragraph
+	CopyStyle             Paragraph
-	Margin        Static
+	Margin                Static
-	LatexName     subsubsubsection*
+	LatexName             subsubsubsection*
-	LabelType     No_Label
+	LabelType             No_Label
-	OptionalArgs      0
+	OptionalArgs          0
 End
 
-Preamble
-\usepackage{times}
-\sectionnumbers
-EndPreamble
 
-# Headers style definition
 Style Left_Header
-	Margin        Static
+	Margin                Static
-	LatexType     Command
+	LatexType             Command
-	LatexName     lefthead
+	LatexName             lefthead
-	NextNoIndent  1
+	NextNoIndent          1
-	LeftMargin    "Left Header:xx"
+	LeftMargin            "Left Header:xx"
-	LabelSep      xxx
+	LabelSep              xxx
-	ParSkip       0.4
+	ParSkip               0.4
-	TopSep        1.3
+	TopSep                1.3
-	BottomSep     0.7
+	BottomSep             0.7
-	ParSep        0.7
+	ParSep                0.7
-	Align         Left
+	Align                 Left
-	AlignPossible     Left
+	AlignPossible         Left
-	LabelType     Static
+	LabelType             Static
-	LabelString   "Left Header:"
+	LabelString           "Left Header:"
 	InTitle               1
-
-	# standard font definition
 	LabelFont
-	  Series      Bold
+	  Series              Bold
-	  Shape       Italic
+	  Shape               Italic
-	  Color       red
+	  Color               red
 	EndFont
-
 End
 
+
 Style Right_Header
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     righthead
+	LatexName             righthead
-	LeftMargin    "Right Header:xx"
+	LeftMargin            "Right Header:xx"
-	LabelString   "Right Header:"
+	LabelString           "Right Header:"
 End
 
+
 Style Received
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     received
+	LatexName             received
-	LeftMargin    Received:xx
+	LeftMargin            Received:xx
-	LabelString   Recieved:
+	LabelString           Recieved:
 End
 
+
 Style Revised
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     revised
+	LatexName             revised
-	LeftMargin    Revised:xx
+	LeftMargin            Revised:xx
-	LabelString   Revised:
+	LabelString           Revised:
 End
 
+
 Style Accepted
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     accepted
+	LatexName             accepted
-	LeftMargin    Accepted:xx
+	LeftMargin            Accepted:xx
-	LabelString   Accepted:
+	LabelString           Accepted:
 End
 
+
 Style CCC
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     ccc
+	LatexName             ccc
-	LeftMargin    "CCC code:xx"
+	LeftMargin            "CCC code:xx"
-	LabelString   "CCC code:"
+	LabelString           "CCC code:"
 End
 
+
 # cpright
-
 # journalid
-
 # articleid
 
+
 Style PaperId
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     paperid
+	LatexName             paperid
-	LeftMargin    "Paper Id:xx"
+	LeftMargin            "Paper Id:xx"
-	LabelString   "Paper Id:"
+	LabelString           "Paper Id:"
 End
 
+
 Style AuthorAddr
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     authoraddr
+	LatexName             authoraddr
-	LeftMargin    "Author Address:xx"
+	LeftMargin            "Author Address:xx"
-	LabelString   "Author Address:"
+	LabelString           "Author Address:"
 End
 
+
 Style SlugComment
-	CopyStyle             "Left Header"
+	CopyStyle             Left_Header
-	LatexName     slugcomment
+	LatexName             slugcomment
-	LeftMargin    "Slug Comment:xx"
+	LeftMargin            "Slug Comment:xx"
-	LabelString   "Slug Comment:"
+	LabelString           "Slug Comment:"
 End
 
 
-# a few changes to the bibliography
 Style Bibliography
 	TopSep                4
 	LabelString           Bibliography
-
-	# label font definition
 	LabelFont
 	  Series              Bold
 	  Size                Huge
 	EndFont
 End
 
-# plate
+
 Float
 	Type                  plate
 	GuiName               Plate
 	Placement             htbp
 	Extension             lof
-	NumberWithin  none
+	NumberWithin          none
 	Style                 plain
-	LatexBuiltin  true
+	LatexBuiltin          true
 End
 
-# planotable
+
 Float
 	GuiName               Planotable
 	Type                  planotable
 	Placement             htbp
 	Extension             lot
-	NumberWithin  none
+	NumberWithin          none
 	Style                 Ruled
-	LatexBuiltin  true
+	LatexBuiltin          true
 End
 
 
-# Table Caption style definition
+
 Style Table_Caption
 	Margin                First_Dynamic
 	LatexType             Command
-	LatexName     tablecaption
+	LatexName             tablecaption
-	NeedProtect   1
+	NeedProtect           1
 	LabelSep              xx
 	ParSkip               0.4
 	TopSep                0.5
-	Align         Center
+	Align                 Center
-	AlignPossible Center
+	AlignPossible         Center
-	LabelType     Sensitive
+	LabelType             Sensitive
-	LabelString   TableCaption
+	LabelString           TableCaption
-
-	# label font definition
 	LabelFont
 	  Series              Bold
 	EndFont
 End
 
-Counter
-	Name          plate
-	Within        none
-End
 
 Counter
-	Name          planotable
+	Name                  plate
-	Within        none
+	Within                none
+End
+
+
+Counter
+	Name                  planotable
+	Within                none
 End

lib/layouts/amsart-seq.layout

@@ -4,19 +4,262 @@
 # and from the Article textclass definition file, following the AMS sample
 # paper "testmath.tex" of January, 1995
 # Author : David L. Johnson <dlj0@lehigh.edu>
+#
 # The "seq" version has all results, figures, etc., numbered in a separate
-# sequence, without section numbers attached (Theorem (1), Corollary (1), Theorem
+# sequence, without section numbers attached (Theorem (1), Corollary (1),
-# (2), etc.).  
+# Theorem (2), etc.).
+#
 # Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
 # modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
 
 Input amsart.layout
+
 # Change the definitions of the theorem-like environments to get a
 # better numbering.
+
 Input amsmaths-seq.inc
 
 # Use a simpler preamble.
-Preamble
 
+Preamble
 EndPreamble
 
+
+# but more counters
+
+Counter
+	Name                  corollary
+End  
+
+
+Counter
+	Name                  lemma
+End  
+
+
+Counter
+	Name                  proposition
+End  
+
+
+Counter
+	Name                  conjecture
+End  
+
+
+Counter
+	Name                  criterion
+End  
+
+
+Counter
+	Name                  algorithm
+End  
+
+
+Counter
+	Name                  fact
+End  
+
+
+Counter
+	Name                  axiom
+End  
+
+
+Counter
+	Name                  definition
+End  
+
+
+Counter
+	Name                  example
+End  
+
+
+Counter
+	Name                  condition
+End  
+
+
+Counter
+	Name                  problem
+End  
+
+
+Counter
+	Name                  exercise
+End  
+
+
+Counter
+	Name                  remark
+End  
+
+
+Counter
+	Name                  claim
+End  
+
+
+Counter
+	Name                  note
+End  
+
+
+Counter
+	Name                  notation
+End  
+
+
+Counter
+	Name                  summary
+End  
+
+
+Counter
+	Name                  acknowledgement
+End  
+
+
+Counter
+	Name                  case
+End  
+
+
+Counter
+	Name                  conclusion
+End  
+
+
+
+Style Theorem
+	LabelCounter          theorem
+	LabelString           "Theorem \arabic{theorem}."
+End  
+
+
+Style Corollary
+	LabelCounter          corollary
+	LabelString           "Corollary \arabic{corollary}."
+End  
+
+
+Style Lemma
+	LabelCounter          lemma
+	LabelString           "Lemma \arabic{lemma}."
+End  
+
+
+Style Proposition
+	LabelCounter          proposition
+	LabelString           "Proposition \arabic{proposition}."
+End  
+
+
+Style Conjecture
+	LabelCounter          conjecture
+	LabelString           "Conjecture \arabic{conjecture}."
+End  
+
+
+Style Criterion
+	LabelCounter          criterion
+	LabelString           "Criterion \arabic{criterion}."
+End  
+
+
+Style Algorithm
+	LabelCounter          algorithm
+	LabelString           "Algorithm \arabic{algorithm}."
+End  
+
+
+Style Fact
+	LabelCounter          fact
+	LabelString           "Fact \arabic{fact}."
+End  
+
+
+Style Axiom
+	LabelCounter          axiom
+	LabelString           "Axiom \arabic{axiom}."
+End  
+
+
+Style Definition
+	LabelCounter          definition
+	LabelString           "Definition \arabic{definition}."
+End  
+
+
+Style Example
+	LabelCounter          example
+	LabelString           "Example \arabic{example}."
+End  
+
+
+Style Condition
+	LabelCounter          condition
+	LabelString           "Condition \arabic{condition}."
+End  
+
+
+Style Problem
+	LabelCounter          problem
+	LabelString           "Problem \arabic{problem}."
+End  
+
+
+Style Exercise
+	LabelCounter          execise
+	LabelString           "Exercise \arabic{execise}."
+End  
+
+
+Style Remark
+	LabelCounter          remark
+	LabelString           "Remark \arabic{remark}."
+End  
+
+
+Style Claim
+	LabelCounter          claim
+	LabelString           "Claim \arabic{claim}."
+End  
+
+
+Style Note
+	LabelCounter          note
+	LabelString           "Note \arabic{note}."
+End  
+
+
+Style Notation
+	LabelCounter          notation
+	LabelString           "Notation \arabic{notation}."
+End  
+
+
+Style Summary
+	LabelCounter          summary
+	LabelString           "Summary \arabic{summary}."
+End  
+
+
+Style Acknowledgement
+	LabelCounter          acknowledgement
+	LabelString           "Acknowledgement \arabic{acknowledgement}."
+End  
+
+
+Style Case
+	LabelCounter          case
+	LabelString           "Case \arabic{case}."
+End  
+
+
+Style Conclusion
+	LabelCounter          conclusion
+	LabelString           "Conclusion \arabic{conclusion}."
+End  

lib/layouts/entcs.layout

@@ -10,13 +10,35 @@ ClassOptions
 	FontSize   11
 End  
 
+Preamble
+	\usepackage{entcsmacro,ifthen}
+	\newcommand{\theTitle}[1]{}
+	\newcommand{\theAuthor}[1]{}
+	\newcommand{\theAddress}[1]{}
+	\newcommand{\theAbstract}[1]{}
+	\newboolean{hasAbstract}
+	\newcommand{\theKeyword}[1]{}
+	\newboolean{hasKeyword}
+	\newcommand{\theFrontMatter}[1]{}
+	\newcommand{\maketitle}{
+	 \begin{frontmatter}
+	 \title{\theTitle}
+	 \author{\theAuthor}
+	 \address{\theAddress}
+	 \ifthenelse{\boolean{hasAbstract}}{\begin{abstract}\theAbstract\end{abstract}}{}
+	 \ifthenelse{\boolean{hasKeyword}}{\begin{keyword}\theKeyword\end{keyword}}{}
+	 \theFrontMatter
+	 \end{frontmatter}
+	}
+EndPreamble
+
 
 Style Title
 	LatexType             Command
 	LatexName             settitle
 	InTitle               1
 	Preamble
-\newcommand{\settitle}[1]{\def\theTitle{#1}}
+		\newcommand{\settitle}[1]{\def\theTitle{#1}}
 	EndPreamble
 End
 
@@ -26,7 +48,7 @@ Style Author
 	LatexName             setauthor
 	InTitle               1
 	Preamble
-\newcommand{\setauthor}[1]{\def\theAuthor{#1}}
+		\newcommand{\setauthor}[1]{\def\theAuthor{#1}}
 	EndPreamble
 End
 
@@ -38,7 +60,7 @@ Style Address
 	AlignPossible         Center
 	InTitle               1
 	Preamble
-\newcommand{\setaddress}[1]{\def\theAddress{#1}}
+		\newcommand{\setaddress}[1]{\def\theAddress{#1}}
 	EndPreamble
 	Font 
 	  Shape               Italic
@@ -52,7 +74,7 @@ Style FrontMatter
 	LaTeXName             setfrontmatter
 	InTitle               1
 	Preamble
-\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
+		\newcommand{\setfrontmatter}[1]{\def\theFrontMatter{#1}}
 	EndPreamble
 End
 
@@ -66,7 +88,8 @@ Style Abstract
 	RightMargin           ""
 	InTitle               1
 	Preamble
-\newcommand{\setabstract}[1]{\def\theAbstract{#1}\setboolean{hasAbstract}{true}}
+		\newcommand{\setabstract}[1]{%
+			\def\theAbstract{#1}\setboolean{hasAbstract}{true}}
 	EndPreamble
 End
 
@@ -78,41 +101,17 @@ Style Keyword
 	LatexName             setkeyword
 	InTitle               1
 	Preamble
-\newcommand{\setkeyword}[1]{\def\theKeyword{#1}\setboolean{hasKeyword}{true}}
+		\newcommand{\setkeyword}[1]{%
+			\def\theKeyword{#1}\setboolean{hasKeyword}{true}}
 	EndPreamble
 	LabelType             Static
 	LabelString           "Key words:"
 	LabelSep              xx
-	
 	Font 
 	  Size                Small
 	EndFont
-
 	LabelFont 
 	  Shape               Italic
 	  Size                Small
 	EndFont
 End
-
-
-Preamble
-\usepackage{entcsmacro,ifthen}
-\newcommand{\theTitle}[1]{}
-\newcommand{\theAuthor}[1]{}
-\newcommand{\theAddress}[1]{}
-\newcommand{\theAbstract}[1]{}
-\newboolean{hasAbstract}
-\newcommand{\theKeyword}[1]{}
-\newboolean{hasKeyword}
-\newcommand{\theFrontMatter}[1]{}
-\newcommand{\maketitle}{
- \begin{frontmatter}
- \title{\theTitle}
- \author{\theAuthor}
- \address{\theAddress}
- \ifthenelse{\boolean{hasAbstract}}{\begin{abstract}\theAbstract\end{abstract}}{}
- \ifthenelse{\boolean{hasKeyword}}{\begin{keyword}\theKeyword\end{keyword}}{}
- \theFrontMatter
- \end{frontmatter}
-}
-EndPreamble

lib/layouts/extarticle.layout

@@ -1,13 +1,10 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{extarticle}
-# Article textclass definition file. Taken from initial LyX source code
+# Herbert Voss <voss@lyx.org>
-# Author   : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# this file: Herbert Voss <voss@lyx.org>
 
 Input article.layout
 
 # change available fontsizes
-
 ClassOptions
 	FontSize              8|9|14|17|20
-End
+end

lib/layouts/extbook.layout

@@ -1,13 +1,11 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{extbook}
-# Book textclass definition file. Taken from initial LyX source code
+# Extended book textclass definition file.
-# Author   : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
+# Herbert Voss <voss@lyx.org>
-# this file: Herbert Voss <voss@lyx.org>
 
 Input book.layout
 
 # change available fontsizes
-
 ClassOptions
 	FontSize              8|9|14|17|20
-End
+end

lib/layouts/extletter.layout

@@ -1,13 +1,11 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{extletter}
-# Article textclass definition file. Taken from initial LyX source code
+# Extended article textclass definition file.
-# Author   : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
+# Herbert Voss <voss@lyx.org>
-# this file: Herbert Voss <voss@lyx.org>
 
 Input letter.layout
 
 # change available fontsizes
-
 ClassOptions
 	FontSize              8|9|14|17|20
-End
+end

lib/layouts/extreport.layout

@@ -1,14 +1,11 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{extreport}
-# Article textclass definition file. Taken from initial LyX source code
+# Extented report textclass definition file.
-# Author   : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
+# Herbert Voss <voss@lyx.org>
-# this file: Herbert Voss <voss@lyx.org>
-
 
 Input report.layout
 
 # change available fontsizes
-
 ClassOptions
 	FontSize              8|9|14|17|20
 End

lib/layouts/foils.layout

@@ -6,10 +6,8 @@
 # To do: Define class specific options.
 
 
-# General textclass parameters
 Columns                 1
 Sides                   1
-MaxCounter              Counter_Section
 
 
 DefaultFont
@@ -22,9 +20,9 @@ EndFont
 
 
 ClassOptions
-	FontSize   17|20|25|30
+	FontSize              17|20|25|30
-	PageStyle  "empty|plain|foilheadings|fancy"
+	PageStyle             "empty|plain|foilheadings|fancy"
-	Other      "dvips"
+	Other                 "dvips"
 End
 
 
@@ -52,7 +50,6 @@ Style Foilhead
 	Align                 Center
 	AlignPossible         Center
 	LabelType             No_Label
-
 	Font 
 	  Series              Bold
 	  Size                Large
@@ -78,11 +75,8 @@ Style ShortRotatefoilhead
 End
 
 
-# then a few lists
-Input stdlists.inc
-
-
 # We add there a few additional lists that look good in foils.
+Input stdlists.inc
 
 Style TickList
 	Margin                Static
@@ -100,13 +94,11 @@ Style TickList
 	AlignPossible         Block, Left
 	LabelType             Static
 	LabelString           _/
-	
 	Preamble
 	   \usepackage{pifont}
 	EndPreamble
 End
 
-
 Style CrossList
 	Margin                Static
 	LatexType             Item_Environment
@@ -123,14 +115,12 @@ Style CrossList
 	AlignPossible         Block, Left
 	LabelType             Static
 	LabelString           ><
-	
 	Preamble
 	  \usepackage{pifont}
 	EndPreamble
 End
 
 
-# Then the Titles stuff.
 Input stdtitle.inc
 Input stdstruct.inc
 
@@ -162,7 +152,6 @@ Style Abstract
 	  Size                Normal
 	  Series              Medium
 	EndFont
-	
 	LabelFont 
 	  Size                Large
 	  Series              Bold
@@ -172,57 +161,56 @@ End
 
 # Header definitions:
 Style My_Logo
-	Margin        Static
+	Margin                Static
-	LatexType     Command
+	LatexType             Command
-	LatexName     MyLogo
+	LatexName             MyLogo
-	LeftMargin        My_Logo:xx
+	LeftMargin            My_Logo:xx
-	LabelSep      xxx
+	LabelSep              xxx
-	Align         Left
+	Align                 Left
-	AlignPossible     Left
+	AlignPossible         Left
-	LabelType     Static
+	LabelType             Static
-	LabelString       "My Logo:"
+	LabelString           "My Logo:"
-
-	# standard font definition
 	LabelFont             
-	  Series      Bold
+	  Series              Bold
-	  Shape       Italic
+	  Shape               Italic
-	  Color       red
+	  Color               red
 	EndFont
-
 End
 
 
 Style Restriction
-	CopyStyle              "My Logo"
+	CopyStyle             "My Logo"
-	LatexName     Restriction
+	LatexName             Restriction
-	LeftMargin        Restriction:xx
+	LeftMargin            Restriction:xx
-	LabelString       "Restriction:"
+	LabelString           "Restriction:"
 End
 
 
 Style Left_Header
-	CopyStyle              "My Logo"
+	CopyStyle             "My Logo"
-	LatexName     leftheader
+	LatexName             leftheader
-	LeftMargin        Left_Header:xx
+	LeftMargin            Left_Header:xx
-	LabelString       "Left Header:"
+	LabelString           "Left Header:"
 End
 
 
 Style Right_Header
-	CopyStyle              "My Logo"
+	CopyStyle             "My Logo"
-	LatexName     rightheader
+	LatexName             rightheader
-	LeftMargin        Right_Header:xx
+	LeftMargin            Right_Header:xx
-	LabelString       "Right Header:"
+	LabelString           "Right Header:"
 End
 
+
 Style Right_Footer
-	CopyStyle              "My Logo"
+	CopyStyle             "My Logo"
-	LatexName     rightfooter
+	LatexName             rightfooter
-	LeftMargin        Right_Footer:xx
+	LeftMargin            Right_Footer:xx
-	LabelString       "Right Footer:"
+	LabelString           "Right Footer:"
 End
 
 
+
 Style Bibliography
 	LabelFont 
 	  Size                Larger
@@ -246,12 +234,10 @@ Style Theorem
 	AlignPossible         Block, Left
 	LabelType             Static
 	LabelString           "Theorem #."
-
 	TextFont
 	  Shape               Slanted
 	  Size                Normal
 	EndFont
-
 	LabelFont
 	  Series              Bold
 	EndFont
@@ -283,11 +269,9 @@ Style Definition
 	CopyStyle             Theorem
 	LatexName             Definition
 	LabelString           "Definition #."
-
 	Font
 	  Shape               Up
 	EndFont
-
 	LabelFont
 	  Shape               Up
 	  Series              Bold
@@ -299,11 +283,9 @@ Style Proof
 	CopyStyle             Theorem
 	LatexName             Proof
 	LabelString           "Proof."
-	
 	Font
 	  Shape               Up
 	EndFont
-
 	LabelFont
 	  Shape               Up
 	  Series              Bold
@@ -346,11 +328,7 @@ Style Definition*
 End
 
 
-# all the standard LaTeX environments
 Input stdlayouts.inc
 Input stdfloats.inc
 Input stdcounters.inc
-
-
-# Finally add a few weird LyX environments.
 Input lyxmacros.inc

lib/layouts/g-brief-de.layout

@@ -1,30 +1,17 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass[g-brief]{letter (g-brief, german)}
+#  \DeclareLaTeXClass[g-brief]{letter (g-brief)}
 # Letter textclass definition file. 
 # Author : Thomas Hartkens <thomas@hartkens.de>
 
-# Input general definitions
+Input stdfloats.inc
-# Input stdletter.inc
+Input stdcounters.inc
 
-
-# General textclass parameters
 Columns                 1
 Sides                   1
 PageStyle               Empty
 DefaultStyle            Brieftext
 
 
-# This is just to show how to declare the default font.
-# The defaults are exactly those shown here.
-DefaultFont
-	Family                Roman
-	Series                Medium
-	Shape                 Up
-	Size                  Normal
-	Color                 None
-EndFont
-
-
 Style Brieftext
 	Margin                Static
 	LatexType             Environment
@@ -43,7 +30,6 @@ Style Brieftext
 End
 
 
-# Name und Titel des Absenders
 Style Name
 	Margin                Static
 	LatexType             Command
@@ -63,521 +49,190 @@ Style Name
 End
 
 
-# Unterschrift des Absenders
 Style Unterschrift
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Unterschrift
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Unterschrift:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Strasse
 Style Strasse
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Strasse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Strasse:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Zusatz
 Style Zusatz
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Zusatz
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Zusatz:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Ort
 Style Ort
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Ort
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Ort:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Land
 Style Land
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Land
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Land:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# RetourAdresse
 Style RetourAdresse
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             RetourAdresse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           RetourAdresse:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# MeinZeichen
 Style MeinZeichen
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             MeinZeichen
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           MeinZeichen:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# IhrZeichen
 Style IhrZeichen
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             IhrZeichen
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           IhrZeichen:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# IhrSchreiben
 Style IhrSchreiben
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             IhrSchreiben
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           IhrSchreiben:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Telefon
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telefon
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	TopSep                1.5
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Telefon:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Telefax
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telefax
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Telefax:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Telex
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telex
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Telex:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# email  des Absenders
 Style EMail
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             EMail
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           EMail:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
-# HTTP  des Absenders
+
 Style HTTP
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             HTTP
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           HTTP:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Bank
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Bank
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	TopSep                1.5
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Bank:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style BLZ
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             BLZ
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           BLZ:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Konto
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Konto
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Konto:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Postvermerk
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Postvermerk
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Postvermerk:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Adresse
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Adresse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Adresse:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Data style definition
 Style Datum
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Datum
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Left
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Datum:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Oggetto style definition
 Style Betreff
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Betreff
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	ParSep                0.4
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Betreff:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Opening style definition
 Style Anrede
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Anrede
-	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Anrede:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Anlagen
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Anlagen
-	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Anlagen:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Verteiler
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Verteiler
 	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Verteiler:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Gruss
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             LyxGruss
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	BottomSep             1.5
 	ParSep                0.4
-	KeepEmpty             1  
+	LabelString           Gruss:
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           Gruß:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
-
 	Preamble
-	\newcommand{\LyxGruss}[1]
+		\newcommand{\LyxGruss}[1]{\Gruss{#1}{0.5cm}}
-	  { \Gruss{#1}{0.5cm} }
 	EndPreamble
 End
-
-
-Input stdfloats.inc
-Input stdcounters.inc
-
-
-# Input lyxmacros.inc
-
-# Remove some unwanted styles.
-# NoStyle               Right_Address
-# NoStyle               Address

lib/layouts/g-brief-en.layout

@@ -3,29 +3,15 @@
 # Letter textclass definition file. 
 # Author : Thomas Hartkens <thomas@hartkens.de>
 
-# Input general definitions
+Input stdfloats.inc
-# Input stdletter.inc
+Input stdcounters.inc
 
-
-# General textclass parameters
 Columns                 1
 Sides                   1
 PageStyle               Empty
 DefaultStyle            Letter
 
 
-# This is just to show how to declare the default font.
-# The defaults are exactly those shown here.
-DefaultFont
-	Family                Roman
-	Series                Medium
-	Shape                 Up
-	Size                  Normal
-	Color                 None
-EndFont
-
-
-# Brieftext style definition
 Style Letter
 	Margin                Static
 	LatexType             Environment
@@ -44,7 +30,6 @@ Style Letter
 End
 
 
-# Name und Titel des Absenders
 Style Name
 	Margin                Static
 	LatexType             Command
@@ -64,538 +49,190 @@ Style Name
 End
 
 
-# Unterschrift des Absenders
 Style Signature
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Unterschrift
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Signature:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Strasse
 Style Street
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Strasse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Street:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Zusatz
 Style Addition
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Zusatz
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Addition:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Ort
 Style Town
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Ort
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Town:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Land
 Style State
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Land
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           State:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# RetourAdresse
 Style ReturnAddress
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             RetourAdresse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           ReturnAddress:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# MeinZeichen
 Style MyRef
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             MeinZeichen
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           MyRef:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# IhrZeichen
 Style YourRef
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             IhrZeichen
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           YourRef:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# IhrSchreiben
 Style YourMail
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             IhrSchreiben
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           YourMail:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Telefon
 Style Phone
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telefon
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	TopSep                1.5
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Phone:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Telefax
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telefax
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Telefax:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Telex
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Telex
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Telex:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# email  des Absenders
 Style EMail
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             EMail
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           EMail:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# HTTP  des Absenders
 Style HTTP
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             HTTP
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           HTTP:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Bank
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Bank
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	TopSep                1.5
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Bank:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# BLZ
 Style BankCode
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             BLZ
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           BankCode:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Konto
 Style BankAccount
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Konto
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           BankAccount:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Postvermerk
 Style PostalComment
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Postvermerk
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           PostalComment:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# the layout above used to be misspelled like that. Keep the old
-# name for compatibility
-Style PostalCommend
-	ObsoletedBy           PostalComment
-End
-
-
-# Adresse
 Style Address
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Adresse
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Address:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Data style definition
 Style Date
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Datum
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
-	KeepEmpty             1  
-	Align                 Left
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Date:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Oggetto style definition
 Style Reference
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Betreff
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	ParSep                0.4
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Reference:
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
 Style Opening
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Anrede
-	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	TopSep                1.5
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Opening:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Anlagen style definition
 Style Encl.
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Anlagen
-	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Encl.:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Verteiler style definition
 Style cc
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             Verteiler
 	KeepEmpty             1  
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           cc:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
 End
 
 
-# Gruss style definition
 Style Closing
-	Margin                Static
+	CopyStyle             Name
-	LatexType             Command
 	LatexName             LyxGruss
-	LeftMargin            xxxxxxxxxx::xx
-	LabelSep              xx
 	BottomSep             1.5
 	ParSep                0.4
-	KeepEmpty             1  
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
 	LabelString           Closing:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               Blue
-	EndFont
-
 	Preamble
-	\newcommand{\LyxGruss}[1]
+		\newcommand{\LyxGruss}[1]{\Gruss{#1}{0.5cm}}
-	  { \Gruss{#1}{0.5cm} }
 	EndPreamble
-
-
 End
-
-
-Input stdfloats.inc
-Input stdcounters.inc
-
-
-# Input lyxmacros.inc
-
-# Remove some unwanted styles.
-# NoStyle               Right_Address
-# NoStyle               Address

lib/layouts/heb-article.layout

@@ -7,10 +7,10 @@
 Input article
 
 Preamble
-\usepackage{theorem}
+	\usepackage{theorem}
-\theorembodyfont{\upshape}
+	\theorembodyfont{\upshape}
-\newtheorem{theorem}{\R{îùôè}}[section]
+	\newtheorem{theorem}{\R{îùôè}}[section]
-\AtBeginDocument{\make@lr\thetheorem}
+	\AtBeginDocument{\make@lr\thetheorem}
 EndPreamble
 
 
@@ -51,7 +51,7 @@ Style Lemma
 	LatexName             lemma
 	LabelString           ".# äîì"
 	Preamble
-\newtheorem{lemma}[theorem]{\R{ìîä}}
+		\newtheorem{lemma}[theorem]{\R{ìîä}}
 	EndPreamble
 End
 
@@ -61,7 +61,7 @@ Style Corollary
 	LatexName             corollary
 	LabelString           ".# äð÷ñî"
 	Preamble
-\newtheorem{corollary}[theorem]{\R{îñ÷ðä}}
+		\newtheorem{corollary}[theorem]{\R{îñ÷ðä}}
 	EndPreamble
 End
 
@@ -71,7 +71,7 @@ Style Claim
 	LatexName             claim
 	LabelString           ".# äðòè"
 	Preamble
-\newtheorem{claim}[theorem]{\R{èòðä}}
+		\newtheorem{claim}[theorem]{\R{èòðä}}
 	EndPreamble
 End
 
@@ -81,7 +81,7 @@ Style Definition
 	LatexName             definition
 	LabelString           ".# äøãâä"
 	Preamble
-\newtheorem{definition}[theorem]{\R{äâãøä}}
+		\newtheorem{definition}[theorem]{\R{äâãøä}}
 	EndPreamble
 End
 
@@ -91,7 +91,7 @@ Style Remarks
 	LatexName             remark
 	LabelString           ".# äøòä"
 	Preamble
-\newtheorem{remark}[theorem]{\R{äòøä}}
+		\newtheorem{remark}[theorem]{\R{äòøä}}
 	EndPreamble
 End
 
@@ -122,6 +122,8 @@ Style Proof
 	  Series              Bold
 	EndFont
 	Preamble
-\newenvironment{proof}{\R{\textbf{äåëçä:}}}{\hfill\rule{2mm}{2mm}\par\vspace{2mm}}
+		\newenvironment{proof}%
+			{\R{\textbf{äåëçä:}}}%
+			{\hfill\rule{2mm}{2mm}\par\vspace{2mm}}
 	EndPreamble
 End

lib/layouts/heb-letter.layout

@@ -3,30 +3,29 @@
 # Hebrew letter textclass definition file. 
 # Author: Dekel Tsur <dekel@math.tau.ac.il>
 
-
 Input letter
 
 
 Style My_Address
-      Align Left
+	Align                 Left
 End
 
 
 Style Send_To_Address
-      Align Right
+	Align                 Right
 End
 
 
 Style Opening
-      LabelString :äçéúô
+	LabelString           :äçéúô
 End
 
 
 Style Closing
-      LabelString :íåéñ
+	LabelString           :íåéñ
 End
 
 
 Style Signature
-      LabelString :äîéúç
+	LabelString           :äîéúç
 End

lib/layouts/ijmpd.layout

@@ -11,27 +11,21 @@
 # Version 2  2003-03-03  -  Updated for LyX 1.3.0.
 
 
-# Input general definitions
 Input stdclass.inc
-Input stdsections.inc
+Input numarticle.inc
+
 NoStyle Chapter
 NoStyle Chapter*
 NoStyle Part
-Input stdlists.inc
-Input stdlayouts.inc
 NoStyle Verse
-Input stdstruct.inc
-Input stdfloats.inc
-Input stdcounters.inc
 
-
-# General class settings
-MaxCounter              Counter_Section
 SecNumDepth             3
 TocDepth                0
 ProvidesAmsmath         0
 ProvidesNatbib          0
 ProvidesUrl             0
+
+
 ClassOptions
 	FontSize              ""
 	PageStyle             ""
@@ -74,7 +68,6 @@ Style Address
 End
 
 
-# Abstract style redefinition
 Style Abstract
 	LatexType             Environment
 	Align                 Block
@@ -86,7 +79,6 @@ Style Abstract
 End
 
 
-# Section style redefinition
 Style Section
 	Align                 Block
 	AlignPossible         Block
@@ -96,7 +88,6 @@ Style Section
 End
 
 
-# Section* style redefinition
 Style Section*
 	Align                 Block
 	AlignPossible         Block
@@ -106,7 +97,6 @@ Style Section*
 End
 
 
-# Subsection style redefinition
 Style Subsection
 	Align                 Block
 	AlignPossible         Block
@@ -117,7 +107,6 @@ Style Subsection
 End
 
 
-# Subsubection style redefinition
 Style Subsubsection
 	Align                 Block
 	AlignPossible         Block
@@ -161,7 +150,6 @@ Style Proof
 End
 
 
-# Bibliography style redefinition
 Style Bibliography
 	Align                 Block
 	AlignPossible         Block

lib/layouts/jgrga.layout

@@ -3,11 +3,8 @@
 # AGUplus JGR textclass definition file. 
 # Author: Martin Vermeer <martin.vermeer@hut.fi>
 
-
-# Input general definitions
 Input aguplus.inc
 
-
 ClassOptions
 	Other "jgrga"
 End

lib/layouts/kluwer.layout

@@ -14,10 +14,8 @@
 # 2003-03-03  Updated for lyx 1.3.0.
 
 
-# General textclass parameters
 Columns                 1
 Sides                   2
-MaxCounter              Counter_Section
 SecNumDepth             4
 PageStyle               Plain
 
@@ -31,10 +29,6 @@ DefaultFont
 EndFont
 
 
-Preamble
-EndPreamble
-
-
 Style Standard
 	Margin                Static
 	LatexType             Paragraph
@@ -48,12 +42,16 @@ End
 
 
 Input stdsections.inc
-NoStyle Chapter
+Input numarticle.inc
-NoStyle Part
 Input stdstruct.inc
 Input stdlists.inc
 Input stdfloats.inc
 Input stdcounters.inc
+Input stdlayouts.inc
+
+NoStyle Chapter
+NoStyle Part
+NoStyle Verse
 
 
 Style Section
@@ -102,9 +100,6 @@ Style Subparagraph
 	EndFont
 End
 
-Input stdlayouts.inc
-NoStyle Verse
-
 
 Style Title
 	Margin                Static

lib/layouts/latex8.layout

@@ -3,26 +3,20 @@
 # Latex8 textclass definition file.
 # Author : Allan Rae <rae@elec.uq.edu.au>
 
-
 Preamble
 	\usepackage{latex8}
 	\usepackage{times}
 EndPreamble
 
 
-# Input general definitions
 Input stdclass.inc
 
-
 Columns                 1
-MaxCounter              Counter_Section
-
 
 ClassOptions
 	 FontSize             10
 End
 
-
 NoStyle Part
 NoStyle Part*
 NoStyle Chapter
@@ -77,7 +71,6 @@ Style Email
 	  Size                Large
 	  Family              Typewriter
 	EndFont
-
 	LabelFont
 	  Family              Roman
 	EndFont
@@ -103,11 +96,9 @@ Style Affiliation
 End
 
 
-# Abstract style redefinition
 Style Abstract 
 	LeftMargin            ""
 	RightMargin           ""
-
 	Font
 	  Size                Normal
 	  Shape               Italic

lib/layouts/letter.layout

@@ -4,15 +4,12 @@
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
 # Heavily modifed and enhanced by serveral developers.
 
-
-# Input general definitions
 Input stdletter.inc
 Input stdlists.inc
 Input lyxmacros.inc
 Input stdfloats.inc
 Input stdcounters.inc
 
-
-# Remove some unwanted styles.
 NoStyle         Right_Address
 NoStyle         Address
+

lib/layouts/linuxdoc.layout

@@ -4,17 +4,15 @@
 # Author : Pascal André <andre@via.ecp.fr>
 
 
-# General textclass parameters
 Columns                 1
 Sides                   1
 PageStyle               Plain
-MaxCounter              Counter_Section
 OutputType              linuxdoc
 DefaultStyle            Standard
 
-
 Input stdcounters.inc
 Input stdfloats.inc
+Input numarticle.inc
 
 
 Style Standard
@@ -51,13 +49,11 @@ Style Title
 	LabelType             No_Label
 	Fill_Top              1
 	Fill_Bottom           1
-
 	Font 
 	  Family              Sans
 	  Series              Bold
 	  Size                Largest
 	EndFont
-
 	LabelFont 
 	  Family              Sans
 	  Series              Bold
@@ -77,12 +73,10 @@ Style Section
 	ParSep                0.7
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Section
 	Font 
 	  Series              Bold
 	  Size                Larger
 	EndFont
-
 	LabelFont 
 	  Series              Bold
 	  Size                Larger
@@ -101,13 +95,10 @@ Style Subsection
 	ParSep                0.5
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Subsection
-
 	Font 
 	  Series              Bold
 	  Size                Large
 	EndFont
-
 	LabelFont 
 	  Series              Bold
 	  Size                Large
@@ -126,12 +117,9 @@ Style Subsubsection
 	ParSep                0.4
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_SubSubSection
-
 	Font 
 	  Series              Bold
 	EndFont
-
 	LabelFont 
 	  Series              Bold
 	EndFont
@@ -148,12 +136,9 @@ Style Paragraph
 	BottomSep             0.4
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Paragraph
-
 	Font 
 	  Series              Bold
 	EndFont
-
 	LabelFont 
 	  Series              Bold
 	EndFont
@@ -161,25 +146,9 @@ End
 
 
 Style Subparagraph
-	Margin                Dynamic
+	CopyStyle             Paragraph
-	LatexType             Command
 	LatexName             sect4
 	LeftMargin            MM
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Counter_SubParagraph
-
-	Font 
-	  Series              Bold
-	EndFont
-
-	LabelFont 
-	  Series              Bold
-	EndFont
 End
 
 
@@ -195,7 +164,7 @@ Style Enumerate
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_EnumI
+	LabelType             Enumerate
 End
 
 
@@ -211,7 +180,7 @@ Style Itemize
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Static
+	LabelType             Itemize
 	LabelString           *
 End
 
@@ -231,7 +200,6 @@ Style Description
 	AlignPossible         Block, Left
 	LabelType             Manual
 	LabelString           MM
-
 	LabelFont 
 	  Series              Bold
 	EndFont
@@ -252,11 +220,9 @@ Style Verbatim
 	AlignPossible         Block
 	FreeSpacing           1
 	LabelType             No_Label
-
 	Font 
 	  Family              Typewriter
 	EndFont
-
 	LabelFont 
 	  Family              Typewriter
 	EndFont
@@ -293,11 +259,9 @@ Style Author
 	Align                 Center
 	AlignPossible         Center
 	LabelType             No_Label
-
 	Font 
 	  Size                Larger
 	EndFont
-
 	LabelFont 
 	  Size                Larger
 	EndFont
@@ -316,11 +280,9 @@ Style Date
 	Align                 Center
 	AlignPossible         Center
 	LabelType             No_Label
-
 	Font 
 	  Size                Large
 	EndFont
-
 	LabelFont 
 	  Size                Large
 	EndFont
@@ -340,11 +302,9 @@ Style Abstract
 	Align                 Block
 	AlignPossible         Block
 	LabelType             No_Label
-
 	Font 
 	  Shape               Italic
 	EndFont
-
 	LabelFont 
 	  Shape               Italic
 	EndFont
@@ -380,7 +340,6 @@ Style Caption
 	LabelType             Sensitive
 	LabelString		Caption
 	OptionalArgs          1
-
 	LabelFont 
 	  Series              Bold
 	EndFont

lib/layouts/literate-article.layout

@@ -3,11 +3,9 @@
 # literate-article textclass definition file.
 # Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
 
-
 Preamble
 	\usepackage{noweb}
 EndPreamble
 
-
 Input article.layout
 Input literate-scrap.inc

lib/layouts/literate-book.layout

@@ -3,11 +3,9 @@
 # literate-book textclass definition file.
 # Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
 
-
 Preamble
 	\usepackage{noweb}
 EndPreamble
 
-
 Input book.layout
 Input literate-scrap.inc

lib/layouts/literate-report.layout

@@ -3,11 +3,9 @@
 # literate-report textclass definition file.
 # Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
 
-
 Preamble
 	\usepackage{noweb}
 EndPreamble
 
-
 Input report.layout
 Input literate-scrap.inc

lib/layouts/literate-scrap.inc

@@ -1,16 +1,13 @@
-#
 # Suggested style to write your code:
-# Within same scrap, lines are separated by new-lines (Ctrl-return), use:
+# Within same scrap, lines are separated by newlines (Ctrl-Return), use:
 #  ItemSep               0.4
-#     . disavantage: must type ctrl-return every single line
+#    . disavantage: must type ctrl-return every single line
-#     . advantage:   looks better (IMHO)
+#    . advantage:   looks better (IMHO)
-#                    resembles more closelly the produced paper doc. (more WYSIWYG)
+#                   resembles more closely the produced paper doc (more WYSIWYG)
 #
 
-
 OutputType              literate
 
-
 Style Scrap
 	Margin                First_Dynamic
 	LatexType             Paragraph
@@ -26,7 +23,6 @@ Style Scrap
 	FreeSpacing           1
 	PassThru              1
 	LabelType             Static
-
 	LabelFont
 	  Color               magenta
 	EndFont

lib/layouts/llncs.layout

@@ -14,11 +14,9 @@
 # Modified for LyX 12 by Jean-Marc Lasgouttes and MV.
 
 
-# General textclass parameters
 Columns                 1
 Sides                   1
 PageStyle               Plain
-MaxCounter              Counter_Section
 
 
 Style Standard
@@ -32,8 +30,9 @@ Style Standard
 	LabelType             No_Label
 End
 
-# The standard sections
+
 Input stdsections.inc
+Input numarticle.inc
 
 
 Style Chapter
@@ -92,11 +91,9 @@ End
 # Now define the starred versions from the normal ones.
 Input stdstarsections.inc
 
-
+NoStyle Part
-# Remove the ones that we do not want
+NoStyle Part*
-NoStyle         Part
+NoStyle Chapter
-NoStyle         Part*
-NoStyle         Chapter
 
 
 # Some standard things
@@ -119,7 +116,6 @@ Style Title
 	LabelType             No_Label
 	Fill_Top              1
 	Fill_Bottom           1
-
 	Font 
 	  Family              Sans
 	  Series              Bold
@@ -142,7 +138,6 @@ Style Subtitle
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-
 	Font 
 	  Family              Sans
 	  Series              Bold
@@ -167,7 +162,6 @@ Style Running_LaTeX_Title
 	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Running title: "
-
 	LabelFont 
 	  Series              Bold
 	  Shape               Italic
@@ -198,12 +192,10 @@ Style Author
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-
 	Font 
 	  Series              Bold
 	  Shape               Italic
 	EndFont
-
 End
 
 
@@ -236,7 +228,6 @@ Style Institute
 	Align                 Left
 	AlignPossible         Left
 	LabelType             No_Label
-
 	Font 
 	  Size                Small
 	EndFont
@@ -266,7 +257,6 @@ Style Abstract
 	AlignPossible         Block, Left
 	LabelType             Top_Environment
 	LabelString           Abstract. 
-
 	LabelFont 
 	  Series              Bold
 	EndFont
@@ -289,14 +279,13 @@ Style Bibliography
 	LabelType             Bibliography
 	LabelString           References 
 	LabelBottomSep    0.7
-
 	LabelFont 
 	  Series              Bold
 	EndFont
 End
 
-# Mathematics-like definitions:
 
+# Mathematics-like definitions:
 Style Case
 	Margin                First_Dynamic
 	LatexType             Environment
@@ -312,7 +301,6 @@ Style Case
 	AlignPossible         Block, Left
 	LabelType             Static
 	LabelString           Case #. 
-
 	LabelFont 
 	  Shape               Italic
 	EndFont
@@ -337,17 +325,13 @@ Style Corollary
 	CopyStyle             Case
 	LatexName             corollary
 	LabelString           "Corollary #. " 
-
-	# font & label font definition
 	Font 
 	  Shape               Italic
 	EndFont
-
 	LabelFont 
 	  Shape               Up
 	  Series              Bold
 	EndFont
-
 End
 
 
@@ -378,7 +362,6 @@ Style Lemma
 	LabelString           "Lemma #. "
 End
 
-
 Style Note
 	CopyStyle             Case
 	LatexName             note
@@ -413,7 +396,6 @@ Style Proposition
 	LabelString           "Proposition #. "
 End
 
-
 Style Question
 	CopyStyle             Case
 	LatexName             question        
@@ -444,7 +426,3 @@ End
 
 Input stdfloats.inc
 Input stdcounters.inc
-
-
-#Finally a few older definitions for compatibility
-Input obsolete.inc

lib/layouts/ltugboat.layout

@@ -5,16 +5,14 @@
 # Author : Herbert Voss <voss@perce.de> 2001/08/13
 
 
-# General textclass parameters
 Columns                 2
 Sides                   2
-#SecNumDepth                            #no counting
+#SecNumDepth                            # no counting
 #TocDepth               -1
-MaxCounter              Counter_Section
 
 
 ClassOptions
-	FontSize              default         #only 11pt
+	FontSize              default         # only 11pt
 	PageStyle             ""              # controlled by class
 End
 
@@ -43,7 +41,6 @@ End
 
 Input stdlists.inc
 
-
 Style Section
 	Margin                Dynamic
 	LatexType             Command
@@ -57,13 +54,10 @@ Style Section
 	ParSep                0.7
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Section
-
 	Font 
 	  Series              Bold
 	  Size                Normal
 	EndFont
-
 End
 
 
@@ -80,7 +74,6 @@ Style Subsection
 	ParSep                0.5
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Subsection
 	Font 
 	  Series              Bold
 	  Size                Normal
@@ -101,13 +94,10 @@ Style Subsubsection
 	ParSep                0.4
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_SubSubSection
-
 	Font 
 	  Series              Bold
 	  Size                Normal
 	EndFont
-
 End
 
 
@@ -124,8 +114,6 @@ Style Paragraph
 	ParSep                0.4
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_Paragraph
-
 	Font 
 	  Series              Bold
 	  Size                Normal
@@ -135,17 +123,13 @@ End
 
 #Input stdstarsections.inc
 
+Input numarticle.inc
 Input stdstruct.inc
 Input stdlayouts.inc
 Input stdfloats.inc
 Input stdcounters.inc
 
 
-#
-# Create and Overwrite some styles
-#
-
-
 Style Title
 	Margin                Static
 	LatexType             Command

lib/layouts/mwart.layout

@@ -3,47 +3,39 @@
 # mwart textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
 # Transposed by Tomasz £uczak <tlu@technodat.com.pl>
-# Heavily modifed and enhanced by serveral developers.
+# Heavily modifed and enhanced by several developers.
 
-# Input general definitions
 Input stdclass.inc
+Input numarticle.inc
 
-
-# There are no chapters in an article.
 NoStyle Chapter
 NoStyle Chapter*
 
-
-MaxCounter              Counter_Section
 SecNumDepth             3
 TocDepth                3
 
 
-# Page styles
 ClassOptions
 	PageStyle     empty|plain|outer|headings|myheadings|uheadings|myuheadings
 End
 
 
-# Change Part and Part* a bit
-
 Style Part
 	Align                 Left
 	AlignPossible         Left
 	TopSep                2
 	BottomSep             1.5
-
 	Font
 	  Size                Larger
 	EndFont
 End
 
+
 Style Part*
 	Align                 Left
 	AlignPossible         Left
 	TopSep                2
 	BottomSep             1.5
-
 	Font
 	  Size                Larger
 	EndFont

lib/layouts/mwbk.layout

@@ -5,28 +5,21 @@
 # Transposed by Tomasz £uczak <tlu@technodat.com.pl>
 # Heavily modifed and enhanced by serveral developers.
 
-# Input general definitions
 Input stdclass.inc
 
-# Global parameters.
+Sides                   2
-Sides           2
 
-
-# Page styles
 ClassOptions
 	PageStyle     empty|plain|outer|headings|myheadings|uheadings|myuheadings
 End
 
 
-# There is no abstract environment in book.cls
 NoStyle Abstract
 	      
 
-# a few changes to the bibliography
 Style Bibliography
 	TopSep                4
 	LabelString           Bibliography
-	# label font definition
 	LabelFont 
 	  Series              Bold
 	  Size                Huge

lib/layouts/mwrep.layout

@@ -5,22 +5,19 @@
 # Transposed by Tomasz £uczak <tlu@technodat.com.pl>
 # Heavily modifed and enhanced by serveral developers.
 
-# Input general definitions
 Input stdclass.inc
 
-# a few changes to the bibliography
+
 Style Bibliography
 	TopSep                4
 	LabelString           Bibliography
-
-	# label font definition
 	LabelFont 
 	  Series              Bold
 	  Size                Huge
 	EndFont
 End
 
-# Page styles
+
 ClassOptions
 	PageStyle     empty|plain|outer|headings|myheadings|uheadings|myuheadings
 End

lib/layouts/obsolete.inc

@@ -6,17 +6,15 @@
 # This include files contains all obsolete layouts, kept for
 # historical reasons 
 
-
+# Title style definition
 Style LaTeX_Title
 	ObsoletedBy           Title
 End
 
-
 Style LaTeX
 	ObsoletedBy   Standard
 End
 
-
 Style Comment
 	ObsoletedBy   Standard
 End