Correct tex2lyx/roundtrip/test-structure.tex test.

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 6c8844ce31cb68e452097638642170845605e1d1..cd796458de12c4f551aea72f5e4d2d4094488082 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -957,9 +957,8 @@ bool Cursor::posVisToNewRow(bool movingLeft)
 
        // Inside a table, determining whether to move to the next or
        // previous row should be done based on the table's direction.
-       int s = depth() - 1;
-       if (s >= 1 && (*this)[s].inset().asInsetTabular()) {
-               par_is_LTR = !(*this)[s].inset().asInsetTabular()->isRightToLeft(*this);
+       if (inset().asInsetTabular()) {
+               par_is_LTR = !inset().asInsetTabular()->isRightToLeft(*this);
                LYXERR(Debug::RTL, "Inside table! par_is_LTR=" << (par_is_LTR ? 1 : 0));
        }
 
@@ -1180,8 +1179,6 @@ void Cursor::info(odocstream & os) const
                if (inset)
                        prevInset()->infoize2(os);
        }
-       // overwite old message
-       os << "                    ";
 }
 
 
@@ -1687,7 +1684,9 @@ void Cursor::normalize()
                        << pos() << ' ' << lastpos() <<  " in idx: " << idx()
                       << " in atom: '";
                odocstringstream os;
-               WriteStream wi(os, false, true, WriteStream::wsDefault);
+               TexRow texrow(false);
+               otexrowstream ots(os,texrow);
+               WriteStream wi(ots, false, true, WriteStream::wsDefault);
                inset().asInsetMath()->write(wi);
                lyxerr << to_utf8(os.str()) << endl;
                pos() = lastpos();
@@ -2107,6 +2106,13 @@ docstring Cursor::currentState() const
        if (inMathed()) {
                odocstringstream os;
                info(os);
+#ifdef DEVEL_VERSION
+               InsetMath * math = inset().asInsetMath();
+               if (math)
+                       os << _(", Inset: ") << math->id();
+               os << _(", Cell: ") << idx();
+               os << _(", Position: ") << pos();
+#endif
                return os.str();
        }