X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBidi.cpp;h=b9d1222931d83f0459b0fc527fb90bf1270e7a6f;hb=dba4f28b6269c0ebd7a4e70a82ca10cf6c4a6ff8;hp=02d0df8026cd10bfd7a4f7f4d4e4bed310b494a8;hpb=a8ed1add4dcae9d44abf78eafc8fbe36e587db88;p=lyx.git

diff --git a/src/Bidi.cpp b/src/Bidi.cpp
index 02d0df8026..b9d1222931 100644
--- a/src/Bidi.cpp
+++ b/src/Bidi.cpp
@@ -13,6 +13,7 @@
 #include "Bidi.h"
 #include "Buffer.h"
 #include "BufferView.h"
+#include "Cursor.h"
 #include "Font.h"
 #include "Row.h"
 #include "LyXRC.h"
@@ -60,7 +61,7 @@ void Bidi::computeTables(Paragraph const & par,
 		return;
 	}
 
-	if (par.ownerCode() == Inset::ERT_CODE || par.ownerCode() == Inset::LISTINGS_CODE) {
+	if (par.inInset().forceLTR()) {
 		start_ = -1;
 		return;
 	}
@@ -108,17 +109,18 @@ void Bidi::computeTables(Paragraph const & par,
 			 !par.isLineSeparator(lpos + 1) &&
 			 !par.isNewline(lpos + 1))
 			? lpos + 1 : lpos;
-		Font font = par.getFontSettings(bufparams, pos);
-		if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
-		    font.number() == Font::ON &&
-		    par.getFontSettings(bufparams, lpos - 1).number()
-		    == Font::ON) {
-			font = par.getFontSettings(bufparams, lpos);
+
+		Font const * font = &(par.getFontSettings(bufparams, pos));
+		if (pos != lpos && 0 < lpos && rtl0 && font->isRightToLeft() &&
+		    font->fontInfo().number() == FONT_ON &&
+		    par.getFontSettings(bufparams, lpos - 1).fontInfo().number()
+		    == FONT_ON) {
+			font = &(par.getFontSettings(bufparams, lpos));
 			is_space = false;
 		}
+		bool new_rtl = font->isVisibleRightToLeft();
+		bool new_rtl0 = font->isRightToLeft();
 
-		bool new_rtl = font.isVisibleRightToLeft();
-		bool new_rtl0 = font.isRightToLeft();
 		int new_level;
 
 		if (lpos == body_pos - 1
@@ -127,10 +129,11 @@ void Bidi::computeTables(Paragraph const & par,
 			new_level = rtl_par ? 1 : 0;
 			new_rtl0 = rtl_par;
 			new_rtl = rtl_par;
-		} else if (new_rtl0)
+		} else if (new_rtl0) {
 			new_level = new_rtl ? 1 : 2;
-		else
+		} else {
 			new_level = rtl_par ? 2 : 0;
+		}
 
 		if (is_space && new_level >= lev) {
 			new_level = lev;
@@ -147,8 +150,9 @@ void Bidi::computeTables(Paragraph const & par,
 			log2vis_list_[lpos - start_] = rtl ? -1 : 1;
 			if (new_level > 0 && !rtl_par)
 				same_direction_ = false;
-		} else
+		} else {
 			log2vis_list_[lpos - start_] = new_rtl ? -1 : 1;
+		}
 		rtl = new_rtl;
 		rtl0 = new_rtl0;
 		levels_[lpos - start_] = new_level;