X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-ams.inc;h=8da4b7b657cd9427aadb9e91a985abb8f4fdf033;hb=8d707723b76d98ba4ed50a43967f74f10d95bb8b;hp=80789ce6f0582369fe4e8a759b3aa6f94b8305c8;hpb=d76e4b2311bce9288813f0e18c18241ffec0de33;p=lyx.git

diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index 80789ce6f0..8da4b7b657 100644
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.inc
@@ -19,7 +19,7 @@
 # - Proof
 # - Case (regular only -- defined as an enumeration)
 
-Format 6
+Format 35
 
 Style Theorem
 	Category              Theorem
@@ -49,76 +49,112 @@ Style Theorem
 	  Series              Bold
 	EndFont
 	Preamble
-		\usepackage{amsthm}
 		\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
 
 
 Style Corollary
 	CopyStyle             Theorem
-	DependsOn		          Theorem
+	DependsOn	      Theorem
 	LatexName             cor
 	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
 
 
 Style Lemma
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             lem
 	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
 
 
 Style Proposition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             prop
 	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
 
 
 Style Conjecture
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             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
 
 
 Style Fact
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             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
 
 
 Style Definition
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             defn
 	LabelString           "Definition \thetheorem."
 	Font
@@ -130,8 +166,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
 
 
@@ -140,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
 
 
@@ -152,8 +200,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
 
 
@@ -163,14 +217,20 @@ 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
 
 
 Style Remark
 	CopyStyle             Theorem
-	DependsOn	            Theorem
+	DependsOn	      Theorem
 	LatexName             rem
 	LabelString           "Remark \thetheorem."
 	Font
@@ -183,8 +243,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
 
 
@@ -194,24 +260,58 @@ 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
 	Category              Theorem
-	CopyStyle             Enumerate
+	Margin                Static
+	LatexType             Item_Environment
 	LatexName             caseenv
 	LabelType             Static
-	LeftMargin            "Case ###:"
-	LabelString           "Case #:"
+	NextNoIndent          1
+	LeftMargin            "Case ###."
+	ParSkip               0.0
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
+	Align                 Block
+	AlignPossible         Block, Left
+	LabelSep              xx
+	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}}
+	  {\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
 End
+
+Input theorems-refprefix.inc