X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems.inc;h=874cba99c9cac3c0db208867c273d153a67cd8ac;hb=d748a0a6f16c996ff042e19ea463a018d37236be;hp=be81dd1e3d44dac483d1c1068f3ea091d8ecb822;hpb=d2e5ef3d654d0b633cd5f56e3551c09b80eed9ab;p=lyx.git

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index be81dd1e3d..874cba99c9 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -19,7 +19,7 @@
 # - Proof
 # - Case (regular only -- defined as an enumeration)
 
-Format 6
+Format 30
 
 Style Theorem
 	Category              Theorem
@@ -49,69 +49,112 @@ Style Theorem
 	  Series              Bold
 	EndFont
 	Preamble
-		\newtheorem{thm}{Theorem}
+		\theoremstyle{plain}
+		\newtheorem{thm}{\protect\theoremname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\theoremname}{_(Theorem)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+	EndBabelPreamble
+	Requires              amsthm
 End
 
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
-	  \newtheorem{cor}[thm]{Corollary}
+		\theoremstyle{plain}
+		\newtheorem{cor}[thm]{\protect\corollaryname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\corollaryname}{_(Corollary)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+	EndBabelPreamble
 End
 
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
-	  \newtheorem{lem}[thm]{Lemma}
+		\theoremstyle{plain}
+		\newtheorem{lem}[thm]{\protect\lemmaname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\lemmaname}{_(Lemma)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+	EndBabelPreamble
 End
 
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
-	  \newtheorem{prop}[thm]{Proposition}
+		\theoremstyle{plain}
+		\newtheorem{prop}[thm]{\protect\propositionname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\propositionname}{_(Proposition)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+	EndBabelPreamble
 End
 
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
-	  \newtheorem{conjecture}[thm]{Conjecture}
+		\theoremstyle{plain}
+		\newtheorem{conjecture}[thm]{\protect\conjecturename}
 	EndPreamble
+	LangPreamble
+		\providecommand{\conjecturename}{_(Conjecture)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+	EndBabelPreamble
 End
 
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
-	  \newtheorem{fact}[thm]{Fact}
+		\theoremstyle{plain}
+		\newtheorem{fact}[thm]{\protect\factname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\factname}{_(Fact)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+	EndBabelPreamble
 End
 
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -122,9 +165,15 @@ Style Definition
 	  Series              Bold
 	EndFont
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{defn}[thm]{Definition}
+		\theoremstyle{definition}
+		\newtheorem{defn}[thm]{\protect\definitionname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\definitionname}{_(Definition)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+	EndBabelPreamble
 End
 
 
@@ -133,9 +182,15 @@ Style Example
 	LatexName             example
 	LabelString           "Example \thetheorem."
 	Preamble
-	 \theoremstyle{definition}
-	  \newtheorem{example}[thm]{Example}
+		\theoremstyle{definition}
+		\newtheorem{example}[thm]{\protect\examplename}
 	EndPreamble
+	LangPreamble
+		\providecommand{\examplename}{_(Example)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+	EndBabelPreamble
 End
 
 
@@ -144,9 +199,15 @@ Style Problem
 	LatexName             problem
 	LabelString           "Problem \thetheorem."
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{problem}[thm]{Problem}
+		\theoremstyle{definition}
+		\newtheorem{problem}[thm]{\protect\problemname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\problemname}{_(Problem)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+	EndBabelPreamble
 End
 
 
@@ -155,15 +216,21 @@ Style Exercise
 	LatexName             xca
 	LabelString           "Exercise \thetheorem."
 	Preamble
-	  \theoremstyle{definition}
-	  \newtheorem{xca}[thm]{Exercise}
+		\theoremstyle{definition}
+		\newtheorem{xca}[thm]{\protect\exercisename}
 	EndPreamble
+	LangPreamble
+		\providecommand{\exercisename}{_(Exercise)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+	EndBabelPreamble
 End
 
 
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font
@@ -175,9 +242,15 @@ Style Remark
 	  Shape               Italic
 	EndFont
 	Preamble
-	  \theoremstyle{remark}
-	  \newtheorem{rem}[thm]{Remark}
+		\theoremstyle{remark}
+		\newtheorem{rem}[thm]{\protect\remarkname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\remarkname}{_(Remark)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+	EndBabelPreamble
 End
 
 
@@ -186,9 +259,15 @@ Style Claim
 	LatexName             claim
 	LabelString           "Claim \thetheorem."
 	Preamble
-	  \theoremstyle{remark}
-	  \newtheorem{claim}[thm]{Claim}
+		\theoremstyle{remark}
+		\newtheorem{claim}[thm]{\protect\claimname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\claimname}{_(Claim)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+	EndBabelPreamble
 End
 
 
@@ -198,12 +277,32 @@ Style Case
 	CopyStyle             Enumerate
 	LatexName             caseenv
 	LabelType             Static
-	LeftMargin            "MMMMMMN"
-	LabelString           "Case #:"
+	LeftMargin            "Case ###."
+	LabelString           "Case #."
+	LabelFont
+	  Series              Medium
+	  Shape               Italic
+	EndFont
 	Preamble
-	  \newcounter{casectr}
-	  \newenvironment{caseenv}
-{\begin{list}{\bfseries\upshape Case \arabic{casectr}:}{}\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)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
+	EndBabelPreamble
+	RefPrefix OFF
 End
+
+Input theorems-refprefix.inc