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

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 122b357358..a185bb7969 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -4,7 +4,7 @@
 # Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
 # Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 
-# The environnements defined are :
+# The environments defined are :
 # - Theorem
 # - Corollary
 # - Lemma
@@ -15,19 +15,29 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 35
+Format 80
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
-	Category              Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
-	OptionalArgs          1
+	ResetArgs             1
+	AddToToc              thm
+	IsTocCaption          1
+	Argument 1
+		LabelString    "Additional Theorem Text"
+		Tooltip        "Additional text appended to the theorem header"
+		IsTocCaption      1
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -37,7 +47,7 @@ Style Theorem
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -64,7 +74,7 @@ End
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
@@ -82,7 +92,7 @@ End
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
@@ -100,7 +110,7 @@ End
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
@@ -118,7 +128,7 @@ End
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
@@ -136,7 +146,7 @@ End
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
@@ -154,7 +164,7 @@ End
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	      Theorem
+	DependsOn             Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -228,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
@@ -270,39 +297,5 @@ Style Claim
 	EndBabelPreamble
 End
 
-
-# Define Case as an enumeration environment
-Style Case
-	Category              Theorem
-	CopyStyle             Enumerate
-	LatexName             caseenv
-	LabelType             Static
-	LeftMargin            "Case ###."
-	LabelString           "Case #."
-	LabelFont
-	  Series              Medium
-	  Shape               Italic
-	EndFont
-	Preamble
-		\newcounter{casectr}
-		\newenvironment{caseenv}
-		{\begin{list}{{\itshape\ \protect\casename} \arabic{casectr}.}{%
-		\setlength{\leftmargin}{\labelwidth}
-		\addtolength{\leftmargin}{\parskip}
-		\setlength{\itemindent}{\listparindent}
-		\setlength{\itemsep}{\medskipamount}
-		\setlength{\topsep}{\itemsep}}
-		\setcounter{casectr}{0}
-		\usecounter{casectr}}
-		{\end{list}}
-	EndPreamble
-	LangPreamble
-		\providecommand{\casename}{_(Case)}
-	EndLangPreamble
-	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
-	EndBabelPreamble
-	RefPrefix OFF
-End
-
+Input theorems-case.inc
 Input theorems-refprefix.inc