X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-chap-bytype.module;h=fe98e03b2e838639786f86e530df63fc3569c14c;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=f1c6f53b18b53598c5d76865ea94ff9d7030ed7b;hpb=de815f594ee4f9fbfd86cb94dd039bbcc6fbdf7c;p=lyx.git

diff --git a/lib/layouts/theorems-chap-bytype.module b/lib/layouts/theorems-chap-bytype.module
index f1c6f53b18..fe98e03b2e 100644
--- a/lib/layouts/theorems-chap-bytype.module
+++ b/lib/layouts/theorems-chap-bytype.module
@@ -1,4 +1,5 @@
-#\DeclareLyXModule{Theorems (Numbered by Type within Chapters)}
+#\DeclareLyXModule{Standard Theorems (Numbered by Type within Chapters)}
+#\DeclareCategory{Maths}
 #DescriptionBegin
 #Defines some theorem environments for use with non-AMS classes. Contrary to the
 #plain Theorem module, the different theorem types provided here each have a separate
@@ -9,55 +10,56 @@
 #Requires: theorems-bytype | theorems-ams-bytype
 #Excludes: theorems-std | theorems-ams | theorems-starred | theorems-sec | theorems-sec-bytype
 
-# Author: Paul Rubin <rubin@msu.edu> (hacked from Richard Heck's various modules)
+# Author: Paul Rubin <rubin@msu.edu> (hacked from Richard Kimberly Heck's various modules)
 
-Format 28
+Format 99
+
+Input theorems-counters-bytype.inc
 
-# We need separate counters for each theorem-like style.
 Counter theorem
-	Within         chapter
+	Within chapter
 End
 Counter corollary
-	Within         chapter
+	Within chapter
 End
 Counter lemma
-	Within         chapter
+	Within chapter
 End
 Counter proposition
-	Within         chapter
+	Within chapter
 End
 Counter conjecture
-	Within         chapter
+	Within chapter
 End
 Counter fact
-	Within         chapter
+	Within chapter
 End
 Counter definition
-	Within         chapter
+	Within chapter
 End
 Counter example
-	Within         chapter
+	Within chapter
 End
 Counter problem
-	Within         chapter
+	Within chapter
 End
 Counter exercise
-	Within         chapter
+	Within chapter
 End
 Counter remark
-	Within         chapter
+	Within chapter
 End
 Counter claim
-	Within         chapter
+	Within chapter
 End
 
 Style Theorem
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{thm}{Theorem}
+	    \newtheorem{thm}{\protect\theoremname}
 	  \else
-	    \newtheorem{thm}{Theorem}[chapter]
+	    \newtheorem{thm}{\protect\theoremname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -67,9 +69,9 @@ Style Corollary
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{cor}{Corollary}
+	    \newtheorem{cor}{\protect\corollaryname}
 	  \else
-	    \newtheorem{cor}{Corollary}[chapter]
+	    \newtheorem{cor}{\protect\corollaryname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -79,9 +81,9 @@ Style Lemma
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{lem}{Lemma}
+	    \newtheorem{lem}{\protect\lemmaname}
 	  \else
-	    \newtheorem{lem}{Lemma}[chapter]
+	    \newtheorem{lem}{\protect\lemmaname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -91,9 +93,9 @@ Style Proposition
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{prop}{Proposition}
+	    \newtheorem{prop}{\protect\propositionname}
 	  \else
-	    \newtheorem{prop}{Proposition}[chapter]
+	    \newtheorem{prop}{\protect\propositionname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -103,9 +105,9 @@ Style Conjecture
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{conjecture}{Conjecture}
+	    \newtheorem{conjecture}{\protect\conjecturename}
 	  \else
-	    \newtheorem{conjecture}{Conjecture}[chapter]
+	    \newtheorem{conjecture}{\protect\conjecturename}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -115,9 +117,9 @@ Style Fact
 	Preamble
 	  \theoremstyle{plain}
 	  \ifx\thechapter\undefined
-	    \newtheorem{fact}{Fact}
+	    \newtheorem{fact}{\protect\factname}
 	  \else
-	    \newtheorem{fact}{Fact}[chapter]
+	    \newtheorem{fact}{\protect\factname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -127,9 +129,9 @@ Style Definition
 	Preamble
 	  \theoremstyle{definition}
 	  \ifx\thechapter\undefined
-	    \newtheorem{defn}{Definition}
+	    \newtheorem{defn}{\protect\definitionname}
 	  \else
-	    \newtheorem{defn}{Definition}[chapter]
+	    \newtheorem{defn}{\protect\definitionname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -139,9 +141,9 @@ Style Example
 	Preamble
 	  \theoremstyle{definition}
 	  \ifx\thechapter\undefined
-	    \newtheorem{example}{Example}
+	    \newtheorem{example}{\protect\examplename}
 	  \else
-	    \newtheorem{example}{Example}[chapter]
+	    \newtheorem{example}{\protect\examplename}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -151,9 +153,9 @@ Style Problem
 	Preamble
 	  \theoremstyle{definition}
 	  \ifx\thechapter\undefined
-	    \newtheorem{problem}{Problem}
+	    \newtheorem{problem}{\protect\problemname}
 	  \else
-	    \newtheorem{problem}{Problem}[chapter]
+	    \newtheorem{problem}{\protect\problemname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -163,9 +165,9 @@ Style Exercise
 	Preamble
 	  \theoremstyle{definition}
 	  \ifx\thechapter\undefined
-	    \newtheorem{xca}{Exercise}
+	    \newtheorem{xca}{\protect\exercisename}
 	  \else
-	    \newtheorem{xca}{Exercise}[chapter]
+	    \newtheorem{xca}{\protect\exercisename}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -175,9 +177,9 @@ Style Remark
 	Preamble
 	  \theoremstyle{remark}
 	  \ifx\thechapter\undefined
-	    \newtheorem{rem}{Remark}
+	    \newtheorem{rem}{\protect\remarkname}
 	  \else
-	    \newtheorem{rem}{Remark}[chapter]
+	    \newtheorem{rem}{\protect\remarkname}[chapter]
 	  \fi
 	EndPreamble
 End
@@ -187,9 +189,9 @@ Style Claim
 	Preamble
 	  \theoremstyle{remark}
 	  \ifx\thechapter\undefined
-	    \newtheorem{claim}{Claim}
+	    \newtheorem{claim}{\protect\claimname}
 	  \else
-	    \newtheorem{claim}{Claim}[chapter]
+	    \newtheorem{claim}{\protect\claimname}[chapter]
 	  \fi
 	EndPreamble
 End