X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-starred.inc;h=d7d9cf1c60022f4486a3cbae34c1893f74d01e64;hb=b4dcad83b2f6e3fce28b4e04cc1abc8d654f9bfe;hp=c8ae6921a1d648ebf54449e55601f549a49f76fa;hpb=0b95498ef437c1347dbde293d893e83c418c377d;p=lyx.git

diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc
index c8ae6921a1..d7d9cf1c60 100644
--- a/lib/layouts/theorems-starred.inc
+++ b/lib/layouts/theorems-starred.inc
@@ -14,21 +14,31 @@
 # - Example
 # - Problem
 # - Exercise
+# - Solution
 # - Remark
 # - Claim
 # - Proof
 
-Format 10
+Format 60
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem*
-	Category              Theorem
+	Category              Reasoning
 	LatexType             Environment
 	Margin                First_Dynamic
 	LatexName             thm*
 	LabelType             Static
 	LabelString           "Theorem."
 	NextNoIndent          1
-	OptionalArgs          1
+	ResetArgs             1
+	AddToToc              thm
+	IsTocCaption          1
+	Argument 1
+		LabelString    "Additional Theorem Text"
+		Tooltip        "Additional text appended to the theorem header"
+		IsTocCaption      1
+	EndArgument
 	LabelSep              xx
 	ParIndent             MMM
 	ParSkip               0.4
@@ -48,8 +58,14 @@ 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
 
@@ -60,9 +76,14 @@ Style Corollary*
 	LabelString           "Corollary."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem*{cor*}{Corollary}
+	  \newtheorem*{cor*}{\protect\corollaryname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\corollaryname}{_(Corollary)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+	EndBabelPreamble
 End
 
 
@@ -72,9 +93,14 @@ Style Lemma*
 	LabelString           "Lemma."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem*{lem*}{Lemma}
+	  \newtheorem*{lem*}{\protect\lemmaname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\lemmaname}{_(Lemma)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+	EndBabelPreamble
 End
 
 
@@ -84,9 +110,14 @@ Style Proposition*
 	LabelString           "Proposition."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem*{prop*}{Proposition}
+	  \newtheorem*{prop*}{\protect\propositionname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\propositionname}{_(Proposition)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+	EndBabelPreamble
 End
 
 
@@ -96,9 +127,14 @@ Style Conjecture*
 	LabelString           "Conjecture."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem*{conjecture*}{Conjecture}
+	  \newtheorem*{conjecture*}{\protect\conjecturename}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\conjecturename}{_(Conjecture)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+	EndBabelPreamble
 End
 
 
@@ -108,9 +144,14 @@ Style Fact*
 	LabelString           "Fact."
 	Preamble
 	  \theoremstyle{plain}
-	  \newtheorem*{fact*}{Fact}
+	  \newtheorem*{fact*}{\protect\factname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\factname}{_(Fact)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+	EndBabelPreamble
 End
 
 
@@ -128,9 +169,14 @@ Style Definition*
 	EndFont
 	Preamble
 	 \theoremstyle{definition}
-	 \newtheorem*{defn*}{Definition}
+	 \newtheorem*{defn*}{\protect\definitionname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\definitionname}{_(Definition)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+	EndBabelPreamble
 End
 
 
@@ -140,9 +186,14 @@ Style Example*
 	LabelString           "Example."
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem*{example*}{Example}
+	  \newtheorem*{example*}{\protect\examplename}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\examplename}{_(Example)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+	EndBabelPreamble
 End
 
 
@@ -152,9 +203,14 @@ Style Problem*
 	LabelString           "Problem."
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem*{problem*}{Problem}
+	  \newtheorem*{problem*}{\protect\problemname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\problemname}{_(Problem)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+	EndBabelPreamble
 End
 
 
@@ -164,9 +220,31 @@ Style Exercise*
 	LabelString           "Exercise."
 	Preamble
 	  \theoremstyle{definition}
-	  \newtheorem*{xca*}{Exercise}
+	  \newtheorem*{xca*}{\protect\exercisename}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\exercisename}{_(Exercise)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+	EndBabelPreamble
+End
+
+
+Style Solution*
+	CopyStyle             Definition*
+	LatexName             sol*
+	LabelString           "Solution."
+	Preamble
+	  \theoremstyle{definition}
+	  \newtheorem*{sol*}{\protect\solutionname}
+	EndPreamble
+	LangPreamble
+	  \providecommand{\solutionname}{_(Solution)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+	EndBabelPreamble
 End
 
 
@@ -184,9 +262,14 @@ Style Remark*
 	EndFont
 	Preamble
 	  \theoremstyle{remark}
-	  \newtheorem*{rem*}{Remark}
+	  \newtheorem*{rem*}{\protect\remarkname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\remarkname}{_(Remark)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+	EndBabelPreamble
 End
 
 
@@ -196,8 +279,13 @@ Style Claim*
 	LabelString           "Claim."
 	Preamble
 	  \theoremstyle{remark}
-	  \newtheorem*{claim*}{Claim}
+	  \newtheorem*{claim*}{\protect\claimname}
 	EndPreamble
-	Requires              amsthm
+	LangPreamble
+	  \providecommand{\claimname}{_(Claim)}
+	EndLangPreamble
+	BabelPreamble
+	  \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+	EndBabelPreamble
 End