Update it.po

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 32c0ea0cf71349d9ad1ee5436e3da5be6ba5081f..7232e88e0f14f0a2837a90d8d9ad13d760c8d5bd 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -249,13 +249,13 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up)
 
 docstring parbreak(Paragraph const & par)
 {
-       odocstringstream ods;
-       ods << '\n';
+       odocstringstream os;
+       os << '\n';
        // only add blank line if we're not in an ERT or Listings inset
        if (par.ownerCode() != ERT_CODE
                        && par.ownerCode() != LISTINGS_CODE)
-               ods << '\n';
-       return ods.str();
+               os << '\n';
+       return os.str();
 }
 
 } // namespace anon
@@ -507,10 +507,11 @@ bool Cursor::posVisRight(bool skip_inset)
                        new_cur.pos() = right_pos + 1;
                        // set the boundary to true in two situations:
                        if (
-                       // 1. if new_pos is now lastpos (which means that we're moving 
-                       // right to the end of an LTR chunk which is at the end of an
-                       // RTL paragraph);
-                               new_cur.pos() == lastpos()
+                       // 1. if new_pos is now lastpos, and we're in an RTL paragraph
+                       // (this means that we're moving right to the end of an LTR chunk
+                       // which is at the end of an RTL paragraph);
+                               (new_cur.pos() == lastpos()
+                                && paragraph().isRTL(buffer().params()))
                        // 2. if the position *after* right_pos is RTL (we want to be 
                        // *after* right_pos, not before right_pos + 1!)
                                || paragraph().getFontSettings(bv().buffer().params(),
@@ -598,10 +599,11 @@ bool Cursor::posVisLeft(bool skip_inset)
                        new_cur.pos() = left_pos + 1;
                        // set the boundary to true in two situations:
                        if (
-                       // 1. if new_pos is now lastpos (which means that we're moving left
-                       // to the end of an RTL chunk which is at the end of an LTR 
-                       // paragraph);
-                               new_cur.pos() == lastpos()
+                       // 1. if new_pos is now lastpos and we're in an LTR paragraph
+                       // (this means that we're moving left to the end of an RTL chunk
+                       // which is at the end of an LTR paragraph);
+                               (new_cur.pos() == lastpos()
+                                && !paragraph().isRTL(buffer().params()))
                        // 2. if the position *after* left_pos is not RTL (we want to be 
                        // *after* left_pos, not before left_pos + 1!)
                                || !paragraph().getFontSettings(bv().buffer().params(),
@@ -980,20 +982,20 @@ DocIterator Cursor::selectionEnd() const
 
 void Cursor::setSelection()
 {
-       selection() = true;
+       setSelection(true);
        // A selection with no contents is not a selection
        // FIXME: doesnt look ok
        if (idx() == anchor().idx() && 
            pit() == anchor().pit() && 
            pos() == anchor().pos())
-               selection() = false;
+               setSelection(false);
 }
 
 
 void Cursor::setSelection(DocIterator const & where, int n)
 {
        setCursor(where);
-       selection() = true;
+       setSelection(true);
        anchor_ = where;
        pos() += n;
 }
@@ -1001,8 +1003,8 @@ void Cursor::setSelection(DocIterator const & where, int n)
 
 void Cursor::clearSelection()
 {
-       selection() = false;
-       mark() = false;
+       setSelection(false);
+       setMark(false);
        resetAnchor();
 }
 
@@ -1065,7 +1067,7 @@ bool Cursor::selHandle(bool sel)
                cap::saveSelection(*this);
 
        resetAnchor();
-       selection() = sel;
+       setSelection(sel);
        return true;
 }
 
@@ -1242,10 +1244,10 @@ void Cursor::insert(Inset * inset0)
 }
 
 
-void Cursor::niceInsert(docstring const & t)
+void Cursor::niceInsert(docstring const & t, Parse::flags f)
 {
        MathData ar;
-       asArray(t, ar);
+       asArray(t, ar, f);
        if (ar.size() == 1)
                niceInsert(ar[0]);
        else
@@ -1324,7 +1326,7 @@ bool Cursor::backspace()
                // let's require two backspaces for 'big stuff' and
                // highlight on the first
                resetAnchor();
-               selection() = true;
+               setSelection(true);
                --pos();
        } else {
                --pos();
@@ -1372,7 +1374,7 @@ bool Cursor::erase()
        // 'clever' UI hack: only erase large items if previously slected
        if (pos() != lastpos() && nextAtom()->nargs() > 0) {
                resetAnchor();
-               selection() = true;
+               setSelection(true);
                ++pos();
        } else {
                plainErase();
@@ -1829,6 +1831,8 @@ void Cursor::handleFont(string const & font)
                safe = cap::grabAndEraseSelection(*this);
        }
 
+       recordUndoInset();
+
        if (lastpos() != 0) {
                // something left in the cell
                if (pos() == 0) {
@@ -1848,8 +1852,9 @@ void Cursor::handleFont(string const & font)
                }
        } else {
                // nothing left in the cell
-               pullArg();
+               popBackward();
                plainErase();
+               resetAnchor();
        }
        insert(safe);
 }
@@ -2189,11 +2194,8 @@ void Cursor::recordUndoSelection() const
 
 void Cursor::checkBufferStructure()
 {
-       if (paragraph().layout().toclevel == Layout::NOT_IN_TOC)
-               return;
        Buffer const * master = buffer().masterBuffer();
-       master->tocBackend().updateItem(ParConstIterator(*this));
-       master->structureChanged();
+       master->tocBackend().updateItem(*this);
 }