Fix bug #10273

[lyx.git] / lib / layouts / theorems-ams.inc

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index 151a8f449cf6618082e33e6370d7e3fafd741fcc..b419211487d3ef3792556052614228b5cabe852f 100644 (file)
--- 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
@@ -14,20 +14,30 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Proof
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 33
+Format 60
+
+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,48 +297,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