bidi out of line patch from Alfredo

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6557 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index e6c4d0cc6ba9623f6d645668ba8da1e5f9cc58b9..c10063c81706e6becea36a48ca014243b1da6fb7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-21  Alfredo Braunstein  <abraunst@libero.it>
+
+       * lyxtext.h:
+       * text.C: take the rtl methods out of line
 
 2003-03-21 André Pönitz <poenitz@gmx.net>
 
@@ -9,8 +13,8 @@
        * lyxtextclass.C: read 'environment' tag.
 
 2003-03-20  Alfredo Braunstein  <abraunst@libero.it>
- 
-       * text2.C (removeRow): fix bug 964
+
+       * text2.C (removeRow): fix bug 964
 
 2003-03-20  John Levon  <levon@movementarian.org>
 
@@ -73,11 +77,11 @@
        * text2.C: anchor row on setCursor
 
 2003-03-18  Alfredo Braunstein  <abraunst@libero.it>
- 
-       * lyxtext.h: remove almost all mutable keywords
-       * text.C:
-       * text2.C:
-       * text3.C: remove const keywords accordingly
+
+       * lyxtext.h: remove almost all mutable keywords
+       * text.C:
+       * text2.C:
+       * text3.C: remove const keywords accordingly
 
 2003-03-17  Lars Gullik Bjønnes  <larsbj@gullik.net>
 

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 69e670251f98d6a5fd233e9f31edf1c195a9aee6..c5d54c235566bea422359c4c31d98a7bae80ff78 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -487,40 +487,17 @@ public:
        int workWidth() const;
        ///
        int workWidth(Inset * inset) const;
+
        ///
        void computeBidiTables(Buffer const *, Row * row) const;
-
        /// Maps positions in the visual string to positions in logical string.
-       inline
-       lyx::pos_type log2vis(lyx::pos_type pos) const {
-               if (bidi_start == -1)
-                       return pos;
-               else
-                       return log2vis_list[pos-bidi_start];
-       }
-
+       lyx::pos_type log2vis(lyx::pos_type pos) const;
        /// Maps positions in the logical string to positions in visual string.
-       inline
-       lyx::pos_type vis2log(lyx::pos_type pos) const {
-               if (bidi_start == -1)
-                       return pos;
-               else
-                       return vis2log_list[pos-bidi_start];
-       }
-       ///
-       inline
-       lyx::pos_type bidi_level(lyx::pos_type pos) const {
-               if (bidi_start == -1)
-                       return 0;
-               else
-                       return bidi_levels[pos-bidi_start];
-       }
-       ///
-       inline
-       bool bidi_InRange(lyx::pos_type pos) const {
-               return bidi_start == -1 ||
-                       (bidi_start <= pos && pos <= bidi_end);
-       }
+       lyx::pos_type vis2log(lyx::pos_type pos) const;
+       ///
+       lyx::pos_type bidi_level(lyx::pos_type pos) const;
+       ///
+       bool bidi_InRange(lyx::pos_type pos) const;
 private:
        ///
        Row * firstrow;
@@ -655,16 +632,12 @@ private:
 
        ///
        mutable std::vector<lyx::pos_type> log2vis_list;
-
        ///
        mutable std::vector<lyx::pos_type> vis2log_list;
-
        ///
        mutable std::vector<lyx::pos_type> bidi_levels;
-
        ///
        mutable lyx::pos_type bidi_start;
-
        ///
        mutable lyx::pos_type bidi_end;
 

diff --git a/src/text.C b/src/text.C
index 31503276164089e410f58c696961fa3724eff4f7..27737df2376b9205928b2a315f46e955414c0f8d 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -300,6 +300,40 @@ int LyXText::singleWidth(Paragraph * par,
 }
 
 
+lyx::pos_type LyXText::log2vis(lyx::pos_type pos) const 
+{
+       if (bidi_start == -1)
+               return pos;
+       else
+               return log2vis_list[pos-bidi_start];
+}
+
+
+lyx::pos_type LyXText::vis2log(lyx::pos_type pos) const 
+{
+       if (bidi_start == -1)
+               return pos;
+       else
+               return vis2log_list[pos-bidi_start];
+}
+
+
+lyx::pos_type LyXText::bidi_level(lyx::pos_type pos) const 
+{
+       if (bidi_start == -1)
+               return 0;
+       else
+               return bidi_levels[pos-bidi_start];
+}
+
+
+bool LyXText::bidi_InRange(lyx::pos_type pos) const 
+{
+       return bidi_start == -1 ||
+               (bidi_start <= pos && pos <= bidi_end);
+}
+
+
 void LyXText::computeBidiTables(Buffer const * buf, Row * row) const
 {
        bidi_same_direction = true;