]> git.lyx.org Git - features.git/blobdiff - src/CutAndPaste.C
several changes and some new insets, read the Changelog
[features.git] / src / CutAndPaste.C
index 006f3fc1cf9532a1fa654215c6947049aa64e096..70eb686b324d81f1eb5ba3f0c333a927b881aa79 100644 (file)
 #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
 #endif
 
-static LyXParagraph * buf = 0;
+using std::pair;
 
-CutAndPaste::CutAndPaste()
-{
-}
+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
+// struct selection_item {
+//       LyXParagraph * buf;
+//       LyXTextClassList::size_type textclass;
+// };
+// in and some method of choosing beween them (based on the first few chars
+// in the selection probably.) This would be a nice feature and quite
+// easy to implement. (Lgb)
+//
+// Sure but I just cleaned up this code for now with the same functionality
+// as before. I also want to add a XClipboard function so that we can copy
+// text from LyX to some other X-application in the form of ASCII or in the
+// form of LaTeX (or Docbook depending on the document-class!). Think how nice
+// it could be to select a math-inset do a "Copy to X-Clipboard as LaTeX" and
+// then do a middle mouse button click in the application you want and have
+// the whole formula there in LaTeX-Code. (Jug)
 
-CutAndPaste::~CutAndPaste()
-{
-}
+static LyXParagraph * buf = 0;
+static LyXTextClassList::size_type textclass = 0;
 
 // for now here this should be in another Cut&Paste Class!
-//
-void CutAndPaste::DeleteBuffer()
+// Jürgen, I moved this out of CutAndPaste since it does not operate on any
+// member of the CutAndPaste class and in addition it was private.
+// Perhaps it even should take a parameter? (Lgb)
+static
+void DeleteBuffer()
 {
     if (!buf)
        return;
-
+       
     LyXParagraph * tmppar;
-    
+       
     while (buf) {
        tmppar =  buf;
        buf = buf->next;
@@ -46,7 +67,8 @@ void CutAndPaste::DeleteBuffer()
     buf = 0;
 }
 
-bool CutAndPaste::cutSelection(LyXParagraph *startpar, LyXParagraph **endpar,
+
+bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
                               int start, int & end, char tc, bool doclear)
 {
     if (!startpar || (start > startpar->Last()))
@@ -64,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;
@@ -106,15 +135,18 @@ 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;
 }
 
-bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar,
+
+bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
                                int start, int end, char tc)
 {
     if (!startpar || (start > startpar->Last()))
@@ -132,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 {
@@ -154,7 +186,7 @@ bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar,
        // care about footnotes
        if (buf->footnoteflag) {
            tmppar = buf;
-           while (tmppar){
+           while (tmppar) {
                tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
                tmppar = tmppar->next;
            }
@@ -175,8 +207,9 @@ bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar,
     return true;
 }
 
-bool CutAndPaste::pasteSelection(LyXParagraph **par, LyXParagraph **endpar,
-                                int &pos, char tc)
+
+bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
+                                int & pos, char tc)
 {
     if (!checkPastePossible(*par, pos))
        return false;
@@ -192,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) {
@@ -199,10 +233,10 @@ bool CutAndPaste::pasteSelection(LyXParagraph **par, LyXParagraph **endpar,
                if (buf->IsNewline(0)){
                    while((tmppos < tmppar->Last()) &&
                          !tmppar->IsNewline(tmppos))
-                       tmppos++;
+                       ++tmppos;
                    buf->Erase(0);
                    if (tmppos < tmppar->Last())
-                       tmppos++;
+                       ++tmppos;
                    else
                        table_too_small = true;
                } else {
@@ -212,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;
@@ -221,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
@@ -234,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();
@@ -284,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;
        }
        
@@ -303,47 +341,47 @@ 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;
 }
 
+
 int CutAndPaste::nrOfParagraphs() const
 {
-    if (!buf)
-       return 0;
+       if (!buf) return 0;
 
-    int n = 1;
-    LyXParagraph *tmppar = buf;
-    while(tmppar->next) {
-       ++n;
-       tmppar = tmppar->next;
-    }
-    return n;
+       int n = 1;
+       LyXParagraph * tmppar = buf;
+       while(tmppar->next) {
+               ++n;
+               tmppar = tmppar->next;
+       }
+       return n;
 }
 
+
 int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
                                             LyXTextClassList::size_type c2,
                                             LyXParagraph * par)
@@ -367,15 +405,19 @@ 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);
+#ifdef NEW_WAY
+           par->InsertInset(0, new_inset);
+#else
            par->InsertChar(0, LyXParagraph::META_INSET);
            par->InsertInset(0, new_inset);
+#endif
        }
        
        par = par->next;
@@ -383,17 +425,12 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
     return ret;
 }
 
-char CutAndPaste::getBufferTextClass()
-{
-    return textclass;
-}
 
-bool CutAndPaste::checkPastePossible(LyXParagraph *par, int)
+bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
 {
-    if (!buf)
-       return false;
+    if (!buf) return false;
 
-    LyXParagraph *tmppar;
+    LyXParagraph * tmppar;
 
     // be carefull with footnotes in footnotes
     if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
@@ -409,6 +446,7 @@ bool CutAndPaste::checkPastePossible(LyXParagraph *par, int)
            return false;
        }
     }
+#ifndef NEW_TABULAR
     /* table stuff -- begin */
     if (par->table) {
        if (buf->next) {
@@ -419,5 +457,6 @@ bool CutAndPaste::checkPastePossible(LyXParagraph *par, int)
        }
     }
     /* table stuff -- end */
+#endif
     return true;
 }