dinbrief: fix typos, correct obsolete environments, add missing environments, patch...

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

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 32bb74cbf2ae42789e0752543c959882b4fa30b7..c5441a52a0f115304fefdb7d639451c8b83adc2d 100644 (file)
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -1,5 +1,8 @@
-# Author: Richard Heck <rgheck@comcast.net>
-# Adapted from amsmaths.inc
+# Original Author : David L. Johnson <dlj0@lehigh.edu>
+# Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
+# Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
+# Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 
 # The environnements defined are :
 # - Theorem
@@ -9,19 +12,22 @@
 # - Conjecture
 # - Definition
 # - Example
+# - Problem
 # - Exercise
 # - Remark
-# - Note
 # - Claim
-# - Case
-# - Conclusion
-# - Fact
+# - Proof
+# - Case (regular only -- defined as an enumeration)
+
+Format 10
 
 Style Theorem
+       Category              Theorem
        Margin                First_Dynamic
        LatexType             Environment
        LatexName             thm
        NextNoIndent          1
+       OptionalArgs          1
        LabelSep              xx
        ParIndent             MMM
        ParSkip               0.4
@@ -30,10 +36,10 @@ Style Theorem
        BottomSep             0.7
        ParSep                0.3
        Align                 Block
-       AlignPossible         Block, Left
+       AlignPossible         Left
        LabelType             Counter
        LabelCounter          theorem
-       LabelString           "Theorem \arabic{theorem}."
+       LabelString           "Theorem \thetheorem."
        Font
          Shape               Italic
          Size                Normal
@@ -45,10 +51,13 @@ Style Theorem
        Preamble
                \newtheorem{thm}{Theorem}
        EndPreamble
+       Requires              amsthm
 End
 
+
 Style Corollary
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             cor
        LabelString           "Corollary \thetheorem."
        Preamble
@@ -56,8 +65,10 @@ Style Corollary
        EndPreamble
 End
 
+
 Style Lemma
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             lem
        LabelString           "Lemma \thetheorem."
        Preamble
@@ -65,8 +76,10 @@ Style Lemma
        EndPreamble
 End
 
+
 Style Proposition
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             prop
        LabelString           "Proposition \thetheorem."
        Preamble
@@ -74,8 +87,10 @@ Style Proposition
        EndPreamble
 End
 
+
 Style Conjecture
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             conjecture
        LabelString           "Conjecture \thetheorem."
        Preamble
@@ -83,8 +98,10 @@ Style Conjecture
        EndPreamble
 End
 
+
 Style Fact
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             fact
        LabelString           "Fact \thetheorem."
        Preamble
@@ -92,8 +109,10 @@ Style Fact
        EndPreamble
 End
 
+
 Style Definition
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             defn
        LabelString           "Definition \thetheorem."
        Font
@@ -104,6 +123,7 @@ Style Definition
          Series              Bold
        EndFont
        Preamble
+         \theoremstyle{definition}
          \newtheorem{defn}[thm]{Definition}
        EndPreamble
 End
@@ -114,8 +134,22 @@ Style Example
        LatexName             example
        LabelString           "Example \thetheorem."
        Preamble
+         \theoremstyle{definition}
          \newtheorem{example}[thm]{Example}
        EndPreamble
+       Requires              amsthm
+End
+
+
+Style Problem
+       CopyStyle             Definition
+       LatexName             problem
+       LabelString           "Problem \thetheorem."
+       Preamble
+         \theoremstyle{definition}
+         \newtheorem{problem}[thm]{Problem}
+       EndPreamble
+       Requires              amsthm
 End
 
 
@@ -124,13 +158,16 @@ Style Exercise
        LatexName             xca
        LabelString           "Exercise \thetheorem."
        Preamble
-         \newtheorem{xca}{Exercise}
+         \theoremstyle{definition}
+         \newtheorem{xca}[thm]{Exercise}
        EndPreamble
+       Requires              amsthm
 End
 
 
 Style Remark
        CopyStyle             Theorem
+       DependsOn             Theorem
        LatexName             rem
        LabelString           "Remark \thetheorem."
        Font
@@ -142,6 +179,7 @@ Style Remark
          Shape               Italic
        EndFont
        Preamble
+         \theoremstyle{remark}
          \newtheorem{rem}[thm]{Remark}
        EndPreamble
 End
@@ -152,25 +190,36 @@ Style Claim
        LatexName             claim
        LabelString           "Claim \thetheorem."
        Preamble
+         \theoremstyle{remark}
          \newtheorem{claim}[thm]{Claim}
        EndPreamble
-End
-
-Style Case
-       CopyStyle             Remark
-       LatexName             case
-       LabelString           "Case \thetheorem."
-       Preamble
-         \newtheorem{case}[thm]{Case}
-       EndPreamble
+       Requires              amsthm
 End
 
 
-Style Conclusion
-       CopyStyle             Remark
-       LatexName             conclusion
-       LabelString           "Conclusion \thetheorem."
+# 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
-         \newtheorem{conclusion}[thm]{Conclusion}
+         \newcounter{casectr}
+         \newenvironment{caseenv}
+         {\begin{list}{{\itshape\ Case} \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
 End