X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=691559b2a2d257dab716eaaf3c647bf15f29f827;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=cfcd0fc0a85ff964b7df0776c3393e38d9f4cb23;hpb=2a62a2c3957b89489580f59150c20e45a66e4b43;p=lyx.git

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index cfcd0fc0a8..691559b2a2 100644
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.inc
@@ -2,7 +2,7 @@
 # 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@comcast.net>
+# Modularized Jan 08 by Richard Kimberly Heck <rikiheck@lyx.org>
 
 # The environments defined are :
 # - Theorem
@@ -14,22 +14,29 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Proof
 # - Case (by inclusion)
 
-Format 43
+Format 99
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
-	Category              Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
-	NextNoIndent          1
+	NextNoIndent          0
+	ResetArgs             1
+	AddToToc              thm
+	IsTocCaption          1
 	Argument 1
-		LabelString   "Alternative Theorem String"
-		Tooltip       "Alternative theorem string"
+		LabelString    "Additional Theorem Text"
+		Tooltip        "Additional text appended to the theorem header"
+		IsTocCaption      1
 	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
@@ -40,7 +47,7 @@ Style Theorem
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -62,12 +69,17 @@ Style Theorem
 	  \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
 	EndBabelPreamble
 	Requires              amsthm
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='theorem'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
@@ -80,12 +92,17 @@ Style Corollary
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='corollary'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
@@ -98,12 +115,17 @@ Style Lemma
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='lemma'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
@@ -116,12 +138,17 @@ Style Proposition
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='proposition'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
@@ -134,12 +161,17 @@ Style Conjecture
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='conjecture'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
@@ -152,12 +184,17 @@ Style Fact
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='fact'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -177,6 +214,11 @@ Style Definition
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='definition'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -194,6 +236,9 @@ Style Example
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
 	EndBabelPreamble
+	DocBookWrapperTag     informalexample
+	DocBookTag            para
+	DocBookAttr           ""
 End
 
 
@@ -211,6 +256,11 @@ Style Problem
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='problem'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -228,12 +278,39 @@ Style Exercise
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='exercise'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
+End
+
+
+Style Solution
+	CopyStyle             Definition
+	LatexName             sol
+	LabelString           "Solution \thetheorem."
+	Preamble
+	  \theoremstyle{definition}
+	  \newtheorem{sol}[thm]{\protect\solutionname}
+	EndPreamble
+	LangPreamble
+		\providecommand{\solutionname}{_(Solution)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='solution'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font
@@ -254,6 +331,11 @@ Style Remark
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='remark'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 
@@ -271,6 +353,11 @@ Style Claim
 	BabelPreamble
 	  \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
 	EndBabelPreamble
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='claim'
+	DocBookTag            para
+	DocBookGenerateTitle  true
+	DocBookWrapperMergeWithPrevious  true
 End
 
 Input theorems-case.inc