fix bug with language changes in nested environment

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@5504 a592a061-630c-0410-9148-cb99ea01b6c8

lib/ChangeLog

@@ -1,3 +1,7 @@
+2002-10-23  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* kbd/koi8-u.kmap: Fix crash when using the map.
+
 2002-10-23  Gady Kozma  <gadykozma@yahoo.com>
 
 	* examples/he_example_raw.lyx:

src/ChangeLog

@@ -1,3 +1,8 @@
+2002-10-24  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* paragraph.C (TeXOnePar): Fix bug with language changes in nested
+	environment.
+
 2002-10-14  Juergen Vigna  <jug@sad.it>
 
 	* undo_funcs.C (textHandleUndo): alter the order in which the

src/paragraph.C

@@ -1311,8 +1311,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	if (language->babel() != previous_language->babel()
 	    // check if we already put language command in TeXEnvironment()
 	    && !(style.isEnvironment()
-		 && (!previous() || previous()->layout() != layout() ||
-			 previous()->params().depth() != params().depth())))
+		 && (!previous() ||
+		     (previous()->layout() != layout() &&
+		      previous()->getDepth() <= getDepth())
+		     || previous()->getDepth() < getDepth())))
 	{
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel())

status.12x

@@ -39,6 +39,10 @@ What's new
 
 ** Bug fixes
 
+- fix bug with language changes in nested environment
+
+- fix crash when using koi8-u keymap
+
 - fix bug where special characters in equations label confuse LyX
   (this was a new bug in 1.2.1)