X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems.inc;h=20b9beb9cea6bba3294aaa6c95eb96ce7ee3ad15;hb=d0af587ab4b93533955f40bf2ac099e71d60b4f4;hp=05b66dbc9dbc0b55b2e47c78985d995bbad712b9;hpb=f5a5be4d188a20ee2a5c0213ee11bf64c0908841;p=lyx.git

diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index 05b66dbc9d..20b9beb9ce 100644
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -4,28 +4,34 @@
 # Tinkered with Sep. '07 by Paul Rubin <rubin@msu.edu>
 # Modularized Jan 08 by Richard Heck <rgheck@comcast.net>
 
-# The environnements defined are :
+# The environments defined are :
 # - Theorem
 # - Corollary
 # - Lemma
 # - Proposition
 # - Conjecture
+# - Fact
 # - Definition
 # - Example
 # - Problem
 # - Exercise
 # - Remark
 # - Claim
-# - Proof
+# - Case (by inclusion)
 
-Format 6
+Format 48
 
 Style Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
-	OptionalArgs          1
+	ResetArgs             1
+	Argument 1
+		LabelString    "Additional Theorem Text"
+		Tooltip        "Additional text appended to the theorem header"
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -34,8 +40,8 @@ Style Theorem
 	BottomSep             0.7
 	ParSep                0.3
 	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Counter
+	AlignPossible         Left
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -48,8 +54,15 @@ Style Theorem
 	EndFont
 	Preamble
 		\theoremstyle{plain}
-		\newtheorem{thm}{Theorem}
+		\newtheorem{thm}{\protect\theoremname}
 	EndPreamble
+	LangPreamble
+		\providecommand{\theoremname}{_(Theorem)}
+	EndLangPreamble
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+	EndBabelPreamble
+	Requires              amsthm
 End
 
 
@@ -59,9 +72,15 @@ Style Corollary
 	LatexName             cor
 	LabelString           "Corollary \thetheorem."
 	Preamble
-	  \theoremstyle{plain}
-	  \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
 
 
@@ -71,9 +90,15 @@ Style Lemma
 	LatexName             lem
 	LabelString           "Lemma \thetheorem."
 	Preamble
-	  \theoremstyle{plain}
-	  \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
 
 
@@ -83,9 +108,15 @@ Style Proposition
 	LatexName             prop
 	LabelString           "Proposition \thetheorem."
 	Preamble
-	  \theoremstyle{plain}
-	  \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
 
 
@@ -95,9 +126,15 @@ Style Conjecture
 	LatexName             conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
-	  \theoremstyle{plain}
-	  \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
 
 
@@ -107,9 +144,15 @@ Style Fact
 	LatexName             fact
 	LabelString           "Fact \thetheorem."
 	Preamble
-	  \theoremstyle{plain}
-	  \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
 
 
@@ -126,9 +169,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
 
 
@@ -137,9 +186,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
 
 
@@ -148,9 +203,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
 
 
@@ -159,9 +220,15 @@ 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
 
 
@@ -179,9 +246,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
 
 
@@ -190,9 +263,16 @@ 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
 
-
+Input theorems-case.inc
+Input theorems-refprefix.inc