* layouts/siamltex.layout:

- complete rewrite by Adrew Corrington.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@26897 a592a061-630c-0410-9148-cb99ea01b6c8

lib/layouts/siamltex.layout

@@ -1,167 +1,294 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{article (SIAM)}
-# Siam Article textclass definition file.
+# AMS-Article textclass definition file. Taken from initial LyX source code
-# Cut & paste from various LyX layouts plus some minor modifications
+# and from the Article textclass definition file, following the AMS sample
-# Author : Kornelia Pietsch <pietsch@mathematik.tu-chemnitz.de>
+# paper "testmath.tex" of January, 1995
+# Author : David L. Johnson <dlj0@lehigh.edu>
+# Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
+# Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
+# Modified from  amsart.layout May '08 by Andrew Corrigan <acorriga@gmu.edu>
+
 
 Format 4
 Columns                 1
-Sides                   1
+Sides                   2
-SecNumDepth             2
+PageStyle               Headers
-TocDepth                2
+Provides makeidx        1
+
 
 ClassOptions
-	FontSize              10|11|12
+	FontSize   8|9|10|11|12
-	Other                 "draft|final"
 End
 
 
 Style Standard
-	Margin                Dynamic
+	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
-	ParSkip               0
+	ParIndent             MM
-	ParIndent             ........
+	ParSkip               0.4
-	NextNoIndent          0
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.7
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
 End
 
 
-Input stdlists.inc
+Preamble
-Input stdlayouts.inc
+\newcommand\eqref[1]{(\ref{#1})}
-Input stdcounters.inc
+EndPreamble
-Input stdfloats.inc
-Input numarticle.inc
 
-Style Section
+
-	CopyStyle             Standard
+Input stdsections.inc
+Input stdstarsections.inc
+Input lyxmacros.inc
+Input stdlayouts.inc
+Input stdlists.inc
+Input stdfloats.inc
+Input stdcounters.inc
+
+Input amsmaths.inc
+
+#
+# some redefinitions of the AMS Theorems
+#
+Style Theorem
+	LatexName             theorem
+	Preamble
+	EndPreamble
+End
+
+Style Theorem*
+	Obsoletedby           Theorem
+End
+
+Style Corollary
+	LatexName             corollary
+	Preamble
+	EndPreamble
+End
+
+Style Corollary*
+	Obsoletedby           Corollary
+End
+
+Style Lemma
+	LatexName             lemma
+	Preamble
+	EndPreamble
+End
+
+Style Lemma*
+	Obsoletedby           Lemma
+End
+
+Style Proposition
+	LatexName             proposition
+	Preamble
+	EndPreamble
+End
+
+Style Proposition*
+	Obsoletedby           Proposition
+End
+
+Style Conjecture
+	Preamble
+	EndPreamble
+End
+
+Style Conjecture*
+	Obsoletedby          Conjecture
+End
+
+Style Algorithm
+	Preamble
+	EndPreamble
+End
+
+Style Algorithm*
+	Obsoletedby          Algorithm
+End
+
+Style Definition
+	LatexName            definition
+	Preamble
+	EndPreamble
+End
+
+Style Definition*
+	Obsoletedby          Definition
+End
+
+Style AMS
+	Obsoletedby          Subjectclass
+End
+
+
+NoStyle Criterion
+NoStyle Criterion*
+NoStyle Fact
+NoStyle Fact*
+NoStyle Axiom
+NoStyle Axiom*
+NoStyle Example
+NoStyle Example*
+NoStyle Condition
+NoStyle Condition*
+NoStyle Problem
+NoStyle Problem*
+NoStyle Exercise
+NoStyle Exercise*
+NoStyle Remark
+NoStyle Remark*
+NoStyle Claim
+NoStyle Claim*
+NoStyle Note
+NoStyle Note*
+NoStyle Notation
+NoStyle Notation*
+NoStyle Summary
+NoStyle Summary*
+
+
+Style Proof
 	Margin                First_Dynamic
-	LatexType             Command
+	LatexType             Environment
-	LatexName             section
+	LatexName             proof
-	NeedProtect           1
 	NextNoIndent          1
-	LabelSep              xxx
+	OptionalArgs          1
+	LabelSep              xx
+	ParIndent             MMM
+	ParSkip               0.4
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
 	Align                 Block
 	AlignPossible         Block, Left
-	EndLabelType          Static
+	LabelType             Static
-	EndLabelString        "."
+	LabelString           "Proof."
+	EndLabelType          Box
 	Font
-	  Series              Bold
+	  Shape               Up
+	  Size                Normal
 	EndFont
-End
+	LabelFont
-
-
-Style Subsection
-	CopyStyle             Section
-	LatexName             subsection
-End
-
-
-Style Subsubsection
-	CopyStyle             Subsection
-	LatexName             subsubsection
-End
-
-
-Style Paragraph
-	CopyStyle             Subsubsection
-	LatexName             paragraph
-	Font
 	  Shape               Italic
-	  Series              Medium
 	EndFont
+	# We don't want the preamble from Theorem
+	Preamble
+	EndPreamble
 End
 
 
-Style Section*
+### Now the title stuff. We do not use stdstruct.inc to keep
-	CopyStyle             Section
+### things in the right order
-	LatexName             section*
-	LabelType             No_Label
-End
-
-
-Style Subsection*
-	CopyStyle             Subsection
-	LatexName             subsection*
-	LabelType             No_Label
-End
-
-
-Style Subsubsection*
-	CopyStyle             Subsubsection
-	LatexName             subsubsection*
-	LabelType             No_Label
-End
-
-
-Style Paragraph*
-	CopyStyle             Paragraph
-	LatexName             paragraph*
-	LabelType             No_Label
-End
-
-
 Style Title
 	Margin                Static
 	LatexType             Command
 	InTitle               1
 	LatexName             title
+	ParSkip               0.4
+	ItemSep               0
+	TopSep                0
 	BottomSep             1
+	ParSep                1
 	Align                 Center
-	AlignPossible         Center
 	LabelType             No_Label
+	OptionalArgs          1
 	Font
-	  Size                Larger
+	  Shape               Smallcaps
-	  Shape               SmallCaps
 	  Series              Bold
+	  Size                Larger
 	EndFont
 End
 
 
 Style Author
-	CopyStyle             Title
+	Margin                Static
+	LatexType             Command
+	InTitle               1
 	LatexName             author
+	LabelSep              xxx
+	ParSkip               0.4
+	TopSep                1.3
+	BottomSep             0.7
+	ParSep                0.7
+	Align                 Center
+	LabelType             No_Label
 	Font
-	  Size                Normal
+	  Size                Large
-	  Shape               SmallCaps
+	  Shape               Smallcaps
-	  Series              Medium
 	EndFont
 End
 
 
 Style Date
-	CopyStyle             Author
+	Margin                Dynamic
+	LatexType             Command
+	InTitle               1
 	LatexName             date
+	LabelSep              xxx
+	ParSkip               0.4
+	TopSep                0.9
+	BottomSep             0.5
+	ParSep                1
+	Align                 Center
+	LabelType             Static
+	LabelString           "Date:"
+	Font
+	  Size                Large
+	EndFont
+	LabelFont
+	  Shape               Italic
+	  Size                Large
+	EndFont
 End
 
 
 Style Abstract
 	Margin                First_Dynamic
 	LatexType             Environment
-#  InTitle               1
+	InTitle               0
 	LatexName             abstract
-	ParIndent             ........
+	LeftMargin            MMM
-	NextNoIndent          1
+	LabelIndent           MMM
+	RightMargin           MMM
+	ParIndent             MM
 	TopSep                0.7
 	BottomSep             0.7
-	ParSkip               0.7
 	Align                 Block
-	AlignPossible         Block
 	LabelType             Static
 	LabelString           "Abstract."
 	LabelSep              M
-	LabelIndent           ........
 	Font
 	  Size                Small
 	EndFont
 	LabelFont
-	  Series              Bold
+	  Shape               Smallcaps
-	  Size                Small
+	EndFont
+End
+
+
+# Clear Address definition from lyxmacros
+NoStyle Address
+
+Style Address
+	Margin                Dynamic
+	LatexType             Command
+	InTitle               1
+	LatexName             address
+	ParSkip               0.4
+	BottomSep             1.5
+	ParSep                1.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             Static
+	LabelString           "Address:"
+	LabelSep              M
+	LabelFont
+	  Shape               Italic
 	EndFont
 End
 
@@ -169,130 +296,74 @@ End
 Style Keywords
 	CopyStyle             Abstract
 	LatexName             keywords
-	LabelString           "Key words."
+	LabelString           "Key words:"
 End
 
 
-Style AMS
+Style Subjectclass
 	CopyStyle             Abstract
 	LatexName             AMS
-	LabelString           "AMS subject classifications."
+	LabelString           "AMS subject classifications:"
 End
 
 
 Style Bibliography
-	Margin                Dynamic
+	Margin                First_Dynamic
 	LatexType             Bib_Environment
 	LatexName             thebibliography
-	NextNoIndent          0
+	NextNoIndent          1
-	LeftMargin            M
+	LeftMargin            MM
-	RightMargin           M
+	ParSkip               0.4
+	ItemSep               0
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.5
 	Align                 Block
-	AlignPossible         Block,  Center
+	AlignPossible         Block, Left
 	LabelType             Bibliography
-	#LabelType             centered_top_environment
 	LabelString           "References"
 	LabelBottomSep        0.7
+	Font
+	  Size                Small
+	EndFont
 	LabelFont
-	  Shape                      SmallCaps
+	  Size                Normal
+	  Shape               Smallcaps
+	EndFont
+End
+
+NoStyle                 Chapter
+NoStyle                 Paragraph
+NoStyle                 Subparagraph
+NoStyle                 Chapter*
+#NoStyle                Paragraph*
+#NoStyle                Subparagraph*
+
+NoStyle Verse    # Although mathematicians tend to be poets at times,
+	         # we don't need this.
+
+
+Style Section
+	Align                 Center
+	Font
+	  Series              Medium
+	  Shape               Smallcaps
+	  Size                Large
 	EndFont
 End
 
 
-Style Theorem
+Style Subsection
-	CopyStyle             Standard
+	Font
-	LabelSep              xx
+	  Series              Bold
-	LabelType             Static
-	LabelString           "Theorem #."
-	TextFont
-	  Shape               Slanted
 	  Size                Normal
 	EndFont
-	LabelFont
-	  Shape               SmallCaps
-	EndFont
 End
 
 
-Style Lemma
+Style Subsubsection
-	CopyStyle             Theorem
-	LatexName             lemma
-	LabelString           "Lemma #."
-End
-
-
-Style Corollary
-	CopyStyle             Theorem
-	LatexName             corollary
-	LabelString           "Corollary #."
-End
-
-
-Style Proposition
-	CopyStyle             Theorem
-	LatexName             proposition
-	LabelString           "Proposition #."
-End
-
-
-Style Definition
-	CopyStyle             Theorem
-	LatexName             Definition
-	LabelString           "Definition #."
 	Font
-	  Shape               Up
+	  Shape               Italic
-	EndFont
+	  Size                Normal
-	LabelFont
-	  Shape               Up
-	  Series              Bold
 	EndFont
 End
-
-
-Style Proof
-	CopyStyle             Theorem
-	LatexName             proof
-	LabelString           "Proof."
-	EndLabelType          Box
-	Font
-	  Shape               Up
-	  Color               Blue
-	EndFont
-	LabelFont
-	  Shape               Slanted
-	EndFont
-End
-
-
-Style Theorem*
-	CopyStyle             Theorem
-	LatexName             theorem*
-	LabelString           "Theorem."
- End
-
-
-Style Lemma*
-	CopyStyle             Lemma
-	LatexName             lemma*
-	LabelString           "Lemma."
-End
-
-
-Style Corollary*
-	CopyStyle             Corollary
-	LatexName             corollary*
-	LabelString           "Corollary."
-End
-
-
-Style Proposition*
-	CopyStyle             Proposition
-	LatexName             proposition*
-	LabelString           "Proposition."
-End
-
-Style Definition*
-	CopyStyle             Definition
-	LatexName             definition*
-	LabelString           "Definition."
-End

status.15x

@@ -27,12 +27,12 @@ What's new
 - Updated localization of the user interface for Catalan, Czech, French,
   German, Hebrew, Italian, and Ukrainian.
 
-- New Catalan translation of the Intro manual and the example file
+- New Catalan translations of the Intro manual and the example file
   ItemizeBullets.lyx.
 
 - New Ukrainian translation of the Intro manual.
 
-- The Minipage.lyx and listings.lyx example files were removed. Their
+- The Minipage.lyx and listings.lyx example files have been removed. Their
   content is covered by the ExtendedObjects manual.
 
 
@@ -40,21 +40,24 @@ What's new
 
 - New layout file for ACM SIGPLAN conference papers.
 
-- New layout file for journal articles of the Inderscience publishing group.
+- New layout file for journal articles of the Inderscience publishing
+  group.
 
-- New layout file and template for journal articles of the Elsevier publishing
+- New layout file and template for journal articles of the Elsevier
-  group. The template file for the now obsolete Elsevier layout has been
+  publishing group. The template file for the obsolete Elsevier layout has
-  removed.
+  been removed.
 
 - New layout file for the svjour3 class (journal articles of the Springer
   publishing group) (bug 5154).
 
+- Completely rewritten layout file for the siamltex (SIAM) class.
+
 - Add support for quote, quotation and verse in the beamer class.
 
 - Support some more Greek characters without Greek language set.
 
-- Example file for modernCV curriculum vitae updated to version 0.7 of the
+- The example file for modernCV curriculum vitae has been updated to
-  moderncv LaTeX-package
+  version 0.7 of the moderncv LaTeX package.
 
 
 * USER INTERFACE
@@ -71,7 +74,7 @@ What's new
 
 * BUILD
 
-- Allow the use of newer versions of scons such as scons 1.0.0.
+- Allow the use of newer versions of SCons such as SCons 1.0.0.
 
 
 ** Bug fixes:
@@ -79,14 +82,14 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-- Fix an assertion when non-ascii characters are used in listings
+- Fix an assertion when non-ASCII characters are used in listings
   parameters (bug 5221).
 
-- Fix instant preview when \usepackage[pdftex]{hyperref} is used in the 
+- Fix instant preview when \usepackage[pdftex]{hyperref} is used in the
   preamble (bug 2165).
 
-- The LaTeX package amscd is now automatically loaded when creating math
+- The LaTeX package amscd is now loaded automatically after math diagrams
-  diagrams (bug 5090).
+  have been created (bug 5090).
 
 - Fix inputenc error with ligature glyphs in utf8 encoding (bug 5086).
 
@@ -98,7 +101,8 @@ What's new
 
 - Do not delete special characters in free spacing mode (bug 5125).
 
-- Fix importing of LaTeX files that don't use the package inputenc (bug 5181).
+- Fix importing of LaTeX files that don't use the package inputenc
+  (bug 5181).
 
 - Fix output of citation commands in the ReVTeX4 class (bug 5182).
 
@@ -106,22 +110,22 @@ What's new
 
 - Fix some problems with CSV importation.
 
-- Fix LaTeX output if no graphic driver was selected (part of bug 5294).
+- Fix LaTeX output if no graphic driver has been selected (part of bug
+  5294).
 
 - Fix lyxclient to read the whole command line as one command.
 
-- Layout file and template for journal articles of the IOP publishing group
+- Fix some problems in the layout file and template for journal articles
-  fixed.
+  of the IOP publishing group.
 
-- Layout file and template for German letters (DIN Brief) fixed.
+- Fix some problems in the layout file and template of the DIN-Brief class.
  
-- Fix that chess games like the chessgame.lyx example file were not compilable
+- Fix LaTeX errors triggered by the external chess template (bug 5320).
-  (bug 5320).
 
-- Latvian and Lithuanian documents are now compilable (bug 5323, bug 5324).
+- Fix LaTeX errors in Latvian and Lithuanian documents (bug 5323, bug 5324).
 
-- Fix that the amsmath LaTeX-package was used although it was turned off in
+- If "Do not use amsmath" is selected in the document settings, really do 
-  the document settings math options (bug 5350).
+  not use it (bug 5350).
 
 
 * USER INTERFACE
@@ -148,8 +152,8 @@ What's new
 
 - Remove confusing warning about 'server socket' under MS Windows.
 
-- Fix problem that the lyxpipe was incorrectly reset after dispatching
+- Do not incorrectly reset the lyxpipe after dispatching certain
-  certain functions (bug 1784).
+  functions (bug 1784).
 
 
 * DOCUMENTATION AND LOCALIZATION
@@ -162,3 +166,4 @@ What's new
 - Very light Makefile cleanup. Now works with automake 10.1.
 
 - Fix the building on Mac OS X 10.5 of a binary compatible with OS X 10.4.
+