X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Ftheorems-without-preamble.inc;h=ad7580bb4a0846cdd8203869f1891fc3ee18fe5b;hb=bab184e49e4420ad5277eacd45f2447727f55bbd;hp=5ca15316a8de74eaad65a8f6de9c2ec70934c29a;hpb=b95c17cfdd469aac842304073a56e3fb64bfe629;p=lyx.git

diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc
index 5ca15316a8..ad7580bb4a 100644
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -1,5 +1,5 @@
 # This file provides theorem environments without adding preamble code or
-# requiring packages. THis is useful for classes that define their own theorems
+# requiring packages. This is useful for classes that define their own theorems
 # like svjour3 or ijmpc.
 # Author: Uwe Stöhr <uwestoehr@web.de>
 
@@ -26,20 +26,24 @@
 # - Note
 
 
-Format 40
+Format 80
 
+OutlinerName thm "Definitions & Theorems"
 
 Counter		theorem
 End
 Style Theorem
-	Category	Theorem
+	Category	Reasoning
 	Margin		First_Dynamic
 	LatexType	Environment
 	LatexName	theorem
 	NextNoIndent	1
+	AddToToc              thm
+	IsTocCaption          1
 	Argument 1
-		LabelString   "Alternative Theorem String"
-		Tooltip       "Alternative theorem string"
+	  LabelString	"Name/Title"
+	  Tooltip	"Alternative optional name or title"
+	  IsTocCaption      1
 	EndArgument
 	LabelSep	xx
 	ParIndent	MMM
@@ -50,7 +54,7 @@ Style Theorem
 	ParSep		0.3
 	Align		Block
 	AlignPossible	Left
-	LabelType	Counter
+	LabelType	Static
 	LabelCounter	theorem
 	LabelString	"Theorem \thetheorem."
 	Font
@@ -62,10 +66,10 @@ Style Theorem
 	  Series	Bold
 	EndFont
 	LangPreamble
-		\providecommand{\theoremname}{_(Theorem)}
+	  \providecommand{\theoremname}{_(Theorem)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
+	  \addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
 	EndBabelPreamble
 End
 
@@ -78,10 +82,10 @@ Style Corollary
 	LatexName	corollary
 	LabelString	"Corollary \thecorollary."
 	LangPreamble
-		\providecommand{\corollaryname}{_(Corollary)}
+	  \providecommand{\corollaryname}{_(Corollary)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
+	  \addto\captions$$lang{\renewcommand{\corollaryname}{_(Corollary)}}
 	EndBabelPreamble
 End
 
@@ -94,10 +98,10 @@ Style Lemma
 	LatexName	lemma
 	LabelString	"Lemma \thelemma."
 	LangPreamble
-		\providecommand{\lemmaname}{_(Lemma)}
+	  \providecommand{\lemmaname}{_(Lemma)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
+	  \addto\captions$$lang{\renewcommand{\lemmaname}{_(Lemma)}}
 	EndBabelPreamble
 End
 
@@ -110,10 +114,10 @@ Style Proposition
 	LatexName	proposition
 	LabelString	"Proposition \theproposition."
 	LangPreamble
-		\providecommand{\propositionname}{_(Proposition)}
+	  \providecommand{\propositionname}{_(Proposition)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
+	  \addto\captions$$lang{\renewcommand{\propositionname}{_(Proposition)}}
 	EndBabelPreamble
 End
 
@@ -149,10 +153,10 @@ Style Conjecture
 	  Shape		Italic
 	EndFont
 	LangPreamble
-		\providecommand{\conjecturename}{_(Conjecture)}
+	  \providecommand{\conjecturename}{_(Conjecture)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
+	  \addto\captions$$lang{\renewcommand{\conjecturename}{_(Conjecture)}}
 	EndBabelPreamble
 End
 
@@ -165,10 +169,10 @@ Style Fact
 	LatexName	fact
 	LabelString	"Fact \thefact."
 	LangPreamble
-		\providecommand{\factname}{_(Fact)}
+	  \providecommand{\factname}{_(Fact)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
+	  \addto\captions$$lang{\renewcommand{\factname}{_(Fact)}}
 	EndBabelPreamble
 End
 
@@ -189,10 +193,10 @@ Style Definition
 	  Series	Bold
 	EndFont
 	LangPreamble
-		\providecommand{\definitionname}{_(Definition)}
+	  \providecommand{\definitionname}{_(Definition)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
+	  \addto\captions$$lang{\renewcommand{\definitionname}{_(Definition)}}
 	EndBabelPreamble
 End
 
@@ -206,10 +210,10 @@ Style Example
 	LabelString	"Example \theexample."
 	RefPrefix	exa
 	LangPreamble
-		\providecommand{\examplename}{_(Example)}
+	  \providecommand{\examplename}{_(Example)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
+	  \addto\captions$$lang{\renewcommand{\examplename}{_(Example)}}
 	EndBabelPreamble
 End
 
@@ -224,10 +228,10 @@ Style Problem
 	LabelString	"Problem \theproblem."
 	RefPrefix	prob
 	LangPreamble
-		\providecommand{\problemname}{_(Problem)}
+	  \providecommand{\problemname}{_(Problem)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
+	  \addto\captions$$lang{\renewcommand{\problemname}{_(Problem)}}
 	EndBabelPreamble
 End
 
@@ -241,7 +245,7 @@ Style Prob
 	LatexType	Environment
 	LatexName	prob
 	Margin		First_Dynamic
-	LabelType	Counter
+	LabelType	Static
 	LabelCounter	prob
 	LabelString	"\theprob."
 	RefPrefix	pro
@@ -259,6 +263,8 @@ Style Prob
 	LabelFont
 	  Series	Bold
 	EndFont
+	AddToToc	thm
+	IsTocCaption	true
 End
 
 
@@ -271,10 +277,10 @@ Style Solution
 	LabelString	"Solution \thesolution."
 	RefPrefix	solu
 	LangPreamble
-		\providecommand{\solutionname}{_(Solution)}
+	  \providecommand{\solutionname}{_(Solution)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
+	  \addto\captions$$lang{\renewcommand{\solutionname}{_(Solution)}}
 	EndBabelPreamble
 End
 
@@ -285,9 +291,10 @@ Style Sol
 	LabelType	Static
 	LabelString	"# [number of Prob]"
 	Argument 1
-		Mandatory     1
-		LabelString   "Solution"
-		Tooltip       "Mandatory argument to the sol environment"
+	  Mandatory	1
+	  LabelString	"Label of Problem"
+	  Tooltip	"Label of the corresponding problem"
+	  IsTocCaption true
 	EndArgument
 End
 
@@ -301,10 +308,10 @@ Style Exercise
 	LabelString	"Exercise \theexercise."
 	RefPrefix	exer
 	LangPreamble
-		\providecommand{\exercisename}{_(Exercise)}
+	  \providecommand{\exercisename}{_(Exercise)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
+	  \addto\captions$$lang{\renewcommand{\exercisename}{_(Exercise)}}
 	EndBabelPreamble
 End
 
@@ -318,10 +325,10 @@ Style Remark
 	LabelString	"Remark \theremark."
 	RefPrefix	rem
 	LangPreamble
-		\providecommand{\remarkname}{_(Remark)}
+	  \providecommand{\remarkname}{_(Remark)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
+	  \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}}
 	EndBabelPreamble
 End
 
@@ -331,10 +338,10 @@ Style		Claim
 	LatexName	claim
 	LabelString	"Claim"
 	LangPreamble
-		\providecommand{\claimname}{_(Claim)}
+	  \providecommand{\claimname}{_(Claim)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
+	  \addto\captions$$lang{\renewcommand{\claimname}{_(Claim)}}
 	EndBabelPreamble
 End
 
@@ -348,10 +355,10 @@ Style Case
 	LabelString	"Case \thecase."
 	RefPrefix	case
 	LangPreamble
-		\providecommand{\casename}{_(Case)}
+	  \providecommand{\casename}{_(Case)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
+	  \addto\captions$$lang{\renewcommand{\casename}{_(Case)}}
 	EndBabelPreamble
 End
 
@@ -365,10 +372,10 @@ Style Property
 	LabelString	"Property \theproperty."
 	RefPrefix	prop
 	LangPreamble
-		\providecommand{\propertyname}{_(Property)}
+	  \providecommand{\propertyname}{_(Property)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
+	  \addto\captions$$lang{\renewcommand{\propertyname}{_(Property)}}
 	EndBabelPreamble
 End
 
@@ -382,10 +389,10 @@ Style Question
 	LabelString	"Question \thequestion."
 	RefPrefix	que
 	LangPreamble
-		\providecommand{\questionname}{_(Question)}
+	  \providecommand{\questionname}{_(Question)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
+	  \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
 	EndBabelPreamble
 End
 
@@ -399,10 +406,10 @@ Style Note
 	LabelString	"Note \thenote."
 	RefPrefix	note
 	LangPreamble
-		\providecommand{\notename}{_(Note)}
+	  \providecommand{\notename}{_(Note)}
 	EndLangPreamble
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
+	  \addto\captions$$lang{\renewcommand{\notename}{_(Note)}}
 	EndBabelPreamble
 End