X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=9fdbbbc6b1499f130c3ea068ed27cca8c6558232;hb=8f9520eda5a0ecf2458341e5d8ea40f5970d54db;hp=2b10b79a7d1b351f49ce80c1366d0cff70a06afc;hpb=3b716ae11e5f55cf0544521ebd345a341707744e;p=lyx.git

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index 2b10b79a7d..9fdbbbc6b1 100644
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.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
@@ -17,17 +17,20 @@
 # - Remark
 # - Claim
 # - Proof
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 28
+Format 45
 
 Style Theorem
-	Category              Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Alternative Theorem String"
+		Tooltip       "Alternative theorem string"
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -37,7 +40,7 @@ Style Theorem
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -270,48 +273,5 @@ Style Claim
 	EndBabelPreamble
 End
 
-
-# Define Case as an enumeration environment
-Style Case
-	Category              Theorem
-	Margin                Static
-	LatexType             Item_Environment
-	LatexName             caseenv
-	LabelType             Static
-	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
 Input theorems-refprefix.inc