From e90d01c70708be8d7f59bfdaca266c71633b1167 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 14 Jun 2007 14:14:05 +0000
Subject: [PATCH] Fix bug 3510 (by Jean-Marc)

	* lib/layouts/IEEEtran.layout: Add a proper definition to the
	preamble when using the MarkBoth environment (fix bug 3510).
	Remove white space from begin of line in preamble stuff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@18769 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/IEEEtran.layout | 42 ++++++++++++++++++++-----------------
 status.14x                  |  2 ++
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 57615b4a3d..996210a13d 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -73,7 +73,7 @@ Style Theorem
 	LatexName             thm
 	LabelString           "Theorem #:"
 	Preamble
-	  \newtheorem{thm}{Theorem}
+	\newtheorem{thm}{Theorem}
 	EndPreamble
 End
 
@@ -83,7 +83,7 @@ Style Lemma
 	LatexName             lemma
 	LabelString           "Lemma #:"
 	Preamble
-	  \newtheorem{lemma}{Lemma}
+	\newtheorem{lemma}{Lemma}
 	EndPreamble
 End
 
@@ -93,7 +93,7 @@ Style Corollary
 	LatexName             cor
 	LabelString           "Corollary #:"
 	Preamble
-	  \newtheorem{cor}{Corollary}
+	\newtheorem{cor}{Corollary}
 	EndPreamble
 End
 
@@ -103,7 +103,7 @@ Style Proposition
 	LatexName             prop
 	LabelString           "Proposition #:"
 	Preamble
-	  \newtheorem{prop}{Proposition}
+	\newtheorem{prop}{Proposition}
 	EndPreamble
 End
 
@@ -113,7 +113,7 @@ Style Conjecture
 	LatexName             conject
 	LabelString           "Conjecture #:"
 	Preamble
-	  \newtheorem{conject}{Conjecture}
+	\newtheorem{conject}{Conjecture}
 	EndPreamble
 End
 
@@ -123,7 +123,7 @@ Style Criterion
 	LatexName             criter
 	LabelString           "Criterion #:"
 	Preamble
-	  \newtheorem{criter}{Criterion}
+	\newtheorem{criter}{Criterion}
 	EndPreamble
 End
 
@@ -133,7 +133,7 @@ Style Fact
 	LatexName             fact
 	LabelString           "Fact #:"
 	Preamble
-	  \newtheorem{fact}{Fact}
+	\newtheorem{fact}{Fact}
 	EndPreamble
 End
 
@@ -143,7 +143,7 @@ Style Axiom
 	LatexName             axi
 	LabelString           "Axiom #:"
 	Preamble
-	  \newtheorem{axi}{Axiom}
+	\newtheorem{axi}{Axiom}
 	EndPreamble
 End
 
@@ -153,7 +153,7 @@ Style Definition
 	LatexName             definitn
 	LabelString           "Definition #:"
 	Preamble
-	  \newtheorem{definitn}{Definition}
+	\newtheorem{definitn}{Definition}
 	EndPreamble
 End
 
@@ -163,7 +163,7 @@ Style Example
 	LatexName             example
 	LabelString           "Example #:"
 	Preamble
-	  \newtheorem{example}{Example}
+	\newtheorem{example}{Example}
 	EndPreamble
 End
 
@@ -173,7 +173,7 @@ Style Condition
 	LatexName             condition
 	LabelString           "Condition #:"
 	Preamble
-	  \newtheorem{condition}{Condition}
+	\newtheorem{condition}{Condition}
 	EndPreamble
 End
 
@@ -183,7 +183,7 @@ Style Problem
 	LatexName             problem
 	LabelString           "Problem #:"
 	Preamble
-	  \newtheorem{problem}{Problem}
+	\newtheorem{problem}{Problem}
 	EndPreamble
 End
 
@@ -193,7 +193,7 @@ Style Exercise
 	LatexName             exacise
 	LabelString           "Exercise #:"
 	Preamble
-	  \newtheorem{exacise}{Exercise}
+	\newtheorem{exacise}{Exercise}
 	EndPreamble
 End
 
@@ -203,7 +203,7 @@ Style Remark
 	LatexName             remrk
 	LabelString           "Remark #:"
 	Preamble
-	  \newtheorem{remrk}{Remark}
+	\newtheorem{remrk}{Remark}
 	EndPreamble
 End
 
@@ -213,7 +213,7 @@ Style Claim
 	LatexName             claim
 	LabelString           "Claim #:"
 	Preamble
-	  \newtheorem{claim}{Claim}
+	\newtheorem{claim}{Claim}
 	EndPreamble
 End
 
@@ -223,7 +223,7 @@ Style Note
 	LatexName             note
 	LabelString           "Note #:"
 	Preamble
-	  \newtheorem{note}{Note}
+	\newtheorem{note}{Note}
 	EndPreamble
 End
 
@@ -233,7 +233,7 @@ Style Notation
 	LatexName             notation
 	LabelString           "Notation #:"
 	Preamble
-	  \newtheorem{notation}{Notation}
+	\newtheorem{notation}{Notation}
 	EndPreamble
 End
 
@@ -243,7 +243,7 @@ Style Case
 	LatexName             case
 	LabelString           "Case #:"
 	Preamble
-	  \newtheorem{case}{Case}
+	\newtheorem{case}{Case}
 	EndPreamble
 End
 
@@ -468,9 +468,13 @@ End
 
 Style MarkBoth
 	LaTeXType             Command
-	LaTeXName             markboth
+	LaTeXName             IEEEmarkboth
 	Align                 Center
 	AlignPossible         Center
+	Preamble
+	% protect against redefinition of \markboth by babel >= 3.6
+	\let\IEEEmarkboth=\markboth
+	EndPreamble
 End
 
 
diff --git a/status.14x b/status.14x
index ce6efe2f6c..8011ee94b6 100644
--- a/status.14x
+++ b/status.14x
@@ -101,3 +101,5 @@ What's new
 - Make LyX/Mac recognize correctly newer versions of teTeX.
 
 - Fix that Slovak userguide couldn't be typeset.
+
+- Fix babel bug triggered by MarkBoth in the IEEEtran.layout (bug 3510).