* Get rid of LFUN_TOC_INSERT: we use LFUN_INSET_INSERT "toc".

[lyx.git] / src / Bidi.cpp

diff --git a/src/Bidi.cpp b/src/Bidi.cpp
index 5a979eff55634eae1d93e68ca0a7f846ac030eb1..b9d1222931d83f0459b0fc527fb90bf1270e7a6f 100644 (file)
--- a/src/Bidi.cpp
+++ b/src/Bidi.cpp
@@ -12,7 +12,9 @@
 
 #include "Bidi.h"
 #include "Buffer.h"
-#include "LyXFont.h"
+#include "BufferView.h"
+#include "Cursor.h"
+#include "Font.h"
 #include "Row.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
@@ -59,7 +61,7 @@ void Bidi::computeTables(Paragraph const & par,
                return;
        }
 
-       if (par.ownerCode() == InsetBase::ERT_CODE) {
+       if (par.inInset().forceLTR()) {
                start_ = -1;
                return;
        }
@@ -87,30 +89,38 @@ void Bidi::computeTables(Paragraph const & par,
 
        BufferParams const & bufparams = buf.params();
        pos_type stack[2];
-       bool const rtl_par = par.isRightToLeftPar(bufparams);
+       bool const rtl_par = par.isRTL(bufparams);
        int lev = 0;
        bool rtl = false;
        bool rtl0 = false;
        pos_type const body_pos = par.beginOfBody();
 
        for (pos_type lpos = start_; lpos <= end_; ++lpos) {
-               bool is_space = par.isLineSeparator(lpos);
+               bool is_space = false;
+               // We do not handle spaces around an RTL segment in a special way anymore.
+               // Neither do we do so when generating the LaTeX, so setting is_space
+               // to false makes the view in the GUI consistent with the output of LaTeX 
+               // later. The old setting was:
+               //bool is_space = par.isLineSeparator(lpos);
+               // FIXME: once we're sure that this is what we really want, we should just
+               // get rid of this variable...
                pos_type const pos =
                        (is_space && lpos + 1 <= end_ &&
                         !par.isLineSeparator(lpos + 1) &&
                         !par.isNewline(lpos + 1))
                        ? lpos + 1 : lpos;
-               LyXFont font = par.getFontSettings(bufparams, pos);
-               if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
-                   font.number() == LyXFont::ON &&
-                   par.getFontSettings(bufparams, lpos - 1).number()
-                   == LyXFont::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
@@ -119,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;
@@ -139,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;
@@ -190,13 +202,13 @@ bool Bidi::isBoundary(Buffer const & buf, Paragraph const & par,
        bool const rtl = level(pos - 1) % 2;
        bool const rtl2 = inRange(pos)
                ? level(pos) % 2
-               : par.isRightToLeftPar(buf.params());
+               : par.isRTL(buf.params());
        return rtl != rtl2;
 }
 
 
 bool Bidi::isBoundary(Buffer const & buf, Paragraph const & par,
-       pos_type pos, LyXFont const & font) const
+       pos_type pos, Font const & font) const
 {
        if (!lyxrc.rtl_support)
                return false;    // This is just for speedup
@@ -204,9 +216,27 @@ bool Bidi::isBoundary(Buffer const & buf, Paragraph const & par,
        bool const rtl = font.isVisibleRightToLeft();
        bool const rtl2 = inRange(pos)
                ? level(pos) % 2
-               : par.isRightToLeftPar(buf.params());
+               : par.isRTL(buf.params());
        return rtl != rtl2;
 }
 
 
+bool reverseDirectionNeeded(Cursor const & cur)
+{
+       /*
+        * We determine the directions based on the direction of the
+        * bottom() --- i.e., outermost --- paragraph, because that is
+        * the only way to achieve consistency of the arrow's movements
+        * within a paragraph, and thus avoid situations in which the
+        * cursor gets stuck.
+        */
+       return cur.bottom().paragraph().isRTL(cur.bv().buffer().params());
+}
+
+
+bool isWithinRtlParagraph(Cursor const & cur)
+{
+       return cur.innerParagraph().isRTL(cur.bv().buffer().params());
+}
+
 } // namespace lyx