more changes, read the Changelog

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index d28498c7a0fe21268c55409aa6baf4996dd37f43..3f3a0238a15895868df184251c19a3b1f6c64c18 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -10,9 +10,12 @@
 #include <config.h>
 
 #include "CutAndPaste.h"
+#include "BufferView.h"
+#include "buffer.h"
 #include "lyxparagraph.h"
 #include "insets/inseterror.h"
 #include "lyx_gui_misc.h"
+#include "lyxcursor.h"
 
 #ifdef __GNUG__
 #pragma implementation
@@ -20,6 +23,8 @@
 
 using std::pair;
 
+extern BufferView * current_view;
+
 // Jürgen, note that this means that you cannot currently have a list
 // of selections cut/copied. So IMHO later we should have a
 // list/vector/deque that we could store
@@ -81,23 +86,30 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
        if (end > startpar->Last())
            end = startpar->Last();
        for (; i < end; ++i) {
-           startpar->CopyIntoMinibuffer(start);
+           startpar->CopyIntoMinibuffer(current_view->buffer()->params,
+                                        start);
+#ifndef NEW_TABULAR
            /* table stuff -- begin */
            if (startpar->table && startpar->IsNewline(start)) {
                ++start;
            } else {
                /* table stuff -- end */
+#endif
                startpar->Erase(start);
+#ifndef NEW_TABULAR
            }
+#endif
            buf->InsertFromMinibuffer(buf->Last());
        }
     } else {
        // more than one paragraph
-       (*endpar)->BreakParagraphConservative(end);
+       (*endpar)->BreakParagraphConservative(current_view->buffer()->params,
+                                             end);
        *endpar = (*endpar)->Next();
        end = 0;
    
-       startpar->BreakParagraphConservative(start);
+       startpar->BreakParagraphConservative(current_view->buffer()->params,
+                                            start);
 
        // store the selection
        buf = startpar->ParFromPos(start)->next;
@@ -123,10 +135,12 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
    
        // paste the paragraphs again, if possible
        if (doclear)
-           startpar->Next()->ClearParagraph();
+           startpar->Next()->StripLeadingSpaces(textclass);
        if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) || 
-           !startpar->Next()->Last())
-           startpar->ParFromPos(start)->PasteParagraph();
+           !startpar->Next()->Last()) {
+           startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
+           (*endpar) = startpar; // this because endpar gets deleted here!
+       }
     }
     return true;
 }
@@ -150,7 +164,7 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
        if (end > startpar->Last())
            end = startpar->Last();
        for (; i < end; ++i) {
-           startpar->CopyIntoMinibuffer(i);
+           startpar->CopyIntoMinibuffer(current_view->buffer()->params, i);
            buf->InsertFromMinibuffer(buf->Last());
        }
     } else {
@@ -211,6 +225,7 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
     if (!buf->next) {
        // only within a paragraph
        tmpbuf = buf->Clone();
+#ifndef NEW_TABULAR
        /* table stuff -- begin */
        bool table_too_small = false;
        if ((*par)->table) {
@@ -231,7 +246,7 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
                    if (!tmppos && buf->IsLineSeparator(0)) {
                        buf->Erase(0);
                    } else {
-                       buf->CutIntoMinibuffer(0);
+                       buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
                        buf->Erase(0);
                        if (tmppar->InsertFromMinibuffer(tmppos))
                            ++tmppos;
@@ -240,6 +255,7 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
            }
        } else {
            /* table stuff -- end */
+#endif
            // Some provisions should be done here for checking
            // if we are inserting at the beginning of a
            // paragraph. If there are a space at the beginning
@@ -253,13 +269,15 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
                if (!tmppos && buf->IsLineSeparator(0)) {
                    buf->Erase(0);
                } else {
-                   buf->CutIntoMinibuffer(0);
+                   buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
                    buf->Erase(0);
                    if (tmppar->InsertFromMinibuffer(tmppos))
                        ++tmppos;
                }
            }
+#ifndef NEW_TABULAR
        }
+#endif
        delete buf;
        buf = tmpbuf;
        *endpar = tmppar->Next();
@@ -303,7 +321,8 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
        // open the paragraph for inserting the buf
        // if necessary
        if (((*par)->Last() > pos) || !(*par)->Next()) {
-           (*par)->BreakParagraphConservative(pos);
+           (*par)->BreakParagraphConservative(current_view->buffer()->params,
+                                              pos);
            paste_the_end = true;
        }
        
@@ -322,28 +341,27 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
        if ((*par)->ParFromPos(pos)->Next() == lastbuffer)
            lastbuffer = *par;
        
-       (*par)->ParFromPos(pos)->PasteParagraph();
+       (*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
        
        // store the new cursor position
-       tmppar = lastbuffer;
-       tmppos = lastbuffer->Last();
+       *par = lastbuffer;
+       pos = lastbuffer->Last();
        
        // maybe some pasting
        if (lastbuffer->Next() && paste_the_end) {
            if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
-               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
            } else if (!lastbuffer->Next()->Last()) {
                lastbuffer->Next()->MakeSameLayout(lastbuffer);
-               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
            } else if (!lastbuffer->Last()) {
                lastbuffer->MakeSameLayout(lastbuffer->next);
-               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+               lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
            } else
-               lastbuffer->Next()->ClearParagraph();
+               lastbuffer->Next()->StripLeadingSpaces(tc);
        }
        // restore the simple cut buffer
        buf = simple_cut_clone;
-       pos = tmppos;
     }
 
     return true;
@@ -387,14 +405,13 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
        
        if (name != textclasslist.NameOfLayout(c2, par->layout)) {
            ++ret;
-           string s = "Layout had to be changed from\n"
-               + name + " to "
-               + textclasslist.NameOfLayout(c2, par->layout)
-               + "\nbecause of class conversion from\n"
-               + textclasslist.NameOfClass(c1) + " to "
-               + textclasslist.NameOfClass(c2);
+           string s = _("Layout had to be changed from\n")
+                   + name + _(" to ")
+                   + textclasslist.NameOfLayout(c2, par->layout)
+                   + _("\nbecause of class conversion from\n")
+                   + textclasslist.NameOfClass(c1) + _(" to ")
+                   + textclasslist.NameOfClass(c2);
            InsetError * new_inset = new InsetError(s);
-           par->InsertChar(0, LyXParagraph::META_INSET);
            par->InsertInset(0, new_inset);
        }
        
@@ -424,6 +441,7 @@ bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
            return false;
        }
     }
+#ifndef NEW_TABULAR
     /* table stuff -- begin */
     if (par->table) {
        if (buf->next) {
@@ -434,5 +452,6 @@ bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
        }
     }
     /* table stuff -- end */
+#endif
     return true;
 }