Fixes for theorem modules from Paul Rubin.

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

diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module
index 7c46dec77dd2ac134dfcaa1496da874a58edf513..3a959b326b9d4be32ede26d896cb1b8e3ef6ff61 100644 (file)
--- a/lib/layouts/theorems-ams.module
+++ b/lib/layouts/theorems-ams.module
@@ -20,10 +20,6 @@ Requires     amsmath,amsthm
 Counter theorem
 End
 
-AddToPreamble
-       \theoremstyle{plain}
-EndPreamble
-
 Input theorems-order.inc
 Input theorems-ams.inc
 Input theorems-starred.inc

diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module
index a83b4b5894dca11b6a0fb9bbc695996b653bd9d8..f72d8b85db95c2936b2740f0bc47c7512c69dc05 100644 (file)
--- a/lib/layouts/theorems-chap.module
+++ b/lib/layouts/theorems-chap.module
@@ -16,6 +16,7 @@ End
 
 Style Theorem
        Preamble
+               \theoremstyle{plain}
                \ifx\thechapter\undefined
                        \newtheorem{thm}{\protect\theoremname}
                \else

diff --git a/lib/layouts/theorems-sec.module b/lib/layouts/theorems-sec.module
index 3be1c57af8a1997142551e4e2a072e040f36435c..7fb0b436b50a08eb2112ec958f1715bf486b28bd 100644 (file)
--- a/lib/layouts/theorems-sec.module
+++ b/lib/layouts/theorems-sec.module
@@ -15,6 +15,7 @@ End
 
 Style Theorem
        Preamble
+               \theoremstyle{plain}
                \newtheorem{thm}{\protect\theoremname}[section]
        EndPreamble
        LangPreamble

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 881b1fd4c8bade08be516895c7ebc7fd21e63624..339743b52a129fdd601b4c1955208f4dd368b763 100644 (file)
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -49,6 +49,7 @@ Style Theorem
          Series              Bold
        EndFont
        Preamble
+               \theoremstyle{plain}
                \newtheorem{thm}{\protect\theoremname}
        EndPreamble
        LangPreamble
@@ -67,7 +68,8 @@ Style Corollary
        LatexName             cor
        LabelString           "Corollary \thetheorem."
        Preamble
-         \newtheorem{cor}[thm]{\protect\corollaryname}
+               \theoremstyle{plain}
+               \newtheorem{cor}[thm]{\protect\corollaryname}
        EndPreamble
        LangPreamble
                \providecommand{\corollaryname}{_(Corollary)}
@@ -84,7 +86,8 @@ Style Lemma
        LatexName             lem
        LabelString           "Lemma \thetheorem."
        Preamble
-         \newtheorem{lem}[thm]{\protect\lemmaname}
+               \theoremstyle{plain}
+               \newtheorem{lem}[thm]{\protect\lemmaname}
        EndPreamble
        LangPreamble
                \providecommand{\lemmaname}{_(Lemma)}
@@ -101,7 +104,8 @@ Style Proposition
        LatexName             prop
        LabelString           "Proposition \thetheorem."
        Preamble
-         \newtheorem{prop}[thm]{\protect\propositionname}
+               \theoremstyle{plain}
+               \newtheorem{prop}[thm]{\protect\propositionname}
        EndPreamble
        LangPreamble
                \providecommand{\propositionname}{_(Proposition)}
@@ -118,7 +122,8 @@ Style Conjecture
        LatexName             conjecture
        LabelString           "Conjecture \thetheorem."
        Preamble
-         \newtheorem{conjecture}[thm]{\protect\conjecturename}
+               \theoremstyle{plain}
+               \newtheorem{conjecture}[thm]{\protect\conjecturename}
        EndPreamble
        LangPreamble
                \providecommand{\conjecturename}{_(Conjecture)}
@@ -135,7 +140,8 @@ Style Fact
        LatexName             fact
        LabelString           "Fact \thetheorem."
        Preamble
-         \newtheorem{fact}[thm]{\protect\factname}
+               \theoremstyle{plain}
+               \newtheorem{fact}[thm]{\protect\factname}
        EndPreamble
        LangPreamble
                \providecommand{\factname}{_(Fact)}
@@ -159,8 +165,8 @@ Style Definition
          Series              Bold
        EndFont
        Preamble
-         \theoremstyle{definition}
-         \newtheorem{defn}[thm]{\protect\definitionname}
+               \theoremstyle{definition}
+               \newtheorem{defn}[thm]{\protect\definitionname}
        EndPreamble
        LangPreamble
                \providecommand{\definitionname}{_(Definition)}
@@ -176,8 +182,8 @@ Style Example
        LatexName             example
        LabelString           "Example \thetheorem."
        Preamble
-         \theoremstyle{definition}
-         \newtheorem{example}[thm]{\protect\examplename}
+               \theoremstyle{definition}
+               \newtheorem{example}[thm]{\protect\examplename}
        EndPreamble
        LangPreamble
                \providecommand{\examplename}{_(Example)}
@@ -193,8 +199,8 @@ Style Problem
        LatexName             problem
        LabelString           "Problem \thetheorem."
        Preamble
-         \theoremstyle{definition}
-         \newtheorem{problem}[thm]{\protect\problemname}
+               \theoremstyle{definition}
+               \newtheorem{problem}[thm]{\protect\problemname}
        EndPreamble
        LangPreamble
                \providecommand{\problemname}{_(Problem)}
@@ -210,8 +216,8 @@ Style Exercise
        LatexName             xca
        LabelString           "Exercise \thetheorem."
        Preamble
-         \theoremstyle{definition}
-         \newtheorem{xca}[thm]{\protect\exercisename}
+               \theoremstyle{definition}
+               \newtheorem{xca}[thm]{\protect\exercisename}
        EndPreamble
        LangPreamble
                \providecommand{\exercisename}{_(Exercise)}
@@ -236,8 +242,8 @@ Style Remark
          Shape               Italic
        EndFont
        Preamble
-         \theoremstyle{remark}
-         \newtheorem{rem}[thm]{\protect\remarkname}
+               \theoremstyle{remark}
+               \newtheorem{rem}[thm]{\protect\remarkname}
        EndPreamble
        LangPreamble
                \providecommand{\remarkname}{_(Remark)}
@@ -253,8 +259,8 @@ Style Claim
        LatexName             claim
        LabelString           "Claim \thetheorem."
        Preamble
-         \theoremstyle{remark}
-         \newtheorem{claim}[thm]{\protect\claimname}
+               \theoremstyle{remark}
+               \newtheorem{claim}[thm]{\protect\claimname}
        EndPreamble
        LangPreamble
                \providecommand{\claimname}{_(Claim)}
@@ -278,17 +284,17 @@ Style Case
          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}}
+               \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)}