* layouts/amsmaths-seq.inc:

* layouts/amsmaths.inc: make sure that the preamble of the Theorem
	layout is output when using other theorem like layouts that
	need its counter (bug 4282).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21174 a592a061-630c-0410-9148-cb99ea01b6c8

lib/layouts/amsmaths-seq.inc

@@ -159,6 +159,7 @@ End
 
 Style Corollary
 	LabelCounter          corollary
+	DependsOn	      ""
 	LabelString           "Corollary \arabic{corollary}."
 	Preamble
 	  \theoremstyle{plain}
@@ -169,6 +170,7 @@ End
 
 Style Lemma
 	LabelCounter          lemma
+	DependsOn	      ""
 	LabelString           "Lemma \arabic{lemma}."
 	Preamble
 	  \theoremstyle{plain}
@@ -179,6 +181,7 @@ End
 
 Style Proposition
 	LabelCounter          proposition
+	DependsOn	      ""
 	LabelString           "Proposition \arabic{proposition}."
 	Preamble
 	  \theoremstyle{plain}
@@ -189,6 +192,7 @@ End
 
 Style Conjecture
 	LabelCounter          conjecture
+	DependsOn	      ""
 	LabelString           "Conjecture \arabic{conjecture}."
 	Preamble
 	  \theoremstyle{plain}
@@ -199,6 +203,7 @@ End
 
 Style Criterion
 	LabelCounter          criterion
+	DependsOn	      ""
 	LabelString           "Criterion \arabic{criterion}."
 	Preamble
 	  \theoremstyle{plain}
@@ -209,6 +214,7 @@ End
 
 Style Algorithm
 	LabelCounter          algorithm
+	DependsOn	      ""
 	LabelString           "Algorithm \arabic{algorithm}."
 	Preamble
 	  \theoremstyle{plain}
@@ -219,6 +225,7 @@ End
 
 Style Fact
 	LabelCounter          fact
+	DependsOn	      ""
 	LabelString           "Fact \arabic{fact}."
 	Preamble
 	  \theoremstyle{plain}
@@ -229,6 +236,7 @@ End
 
 Style Axiom
 	LabelCounter          axiom
+	DependsOn	      ""
 	LabelString           "Axiom \arabic{axiom}."
 	Preamble
 	  \theoremstyle{plain}
@@ -239,6 +247,7 @@ End
 
 Style Definition
 	LabelCounter          definition
+	DependsOn	      ""
 	LabelString           "Definition \arabic{definition}."
 	Preamble
 	 \theoremstyle{definition}
@@ -249,6 +258,7 @@ End
 
 Style Example
 	LabelCounter          example
+	DependsOn	      ""
 	LabelString           "Example \arabic{example}."
 	Preamble
 	 \theoremstyle{definition}
@@ -259,6 +269,7 @@ End
 
 Style Condition
 	LabelCounter          condition
+	DependsOn	      ""
 	LabelString           "Condition \arabic{condition}."
 	Preamble
 	 \theoremstyle{definition}
@@ -269,6 +280,7 @@ End
 
 Style Problem
 	LabelCounter          problem
+	DependsOn	      ""
 	LabelString           "Problem \arabic{problem}."
 	Preamble
 	 \theoremstyle{definition}
@@ -279,6 +291,7 @@ End
 
 Style Exercise
 	LabelCounter          exercise
+	DependsOn	      ""
 	LabelString           "Exercise \arabic{exercise}."
 	Preamble
 	 \theoremstyle{definition}
@@ -289,6 +302,7 @@ End
 
 Style Remark
 	LabelCounter          remark
+	DependsOn	      ""
 	LabelString           "Remark \arabic{remark}."
 	Preamble
 	  \theoremstyle{remark}
@@ -299,6 +313,7 @@ End
 
 Style Claim
 	LabelCounter          claim
+	DependsOn	      ""
 	LabelString           "Claim \arabic{claim}."
 	Preamble
 	  \theoremstyle{remark}
@@ -309,6 +324,7 @@ End
 
 Style Note
 	LabelCounter          note
+	DependsOn	      ""
 	LabelString           "Note \arabic{note}."
 	Preamble
 	  \theoremstyle{remark}
@@ -319,6 +335,7 @@ End
 
 Style Notation
 	LabelCounter          notation
+	DependsOn	      ""
 	LabelString           "Notation \arabic{notation}."
 	Preamble
 	  \theoremstyle{remark}
@@ -329,6 +346,7 @@ End
 
 Style Summary
 	LabelCounter          summary
+	DependsOn	      ""
 	LabelString           "Summary \arabic{summary}."
 	Preamble
 	  \theoremstyle{remark}
@@ -339,6 +357,7 @@ End
 
 Style Acknowledgement
 	LabelCounter          acknowledgement
+	DependsOn	      ""
 	LabelString           "Acknowledgement \arabic{acknowledgement}."
 	Preamble
 	  \theoremstyle{remark}
@@ -349,6 +368,7 @@ End
 
 Style Conclusion
 	LabelCounter          conclusion
+	DependsOn	      ""
 	LabelString           "Conclusion \arabic{conclusion}."
 	Preamble
 	  \theoremstyle{remark}
@@ -359,6 +379,7 @@ End
 
 Style Assumption
 	LabelCounter          assumption
+	DependsOn	      ""
 	LabelString           "Assumption \arabic{assumption}."
 	Preamble
 	  \theoremstyle{plain}

lib/layouts/amsmaths.inc

@@ -45,7 +45,6 @@ Style Theorem
 	Margin                First_Dynamic
 	LatexType             Environment
 	LatexName             thm
-	#DependsOn             TheoremStyle
 	NextNoIndent          1
 	LabelSep              xx
 	ParIndent             MMM
@@ -88,6 +87,7 @@ End
 
 Style Corollary
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             cor
 	LabelString           "Corollary @Section@.\arabic{theorem}."
 	Preamble
@@ -110,6 +110,7 @@ End
 
 Style Lemma
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             lem
 	LabelString           "Lemma @Section@.\arabic{theorem}."
 	Preamble
@@ -132,6 +133,7 @@ End
 
 Style Proposition
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             prop
 	LabelString           "Proposition @Section@.\arabic{theorem}."
 	Preamble
@@ -154,6 +156,7 @@ End
 
 Style Conjecture
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             conjecture
 	LabelString           "Conjecture @Section@.\arabic{theorem}."
 	Preamble
@@ -176,6 +179,7 @@ End
 
 Style Criterion
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             criterion
 	LabelString           "Criterion @Section@.\arabic{theorem}."
 	Preamble
@@ -197,6 +201,7 @@ End
 
 Style Algorithm
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             algorithm
 	LabelString           "Algorithm @Section@.\arabic{theorem}."
 	Preamble
@@ -219,6 +224,7 @@ End
 
 Style Fact
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             fact
 	LabelString           "Fact @Section@.\arabic{theorem}."
 	Preamble
@@ -241,6 +247,7 @@ End
 
 Style Axiom
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             ax
 	LabelString           "Axiom @Section@.\arabic{theorem}."
 	Preamble
@@ -263,6 +270,7 @@ End
 
 Style Definition
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             defn
 	LabelString           "Definition @Section@.\arabic{theorem}."
 	Font
@@ -381,6 +389,7 @@ End
 
 Style Remark
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             rem
 	LabelString           "Remark @Section@.\arabic{theorem}."
 	Font
@@ -544,6 +553,7 @@ End
 
 Style Assumption
 	CopyStyle             Theorem
+	DependsOn	      Theorem
 	LatexName             assumption
 	LabelString           "Assumption @Section@.\arabic{theorem}."
 	Preamble