* cs.po

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index b385f025a128175f7cd2942231ec629d29b9ad60..70d31860f662fde0fb094a809f60eabbf2d5a24b 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -468,7 +468,7 @@ bool Cursor::posVisRight(bool skip_inset)
        new_cur.pos() = right_pos;
        new_cur.boundary(false);
        if (!skip_inset &&
-               text()->checkAndActivateInsetVisual(new_cur, right_pos>=pos(), false)) {
+               text()->checkAndActivateInsetVisual(new_cur, right_pos >= pos(), false)) {
                // we actually move the cursor at the end of this function, for now
                // we just keep track of the new position in new_cur...
                LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos());
@@ -968,7 +968,9 @@ void Cursor::setSelection()
        selection() = true;
        // A selection with no contents is not a selection
        // FIXME: doesnt look ok
-       if (pit() == anchor().pit() && pos() == anchor().pos())
+       if (idx() == anchor().idx() && 
+           pit() == anchor().pit() && 
+           pos() == anchor().pos())
                selection() = false;
 }
 
@@ -1559,7 +1561,7 @@ void Cursor::normalize()
                        << pos() << ' ' << lastpos() <<  " in idx: " << idx()
                       << " in atom: '";
                odocstringstream os;
-               WriteStream wi(os, false, true);
+               WriteStream wi(os, false, true, false);
                inset().asInsetMath()->write(wi);
                lyxerr << to_utf8(os.str()) << endl;
                pos() = lastpos();
@@ -1850,17 +1852,28 @@ void Cursor::errorMessage(docstring const & msg) const
 }
 
 
-docstring Cursor::selectionAsString(bool label) const
+docstring Cursor::selectionAsString(bool with_label) const
 {
        if (!selection())
                return docstring();
 
+       int const label = with_label
+               ? AS_STR_LABEL | AS_STR_INSETS : AS_STR_INSETS;
+
        if (inTexted()) {
+               idx_type const startidx = selBegin().idx();
+               idx_type const endidx = selEnd().idx();
+               if (startidx != endidx) {
+                       // multicell selection
+                       InsetTabular * table = inset().asInsetTabular();
+                       LASSERT(table, return docstring());
+                       return table->asString(startidx, endidx);
+               }
+               
                ParagraphList const & pars = text()->paragraphs();
 
-               // should be const ...
-               pit_type startpit = selBegin().pit();
-               pit_type endpit = selEnd().pit();
+               pit_type const startpit = selBegin().pit();
+               pit_type const endpit = selEnd().pit();
                size_t const startpos = selBegin().pos();
                size_t const endpos = selEnd().pos();
 
@@ -1892,7 +1905,7 @@ docstring Cursor::selectionAsString(bool label) const
 }
 
 
-docstring Cursor::currentState()
+docstring Cursor::currentState() const
 {
        if (inMathed()) {
                odocstringstream os;
@@ -1907,7 +1920,7 @@ docstring Cursor::currentState()
 }
 
 
-docstring Cursor::getPossibleLabel()
+docstring Cursor::getPossibleLabel() const
 {
        return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
 }
@@ -1987,7 +2000,6 @@ bool Cursor::fixIfBroken()
 {
        if (DocIterator::fixIfBroken()) {
                        clearSelection();
-                       resetAnchor();
                        return true;
        }
        return false;
@@ -2079,8 +2091,7 @@ bool Cursor::textUndo()
                return false;
        // Set cursor
        setCursor(dit);
-       selection() = false;
-       resetAnchor();
+       clearSelection();
        fixIfBroken();
        return true;
 }
@@ -2094,50 +2105,61 @@ bool Cursor::textRedo()
                return false;
        // Set cursor
        setCursor(dit);
-       selection() = false;
-       resetAnchor();
+       clearSelection();
        fixIfBroken();
        return true;
 }
 
 
-void Cursor::finishUndo()
+void Cursor::finishUndo() const
 {
        bv_->buffer().undo().finishUndo();
 }
 
 
-void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to)
+void Cursor::beginUndoGroup() const
+{
+       bv_->buffer().undo().beginUndoGroup();
+}
+
+
+void Cursor::endUndoGroup() const
+{
+       bv_->buffer().undo().endUndoGroup();
+}
+
+
+void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) const
 {
        bv_->buffer().undo().recordUndo(*this, kind, from, to);
 }
 
 
-void Cursor::recordUndo(UndoKind kind, pit_type from)
+void Cursor::recordUndo(UndoKind kind, pit_type from) const
 {
        bv_->buffer().undo().recordUndo(*this, kind, from);
 }
 
 
-void Cursor::recordUndo(UndoKind kind)
+void Cursor::recordUndo(UndoKind kind) const
 {
        bv_->buffer().undo().recordUndo(*this, kind);
 }
 
 
-void Cursor::recordUndoInset(UndoKind kind)
+void Cursor::recordUndoInset(UndoKind kind) const
 {
        bv_->buffer().undo().recordUndoInset(*this, kind);
 }
 
 
-void Cursor::recordUndoFullDocument()
+void Cursor::recordUndoFullDocument() const
 {
        bv_->buffer().undo().recordUndoFullDocument(*this);
 }
 
 
-void Cursor::recordUndoSelection()
+void Cursor::recordUndoSelection() const
 {
        if (inMathed()) {
                if (cap::multipleCellsSelected(*this))