X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=9fdbbbc6b1499f130c3ea068ed27cca8c6558232;hb=8f9520eda5a0ecf2458341e5d8ea40f5970d54db;hp=a85561b850a8e8ffe8c959c4750de044be4c2814;hpb=46611ba1cc4a3165dfdc67ba3332184af07a56dc;p=lyx.git

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index a85561b850..9fdbbbc6b1 100644
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.inc
@@ -4,7 +4,7 @@
 # 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
@@ -17,16 +17,20 @@
 # - Remark
 # - Claim
 # - Proof
-# - Case (regular only -- defined as an enumeration)
+# - Case (by inclusion)
 
-Format 6
+Format 45
 
 Style Theorem
+	Category              Reasoning
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
 	NextNoIndent          1
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Alternative Theorem String"
+		Tooltip       "Alternative theorem string"
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -36,7 +40,7 @@ Style Theorem
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          theorem
 	LabelString           "Theorem \thetheorem."
 	Font
@@ -49,8 +53,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
 
 
@@ -61,8 +72,14 @@ Style Corollary
 	LabelString           "Corollary \thetheorem."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem{cor}[thm]{Corollary}
+	  \newtheorem{cor}[thm]{\protect\corollaryname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\corollaryname}{_(Corollary)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+	EndBabelPreamble
 End
 
 
@@ -73,8 +90,14 @@ Style Lemma
 	LabelString           "Lemma \thetheorem."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem{lem}[thm]{Lemma}
+	  \newtheorem{lem}[thm]{\protect\lemmaname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\lemmaname}{_(Lemma)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+	EndBabelPreamble
 End
 
 
@@ -85,8 +108,14 @@ Style Proposition
 	LabelString           "Proposition \thetheorem."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem{prop}[thm]{Proposition}
+	  \newtheorem{prop}[thm]{\protect\propositionname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\propositionname}{_(Proposition)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+	EndBabelPreamble
 End
 
 
@@ -97,8 +126,14 @@ Style Conjecture
 	LabelString           "Conjecture \thetheorem."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem{conjecture}[thm]{Conjecture}
+	  \newtheorem{conjecture}[thm]{\protect\conjecturename}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\conjecturename}{_(Conjecture)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+	EndBabelPreamble
 End
 
 
@@ -109,8 +144,14 @@ Style Fact
 	LabelString           "Fact \thetheorem."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem{fact}[thm]{Fact}
+	  \newtheorem{fact}[thm]{\protect\factname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\factname}{_(Fact)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+	EndBabelPreamble
 End
 
 
@@ -128,8 +169,14 @@ Style Definition
 	EndFont
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem{defn}[thm]{Definition}
+	  \newtheorem{defn}[thm]{\protect\definitionname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\definitionname}{_(Definition)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+	EndBabelPreamble
 End
 
 
@@ -138,9 +185,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
 
 
@@ -150,8 +203,14 @@ Style Problem
 	LabelString           "Problem \thetheorem."
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem{problem}[thm]{Problem}
+	  \newtheorem{problem}[thm]{\protect\problemname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\problemname}{_(Problem)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+	EndBabelPreamble
 End
 
 
@@ -161,8 +220,14 @@ Style Exercise
 	LabelString           "Exercise \thetheorem."
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem{xca}[thm]{Exercise}
+	  \newtheorem{xca}[thm]{\protect\exercisename}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\exercisename}{_(Exercise)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+	EndBabelPreamble
 End
 
 
@@ -181,8 +246,14 @@ Style Remark
 	EndFont
 	Preamble
 	  \theoremstyle{remark}
-	  \newtheorem{rem}[thm]{Remark}
+	  \newtheorem{rem}[thm]{\protect\remarkname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\remarkname}{_(Remark)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+	EndBabelPreamble
 End
 
 
@@ -192,22 +263,15 @@ Style Claim
 	LabelString           "Claim \thetheorem."
 	Preamble
 	  \theoremstyle{remark}
-	  \newtheorem{claim}[thm]{Claim}
+	  \newtheorem{claim}[thm]{\protect\claimname}
 	EndPreamble
+	LangPreamble
+	  \providecommand{\claimname}{_(Claim)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+	EndBabelPreamble
 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
+Input theorems-case.inc
+Input theorems-refprefix.inc