From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 23 Jul 2012 06:40:37 +0000 (+0200)
Subject: Suppress babel RTL commands when using polyglossia (part of #8251)
X-Git-Tag: 2.1.0beta1~1632
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a1e2e12ba4443c2d67a96fcabbddc9337598f828;p=features.git

Suppress babel RTL commands when using polyglossia (part of #8251)
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d93594a678..807abbde80 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1076,6 +1076,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
 	odocstream::pos_type const len = os.os().tellp();
 
 	if (inset->forceLTR()
+	    && !runparams.use_polyglossia
 	    && running_font.isRightToLeft()
 	    // ERT is an exception, it should be output with no
 	    // decorations at all
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 8e796dbbf9..58505cc45c 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2493,7 +2493,8 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 		Paragraph const & par = inset->paragraphs().front();
 		bool rtl = par.isRTL(buffer().params())
 			&& !par.empty()
-			&& getPWidth(cell).zero();
+			&& getPWidth(cell).zero()
+			&& !runparams.use_polyglossia;
 
 		if (rtl) {
 			string const lang =