X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Famsdefs.inc;h=6afe03ee99b9477c5f55f78d9b045bd2967cca53;hb=0d30333ec6cc3947c37f19a49c5b5fa8f3812876;hp=5e72bd521e9acf962f760be8f06d9efd608dc945;hpb=4894a7be98b567d545691f90f384b5e39fe03785;p=lyx.git

diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
index 5e72bd521e..6afe03ee99 100644
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@@ -1,18 +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
-Input amsmaths.inc
-
-# The AMS documentclasses use the package amsmath and provide the
-# functionality of makeidx.sty.
-ProvidesAmsmath         1
-ProvidesMakeidx         1
-
+Format 59
 
 # the environments copied from the old amsart.layout are:
-# - Proof
 # - Bibliography
 # - Title
 # - Author
@@ -24,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
@@ -67,17 +33,23 @@ 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"
+		InsertCotext  1
+	EndArgument
 	Font
 	  Shape               Smallcaps
 	  Series              Bold
 	  Size                Larger
 	EndFont
+	HTMLTitle             true
 End
 
 
 Style Author
+	Category              FrontMatter
 	Margin                Static
 	LatexType             Command
 	InTitle               1
@@ -88,7 +60,6 @@ Style Author
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Center
-	AlignPossible         Center
 	LabelType             No_Label
 	Font
 	  Size                Large
@@ -98,6 +69,7 @@ End
 
 
 Style Date
+	Category              FrontMatter
 	Margin                Dynamic
 	LatexType             Command
 	InTitle               1
@@ -108,9 +80,8 @@ Style Date
 	BottomSep             0.5
 	ParSep                1
 	Align                 Center
-	AlignPossible         Center
 	LabelType             Static
-	LabelString           "Date: "
+	LabelString           "Date:"
 	Font
 	  Size                Large
 	EndFont
@@ -122,6 +93,7 @@ End
 
 
 Style Abstract
+	Category              FrontMatter
 	Margin                First_Dynamic
 	LatexType             Environment
 	InTitle               1
@@ -133,7 +105,6 @@ Style Abstract
 	TopSep                0.7
 	BottomSep             0.7
 	Align                 Block
-	AlignPossible         Block
 	LabelType             Static
 	LabelString           "Abstract."
 	LabelSep              M
@@ -145,8 +116,11 @@ Style Abstract
 	EndFont
 End
 
+# Clear Address definition from lyxmacros
+NoStyle Address
 
 Style Address
+	Category              FrontMatter
 	Margin                Dynamic
 	LatexType             Command
 	InTitle               1
@@ -157,7 +131,8 @@ Style Address
 	Align                 Left
 	AlignPossible         Block, Left, Right, Center
 	LabelType             Static
-	LabelString           "Address: "
+	LabelString           "Address:"
+	LabelSep              M
 	LabelFont
 	  Shape               Italic
 	EndFont
@@ -167,7 +142,7 @@ End
 Style Current_Address
 	CopyStyle             Address
 	LatexName             curraddr
-	LabelString           "Current address: "
+	LabelString           "Current address:"
 End
 
 
@@ -175,7 +150,7 @@ Style Email
 	CopyStyle             Address
 	Margin                First_Dynamic
 	LatexName             email
-	LabelString           "E-mail address: "
+	LabelString           "E-mail address:"
 End
 
 
@@ -183,50 +158,52 @@ Style URL
 	CopyStyle             Address
 	Margin                First_Dynamic
 	LatexName             urladdr
-	LabelString           "URL: "
+	LabelString           "URL:"
 End
 
 
 Style Keywords
 	CopyStyle             Address
 	LatexName             keywords
-	LabelString           "Key words and phrases: "
+	LabelString           "Key words and phrases:"
 End
 
 
 Style Thanks
 	CopyStyle             Address
 	LatexName             thanks
-	LabelString           "Thanks: "
+	LabelString           "Thanks:"
 End
 
 
 Style Dedicatory
 	CopyStyle             Address
 	LatexName             dedicatory
-	LabelString           "Dedication: "
+	LabelString           "Dedication:"
 End
 
 
 Style Translator
 	CopyStyle             Address
 	LatexName             translator
-	LabelString           "Translator: "
+	LabelString           "Translator:"
 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
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MM
 	ParSkip               0.4
 	ItemSep               0