X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Famsdefs.inc;h=f93b2fed55f140c51150e406866ff0e4480aa75a;hb=9c8955ffd9df1a38a617bcbdf011c7b890ea23d1;hp=3b93697157ccba30fb94955e9dc711e96359e8f1;hpb=3e885523c305c260a52c4b6e65047bc6f5f3a867;p=lyx.git

diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
index 3b93697157..f93b2fed55 100644
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@@ -1,19 +1,13 @@
 # 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>
+# Modularized Jan '08 by Richard Heck <rgheck@brown.edu>
 
 # Including the maths stuff
-Format 2
-Input amsmaths.inc
-
-# The AMS documentclasses use the package amsmath and provide the
-# functionality of makeidx.sty.
-ProvidesAmsmath         1
-ProvidesMakeidx         1
-
+Format 45
 
 # the environments copied from the old amsart.layout are:
-# - Proof
 # - Bibliography
 # - Title
 # - Author
@@ -25,39 +19,10 @@ ProvidesMakeidx         1
 # - Subjectclass
 
 
-Style Proof
-	Margin                First_Dynamic
-	LatexType             Environment
-	LatexName             proof
-	NextNoIndent          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
-	LabelType             Static
-	LabelString           "Proof."
-	EndLabelType          Box
-	Font
-	  Shape               Up
-	  Size                Normal
-	EndFont
-	LabelFont
-	  Shape               Italic
-	EndFont
-	# We don't want the preamble from Theorem
-	Preamble
-	EndPreamble
-End
-
-
 ### Now the title stuff. We copy do not use stdstruct.inc to keep
 ### things in the right order
 Style Title
+	Category              FrontMatter
 	Margin                Static
 	LatexType             Command
 	InTitle               1
@@ -68,17 +33,22 @@ Style Title
 	BottomSep             1
 	ParSep                1
 	Align                 Center
-	AlignPossible         Center
 	LabelType             No_Label
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "Short title which appears in the running headers"
+	EndArgument
 	Font
 	  Shape               Smallcaps
 	  Series              Bold
 	  Size                Larger
 	EndFont
+	HTMLTitle             true
 End
 
 
 Style Author
+	Category              FrontMatter
 	Margin                Static
 	LatexType             Command
 	InTitle               1
@@ -89,7 +59,6 @@ Style Author
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Center
-	AlignPossible         Center
 	LabelType             No_Label
 	Font
 	  Size                Large
@@ -99,6 +68,7 @@ End
 
 
 Style Date
+	Category              FrontMatter
 	Margin                Dynamic
 	LatexType             Command
 	InTitle               1
@@ -109,7 +79,6 @@ Style Date
 	BottomSep             0.5
 	ParSep                1
 	Align                 Center
-	AlignPossible         Center
 	LabelType             Static
 	LabelString           "Date:"
 	Font
@@ -123,6 +92,7 @@ End
 
 
 Style Abstract
+	Category              FrontMatter
 	Margin                First_Dynamic
 	LatexType             Environment
 	InTitle               1
@@ -134,7 +104,6 @@ Style Abstract
 	TopSep                0.7
 	BottomSep             0.7
 	Align                 Block
-	AlignPossible         Block
 	LabelType             Static
 	LabelString           "Abstract."
 	LabelSep              M
@@ -146,8 +115,11 @@ Style Abstract
 	EndFont
 End
 
+# Clear Address definition from lyxmacros
+NoStyle Address
 
 Style Address
+	Category              FrontMatter
 	Margin                Dynamic
 	LatexType             Command
 	InTitle               1
@@ -219,12 +191,13 @@ End
 
 Style Subjectclass
 	CopyStyle             Address
-	LatexName             subjclass
-	LabelString           "1991 Mathematics Subject Classification:"
+	LatexName             subjclass[2000]
+	LabelString           "2000 Mathematics Subject Classification:"
 End
 
 
 Style Bibliography
+	Category              BackMatter
 	Margin                First_Dynamic
 	LatexType             Bib_Environment
 	LatexName             thebibliography