From 6c27ed49faf813b88caad222a384a1ce9cf6d642 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Thu, 22 Sep 2011 07:49:25 +0000
Subject: [PATCH] backport r39696 Timestamp: 09/17/11 17:25:14 (5 days ago)
 Author: spitz Message: finally commit the fix for #7607.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39729 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/output_latex.cpp | 9 ++++++++-
 status.20x           | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 3361330983..0d549f3791 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -720,6 +720,7 @@ void TeXOnePar(Buffer const & buf,
 	}
 
 	bool pending_newline = false;
+	bool unskip_newline = false;
 	switch (style.latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
@@ -793,6 +794,7 @@ void TeXOnePar(Buffer const & buf,
 						"$$lang",
 						current_lang));
 					pending_newline = true;
+					unskip_newline = true;
 				}
 			} else if (!par_lang.empty()) {
 				os << from_ascii(subst(
@@ -800,14 +802,19 @@ void TeXOnePar(Buffer const & buf,
 					"$$lang",
 					par_lang));
 				pending_newline = true;
+				unskip_newline = true;
 			}
 		}
 	}
 	if (closing_rtl_ltr_environment)
 		os << "}";
 
-	if (pending_newline)
+	if (pending_newline) {
+		if (unskip_newline)
+			// prevent unwanted whitespace
+			os << '%';
 		os << '\n';
+	}
 
 	// if this is a CJK-paragraph and the next isn't, close CJK
 	// also if the next paragraph is a multilingual environment (because of nesting)
diff --git a/status.20x b/status.20x
index eb7111f6b3..309440c78a 100644
--- a/status.20x
+++ b/status.20x
@@ -82,6 +82,8 @@ What's new
 
 - Fix XHTML export of branches (bug 7721).
 
+- Fix whitespace issues with language changes (bug 7607).
+
 
 * USER INTERFACE
 
-- 
2.39.5