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

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 389e29267c191653718376d5c523648b9a3c1feb..55df8b45204d1d880b3a8e2bdd7f917b51e7be8b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1068,6 +1068,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 1e91d5cb883273602826219faee4d9779291e952..768b8cffe8a17a1d7ddfe6e54333af386c0df8ab 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2518,7 +2518,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 =

diff --git a/status.20x b/status.20x
index c7205663ab63947bb289bf87499b1c6fd2d1ca6c..65a6e572fbcc6a3ec5f9309543178ac9f10dfac0 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -88,11 +88,14 @@ What's new
 
 - Write correct DTD for MathML (bug #8160).
 
-- Make the ~ char in Basque, Estonian and Galician non-active (bug #8265).
+- Make the ~ char in Basque, Estonian and Galician non-active (bug 8265).
 
 - Embrace babel settings to \makeatletter ... \makeatother if they contain
   an @ glyph.
 
+- Fix LaTeX errors with right-to-left text when using XeTeX/Polyglossia
+  (part of bug 8251).
+
 
 * USER INTERFACE