X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams-bytype.inc;h=d390cf819e9d1c3c9df884aebbc1d843adf33ddb;hb=bf88ad495cead6e97a05fee59e41414648145fc1;hp=e6af1d29f2803acc1510db299fde9b38486c8439;hpb=8ba08a53b2ac7039126a0b90fce5d19374c781ea;p=lyx.git

diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc
index e6af1d29f2..d390cf819e 100644
--- a/lib/layouts/theorems-ams-bytype.inc
+++ b/lib/layouts/theorems-ams-bytype.inc
@@ -5,7 +5,7 @@
 # Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 # Hacked June '09 by Paul Rubin <rubin@msu.edu> to use separate counters
 
-# The environnements defined are :
+# The environments defined are :
 # - Theorem
 # - Corollary
 # - Lemma
@@ -16,12 +16,13 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
 # We need separate counters for each theorem-like style.
-Format 36
+Format 74
 Counter theorem
 End
 Counter corollary
@@ -42,18 +43,29 @@ Counter problem
 End
 Counter exercise
 End
+Counter solution
+End
 Counter remark
 End
 Counter claim
 End
 
+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
@@ -63,7 +75,7 @@ Style Theorem
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -260,6 +272,25 @@ Style Exercise
 End
 
 
+Style Solution
+	CopyStyle             Definition
+	LatexName             sol
+	LabelString           "Solution \thesolution."
+	Preamble
+	  \theoremstyle{definition}
+	  \newtheorem{sol}{\protect\solutionname}
+	EndPreamble
+	Requires              amsthm
+	LangPreamble
+		\providecommand{\solutionname}{_(Solution)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+	EndBabelPreamble
+	LabelCounter          solution
+End
+
+
 Style Remark
 	CopyStyle             Theorem
 	LatexName             rem
@@ -304,46 +335,4 @@ Style Claim
 	LabelCounter          claim
 End
 
-
-# Define Case as an enumeration environment
-Style Case
-	Category              Theorem
-	Margin                Static
-	LatexType             Item_Environment
-	LatexName             caseenv
-	LabelType             Itemize
-	NextNoIndent          1
-	LeftMargin            "Case ###."
-	ParSkip               0.0
-	ItemSep               0.2
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.3
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelSep              xx
-	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
-End
+Input theorems-case.inc