Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 3f3a0238a15895868df184251c19a3b1f6c64c18..de95af7932e5d9fba35b486d83f92ac33ce38059 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -78,8 +78,14 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
 
     textclass = tc;
 
-    if (!(*endpar) || (startpar->ParFromPos(start) ==
-                      (*endpar)->ParFromPos(end))) {
+    if (!(*endpar) ||
+#ifndef NEW_INSETS
+       (startpar->ParFromPos(start) ==
+        (*endpar)->ParFromPos(end))
+#else
+       (startpar == (*endpar))
+#endif
+           ) {
        // only within one paragraph
        buf = new LyXParagraph;
        LyXParagraph::size_type i = start;
@@ -112,15 +118,26 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
                                             start);
 
        // store the selection
+#ifndef NEW_INSETS
        buf = startpar->ParFromPos(start)->next;
+#else
+       buf = startpar->next;
+#endif
        buf->previous = 0;
        (*endpar)->previous->next = 0;
 
        // cut the selection
+#ifndef NEW_INSETS
        startpar->ParFromPos(start)->next = (*endpar);
        
        (*endpar)->previous = startpar->ParFromPos(start);
+#else
+       startpar->next = (*endpar);
+       
+       (*endpar)->previous = startpar;
+#endif
 
+#ifndef NEW_INSETS
        // care about footnotes
        if (buf->footnoteflag) {
            LyXParagraph * tmppar = buf;
@@ -129,6 +146,7 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
                tmppar = tmppar->next;
            }
        }
+#endif
 
        // the cut selection should begin with standard layout
        buf->Clear(); 
@@ -136,9 +154,17 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
        // paste the paragraphs again, if possible
        if (doclear)
            startpar->Next()->StripLeadingSpaces(textclass);
-       if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) || 
+#ifndef NEW_INSETS
+       if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) ||
+#else
+       if (startpar->HasSameLayout(startpar->Next()) ||
+#endif
            !startpar->Next()->Last()) {
+#ifndef NEW_INSETS
            startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
+#else
+           startpar->PasteParagraph(current_view->buffer()->params);
+#endif
            (*endpar) = startpar; // this because endpar gets deleted here!
        }
     }
@@ -156,8 +182,14 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
 
     textclass = tc;
 
-    if (!(endpar) || (startpar->ParFromPos(start) ==
-                      (endpar)->ParFromPos(end))) {
+    if (!(endpar) ||
+#ifndef NEW_INSETS
+       (startpar->ParFromPos(start) ==
+                      (endpar)->ParFromPos(end))
+#else
+       (startpar == endpar)
+#endif
+           ) {
        // only within one paragraph
        buf = new LyXParagraph;
        LyXParagraph::size_type i = start;
@@ -170,11 +202,20 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
     } else {
        // copy more than one paragraph
        // clone the paragraphs within the selection
-       LyXParagraph *tmppar = startpar->ParFromPos(start);
+#ifndef NEW_INSETS
+       LyXParagraph * tmppar = startpar->ParFromPos(start);
+#else
+       LyXParagraph * tmppar = startpar;
+#endif
        buf = tmppar->Clone();
-       LyXParagraph *tmppar2 = buf;
+       LyXParagraph * tmppar2 = buf;
      
-       while (tmppar != endpar->ParFromPos(end)
+       while (
+#ifndef NEW_INSETS
+               tmppar != endpar->ParFromPos(end)
+#else
+               tmppar != endpar
+#endif
               && tmppar->next) {
            tmppar = tmppar->next;
            tmppar2->next = tmppar->Clone();
@@ -183,6 +224,7 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
        }
        tmppar2->next = 0;
 
+#ifndef NEW_INSETS
        // care about footnotes
        if (buf->footnoteflag) {
            tmppar = buf;
@@ -191,15 +233,23 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
                tmppar = tmppar->next;
            }
        }
+#endif
        
        // the buf paragraph is too big
+#ifndef NEW_INSETS
        LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start);
+#else
+       LyXParagraph::size_type tmpi2 = start;
+#endif
        for (; tmpi2; --tmpi2)
            buf->Erase(0);
        
        // now tmppar 2 is too big, delete all after end
-       
+#ifndef NEW_INSETS
        tmpi2 = endpar->PositionInParFromPos(end);
+#else
+       tmpi2 = end;
+#endif
        while (tmppar2->size() > tmpi2) {
            tmppar2->Erase(tmppar2->size() - 1);
        }
@@ -289,19 +339,23 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
        tmpbuf = buf;
        LyXParagraph * simple_cut_clone = tmpbuf->Clone();
        LyXParagraph * tmpbuf2 = simple_cut_clone;
+#ifndef NEW_INSETS
        if ((*par)->footnoteflag){
            tmpbuf->footnoteflag = (*par)->footnoteflag;
            tmpbuf->footnotekind = (*par)->footnotekind;
        }
+#endif
        while (tmpbuf->next) {
            tmpbuf = tmpbuf->next;
            tmpbuf2->next = tmpbuf->Clone();
            tmpbuf2->next->previous = tmpbuf2;
            tmpbuf2 = tmpbuf2->next;
+#ifndef NEW_INSETS
            if ((*par)->footnoteflag){
                tmpbuf->footnoteflag = (*par)->footnoteflag;
                tmpbuf->footnotekind = (*par)->footnotekind;
            }
+#endif
        }
        
        // make sure there is no class difference
@@ -327,6 +381,7 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
        }
        
        // set the end for redoing later
+#ifndef NEW_INSETS
        *endpar = (*par)->ParFromPos(pos)->next->Next();
        
        // paste it!
@@ -342,13 +397,28 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
            lastbuffer = *par;
        
        (*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
+#else
+       *endpar = (*par)->next->Next();
        
+       // paste it!
+       lastbuffer->next = (*par)->next;
+       (*par)->next->previous = lastbuffer;
+       
+       (*par)->next = buf;
+       buf->previous = (*par);
+       
+       if ((*par)->Next() == lastbuffer)
+           lastbuffer = *par;
+       
+       (*par)->PasteParagraph(current_view->buffer()->params);
+#endif
        // store the new cursor position
        *par = lastbuffer;
        pos = lastbuffer->Last();
        
        // maybe some pasting
        if (lastbuffer->Next() && paste_the_end) {
+#ifndef NEW_INSETS
            if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
                lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
            } else if (!lastbuffer->Next()->Last()) {
@@ -357,6 +427,16 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
            } else if (!lastbuffer->Last()) {
                lastbuffer->MakeSameLayout(lastbuffer->next);
                lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
+#else
+           if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
+               lastbuffer->PasteParagraph(current_view->buffer()->params);
+           } else if (!lastbuffer->Next()->Last()) {
+               lastbuffer->Next()->MakeSameLayout(lastbuffer);
+               lastbuffer->PasteParagraph(current_view->buffer()->params);
+           } else if (!lastbuffer->Last()) {
+               lastbuffer->MakeSameLayout(lastbuffer->next);
+               lastbuffer->PasteParagraph(current_view->buffer()->params);
+#endif
            } else
                lastbuffer->Next()->StripLeadingSpaces(tc);
        }
@@ -368,7 +448,7 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
 }
 
 
-int CutAndPaste::nrOfParagraphs() const
+int CutAndPaste::nrOfParagraphs()
 {
        if (!buf) return 0;
 
@@ -389,7 +469,9 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
     int ret = 0;
     if (!par || c1 == c2)
        return ret;
+#ifndef NEW_INSETS
     par = par->FirstPhysicalPar();
+#endif
     while (par) {
        string name = textclasslist.NameOfLayout(c1, par->layout);
        int lay = 0;
@@ -421,16 +503,15 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
 }
 
 
-bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
+bool CutAndPaste::checkPastePossible(LyXParagraph * par, int)
 {
     if (!buf) return false;
 
-    LyXParagraph * tmppar;
-
+#ifndef NEW_INSETS
     // be carefull with footnotes in footnotes
     if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
        // check whether the cut_buffer includes a footnote
-       tmppar = buf;
+       LyXParagraph * tmppar = buf;
        while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
            tmppar = tmppar->next;
       
@@ -441,6 +522,7 @@ bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
            return false;
        }
     }
+#endif
 #ifndef NEW_TABULAR
     /* table stuff -- begin */
     if (par->table) {