Fixes to the theorem modules.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22502 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
new file mode 100644 (file)
index 0000000..a85561b
--- /dev/null
+++ b/lib/layouts/theorems-ams.inc
@@ -0,0 +1,213 @@
+# 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
+# - Corollary
+# - Lemma
+# - Proposition
+# - Conjecture
+# - Definition
+# - Example
+# - Problem
+# - Exercise
+# - Remark
+# - Claim
+# - Proof
+# - Case (regular only -- defined as an enumeration)
+
+Format 6
+
+Style Theorem
+       Margin                First_Dynamic
+       LatexType             Environment
+       LatexName             thm
+       NextNoIndent          1
+       OptionalArgs          1
+       LabelSep              xx
+       ParIndent             MMM
+       ParSkip               0.4
+       ItemSep               0.2
+       TopSep                0.7
+       BottomSep             0.7
+       ParSep                0.3
+       Align                 Block
+       AlignPossible         Left
+       LabelType             Counter
+       LabelCounter          theorem
+       LabelString           "Theorem \thetheorem."
+       Font
+         Shape               Italic
+         Size                Normal
+       EndFont
+       LabelFont
+         Shape               Up
+         Series              Bold
+       EndFont
+       Preamble
+               \theoremstyle{plain}
+               \newtheorem{thm}{Theorem}
+       EndPreamble
+End
+
+
+Style Corollary
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             cor
+       LabelString           "Corollary \thetheorem."
+       Preamble
+         \theoremstyle{plain}
+         \newtheorem{cor}[thm]{Corollary}
+       EndPreamble
+End
+
+
+Style Lemma
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             lem
+       LabelString           "Lemma \thetheorem."
+       Preamble
+         \theoremstyle{plain}
+         \newtheorem{lem}[thm]{Lemma}
+       EndPreamble
+End
+
+
+Style Proposition
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             prop
+       LabelString           "Proposition \thetheorem."
+       Preamble
+         \theoremstyle{plain}
+         \newtheorem{prop}[thm]{Proposition}
+       EndPreamble
+End
+
+
+Style Conjecture
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             conjecture
+       LabelString           "Conjecture \thetheorem."
+       Preamble
+         \theoremstyle{plain}
+         \newtheorem{conjecture}[thm]{Conjecture}
+       EndPreamble
+End
+
+
+Style Fact
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             fact
+       LabelString           "Fact \thetheorem."
+       Preamble
+         \theoremstyle{plain}
+         \newtheorem{fact}[thm]{Fact}
+       EndPreamble
+End
+
+
+Style Definition
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             defn
+       LabelString           "Definition \thetheorem."
+       Font
+         Shape               Up
+       EndFont
+       LabelFont
+         Shape               Up
+         Series              Bold
+       EndFont
+       Preamble
+         \theoremstyle{definition}
+         \newtheorem{defn}[thm]{Definition}
+       EndPreamble
+End
+
+
+Style Example
+       CopyStyle             Definition
+       LatexName             example
+       LabelString           "Example \thetheorem."
+       Preamble
+        \theoremstyle{definition}
+         \newtheorem{example}[thm]{Example}
+       EndPreamble
+End
+
+
+Style Problem
+       CopyStyle             Definition
+       LatexName             problem
+       LabelString           "Problem \thetheorem."
+       Preamble
+         \theoremstyle{definition}
+         \newtheorem{problem}[thm]{Problem}
+       EndPreamble
+End
+
+
+Style Exercise
+       CopyStyle             Definition
+       LatexName             xca
+       LabelString           "Exercise \thetheorem."
+       Preamble
+         \theoremstyle{definition}
+         \newtheorem{xca}[thm]{Exercise}
+       EndPreamble
+End
+
+
+Style Remark
+       CopyStyle             Theorem
+       DependsOn             Theorem
+       LatexName             rem
+       LabelString           "Remark \thetheorem."
+       Font
+         Shape               Up
+         Size                Normal
+       EndFont
+       LabelFont
+         Series              Medium
+         Shape               Italic
+       EndFont
+       Preamble
+         \theoremstyle{remark}
+         \newtheorem{rem}[thm]{Remark}
+       EndPreamble
+End
+
+
+Style Claim
+       CopyStyle             Remark
+       LatexName             claim
+       LabelString           "Claim \thetheorem."
+       Preamble
+         \theoremstyle{remark}
+         \newtheorem{claim}[thm]{Claim}
+       EndPreamble
+End
+
+
+# Define Case as an enumeration environment
+Style Case
+       CopyStyle             Enumerate
+       LatexName             caseenv
+       LabelType             Static
+       LeftMargin            "MMMMMMN"
+       LabelString           "Case #:"
+       Preamble
+         \newcounter{casectr}
+         \newenvironment{caseenv}
+{\begin{list}{\bfseries\upshape Case \arabic{casectr}:}{}\setcounter{casectr}{0}\usecounter{casectr}}
+{\end{list}}
+       EndPreamble
+End

diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module
index 5947da46a7b37e9e13fc015540b3c8d5f2cd7203..8781d7eb73c721bf19a8a2c79c7f9630c4348848 100644 (file)
--- a/lib/layouts/theorems-ams.module
+++ b/lib/layouts/theorems-ams.module
@@ -26,6 +26,6 @@ Preamble
 EndPreamble
 
 Input theorems-order.inc
-Input theorems.inc
+Input theorems-ams.inc
 Input theorems-starred.inc
 Input theorems-proof.inc

diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module
index 5a747ea6f61e2ac568a0bff827e14b209f556a73..a3d2ecd9dceebb41e4dd0fa48d3f05a09ebf9309 100644 (file)
--- a/lib/layouts/theorems-chap.module
+++ b/lib/layouts/theorems-chap.module
@@ -1,6 +1,7 @@
 #\DeclareLyXModule{Theorems (Order By Chapter)}
 #DescriptionBegin
-#Numbers theorems and the like by chapter.
+#Numbers theorems and the like by chapter. Use this module only with
+#layouts that provide a chapter environment.
 #DescriptionEnd
 #Requires: theorems-std | theorems-ams
 
@@ -15,6 +16,11 @@ End
 
 Style Theorem
        Preamble
-               \newtheorem{thm}{Theorem}[chapter]
+               \ifx\thechapter\undefined
+                       \newtheorem{thm}{Theorem}
+               \else
+                       \newtheorem{thm}{Theorem}[chapter]
+               \fi
+               
        EndPreamble
 End

diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module
index 0d111920cac11acf78467f4e7ea0f74d16de2b48..87ba21cf4e28b07eba1b3e677455f9877df61ae5 100644 (file)
--- a/lib/layouts/theorems-std.module
+++ b/lib/layouts/theorems-std.module
@@ -16,3 +16,21 @@ End
 
 Input theorems.inc
 Input theorems-proof.inc
+
+#This is just a hacked version of the AMS proof environment
+Style Proof
+  Preamble
+    \newenvironment{proof}[1][\proofname]{\par
+      \normalfont\topsep6\p@\@plus6\p@\relax
+      \trivlist
+      \itemindent\parindent
+      \item[\hskip\labelsep
+            \scshape
+        #1]\ignorespaces
+    }{%
+      \endtrivlist\@endpefalse
+    }
+\providecommand{\proofname}{Proof}
+
+  EndPreamble
+End
\ No newline at end of file

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index a85561b850a8e8ffe8c959c4750de044be4c2814..544e84584b15b517e4efec05752fb3af5bdbe60f 100644 (file)
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -48,7 +48,6 @@ Style Theorem
          Series              Bold
        EndFont
        Preamble
-               \theoremstyle{plain}
                \newtheorem{thm}{Theorem}
        EndPreamble
 End
@@ -60,7 +59,6 @@ Style Corollary
        LatexName             cor
        LabelString           "Corollary \thetheorem."
        Preamble
-         \theoremstyle{plain}
          \newtheorem{cor}[thm]{Corollary}
        EndPreamble
 End
@@ -72,7 +70,6 @@ Style Lemma
        LatexName             lem
        LabelString           "Lemma \thetheorem."
        Preamble
-         \theoremstyle{plain}
          \newtheorem{lem}[thm]{Lemma}
        EndPreamble
 End
@@ -84,7 +81,6 @@ Style Proposition
        LatexName             prop
        LabelString           "Proposition \thetheorem."
        Preamble
-         \theoremstyle{plain}
          \newtheorem{prop}[thm]{Proposition}
        EndPreamble
 End
@@ -96,7 +92,6 @@ Style Conjecture
        LatexName             conjecture
        LabelString           "Conjecture \thetheorem."
        Preamble
-         \theoremstyle{plain}
          \newtheorem{conjecture}[thm]{Conjecture}
        EndPreamble
 End
@@ -108,7 +103,6 @@ Style Fact
        LatexName             fact
        LabelString           "Fact \thetheorem."
        Preamble
-         \theoremstyle{plain}
          \newtheorem{fact}[thm]{Fact}
        EndPreamble
 End