X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems.inc;h=a185bb796916d093892b622ce86aa6d5ffd8ac39;hb=9c97021623b6db5239715eb543d65a5e779084b6;hp=56b029d894a10cc5b0834a85fe3dbe79cc6ac54b;hpb=2a62a2c3957b89489580f59150c20e45a66e4b43;p=lyx.git

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 56b029d894..a185bb7969 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -15,21 +15,28 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Case (by inclusion)
 
-Format 43
+Format 80
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
-	Category              Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
+	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
@@ -67,7 +74,7 @@ End
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
@@ -85,7 +92,7 @@ End
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
@@ -103,7 +110,7 @@ End
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
@@ -121,7 +128,7 @@ End
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
@@ -139,7 +146,7 @@ End
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
@@ -157,7 +164,7 @@ End
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -231,9 +238,26 @@ Style Exercise
 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
+End
+
+
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font