]> git.lyx.org Git - lyx.git/blobdiff - src/CutAndPaste.C
move breakParagraph and breakParagraphConservative out of Paragraph
[lyx.git] / src / CutAndPaste.C
index a18806898accac594be9c72187f0d8b9c29b11e7..230648add52e499f208bd11d6ac3f6cf310f91bc 100644 (file)
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
@@ -24,6 +24,8 @@
 #include "gettext.h"
 #include "iterators.h"
 #include "lyxtextclasslist.h"
+#include "undo_funcs.h"
+#include "paragraph_funcs.h"
 
 #include "insets/inseterror.h"
 
@@ -65,9 +67,9 @@ void DeleteBuffer()
 {
        if (!buf)
                return;
-       
+
        Paragraph * tmppar;
-       
+
        while (buf) {
                tmppar =  buf;
                buf = buf->next();
@@ -80,17 +82,17 @@ void DeleteBuffer()
 
 
 bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
-                               int start, int & end, char tc, bool doclear,
+                              int start, int & end, char tc, bool doclear,
                                                           bool realcut)
 {
        if (!startpar || (start > startpar->size()))
                return false;
-       
+
        if (realcut)
                DeleteBuffer();
-       
+
        textclass = tc;
-       
+
        if (!(*endpar) || startpar == (*endpar)) {
                // only within one paragraph
                if (realcut) {
@@ -103,7 +105,7 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
                for (; i < end; ++i) {
                        if (realcut)
                                startpar->copyIntoMinibuffer(*current_view->buffer(),
-                                                            start);
+                                                            start);
                        startpar->erase(start);
                        if (realcut)
                                buf->insertFromMinibuffer(buf->size());
@@ -111,14 +113,16 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
                end = start - 1;
        } else {
                // more than one paragraph
-               (*endpar)->breakParagraphConservative(current_view->buffer()->params,
-                                                     end);
+               breakParagraphConservative(current_view->buffer()->params,
+                                          *endpar,
+                                          end);
                *endpar = (*endpar)->next();
                end = 0;
-               
-               startpar->breakParagraphConservative(current_view->buffer()->params,
-                                                    start);
-               
+
+               breakParagraphConservative(current_view->buffer()->params,
+                                          startpar,
+                                          start);
+
                // store the selection
                if (realcut) {
                        buf = startpar->next();
@@ -127,24 +131,24 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
                        startpar->next()->previous(0);
                }
                (*endpar)->previous()->next(0);
-               
+
                // cut the selection
                startpar->next(*endpar);
-               
+
                (*endpar)->previous(startpar);
-               
+
                // the cut selection should begin with standard layout
                if (realcut) {
                        buf->params().clear();
                        buf->bibkey = 0;
-                       buf->layout(textclasslist[current_view->buffer()->params.textclass].defaultLayoutName());
+                       buf->layout(current_view->buffer()->params.getLyXTextClass().defaultLayout());
                }
 
                // paste the paragraphs again, if possible
                if (doclear)
-                       startpar->next()->stripLeadingSpaces(textclass);
+                       startpar->next()->stripLeadingSpaces();
                if (startpar->hasSameLayout(startpar->next()) ||
-                   !startpar->next()->size()) {
+                   startpar->next()->empty()) {
                        startpar->pasteParagraph(current_view->buffer()->params);
                        (*endpar) = startpar; // this because endpar gets deleted here!
                }
@@ -160,15 +164,15 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
 
 
 bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
-                                int start, int end, char tc)
+                               int start, int end, char tc)
 {
        if (!startpar || (start > startpar->size()))
                return false;
-       
+
        DeleteBuffer();
-       
+
        textclass = tc;
-       
+
        if (!endpar || startpar == endpar) {
                // only within one paragraph
                buf = new Paragraph;
@@ -186,7 +190,7 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
                Paragraph * tmppar = startpar;
                buf = new Paragraph(*tmppar, false);
                Paragraph * tmppar2 = buf;
-               
+
                while (tmppar != endpar
                       && tmppar->next()) {
                        tmppar = tmppar->next();
@@ -195,12 +199,12 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
                        tmppar2 = tmppar2->next();
                }
                tmppar2->next(0);
-               
+
                // the buf paragraph is too big
                pos_type tmpi2 = start;
                for (; tmpi2; --tmpi2)
                        buf->erase(0);
-               
+
                // now tmppar 2 is too big, delete all after end
                tmpi2 = end;
                while (tmppar2->size() > tmpi2) {
@@ -218,14 +222,14 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
 
 
 bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
-                                 int & pos, char tc)
+                                int & pos, char tc)
 {
        if (!checkPastePossible(*par))
                return false;
-       
+
        if (pos > (*par)->size())
                pos = (*par)->size();
-       
+
 #if 0
        // Paragraph * tmpbuf;
        Paragraph * tmppar = *par;
@@ -235,7 +239,7 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
        if (!buf->next()) {
                // only within a paragraph
                Paragraph * tmpbuf = new Paragraph(*buf, false);
-               
+
                // 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
@@ -263,12 +267,12 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
 #endif
        {
                // many paragraphs
-               
+
                // make a copy of the simple cut_buffer
                Paragraph * tmpbuf = buf;
                Paragraph * simple_cut_clone = new Paragraph(*tmpbuf, false);
                Paragraph * tmpbuf2 = simple_cut_clone;
-               
+
                while (tmpbuf->next()) {
                        tmpbuf = tmpbuf->next();
                        tmpbuf2->next(new Paragraph(*tmpbuf, false));
@@ -283,7 +287,13 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
                // temporary set *par as previous of tmpbuf as we might have to realize
                // the font.
                tmpbuf->previous(*par);
-               Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter(current_view->buffer());
+
+               // make sure there is no class difference
+               SwitchLayoutsBetweenClasses(textclass, tc, tmpbuf,
+                                           current_view->buffer()->params);
+
+               Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter();
+
                while(tmpbuf) {
                        // if we have a negative jump so that the depth would go below
                        // 0 depth then we have to redo the delta to this new max depth
@@ -298,7 +308,7 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
                        // only set this from the 2nd on as the 2nd depends for maxDepth
                        // still on *par
                        if (tmpbuf->previous() != (*par))
-                               max_depth = tmpbuf->getMaxDepthAfter(current_view->buffer());
+                               max_depth = tmpbuf->getMaxDepthAfter();
                        // set the inset owner of this paragraph
                        tmpbuf->setInsetOwner((*par)->inInset());
                        for(pos_type i = 0; i < tmpbuf->size(); ++i) {
@@ -321,42 +331,40 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
                }
                // now reset it to 0
                buf->previous(0);
-               
-               // make sure there is no class difference
-               SwitchLayoutsBetweenClasses(textclass, tc, buf,
-                                           current_view->buffer()->params);
-               
+
                // make the buf exactly the same layout than
                // the cursor paragraph
                buf->makeSameLayout(*par);
-               
+
                // find the end of the buffer
                Paragraph * lastbuffer = buf;
                while (lastbuffer->next())
                        lastbuffer = lastbuffer->next();
-               
+
                bool paste_the_end = false;
-               
+
                // open the paragraph for inserting the buf
                // if necessary
                if (((*par)->size() > pos) || !(*par)->next()) {
-                       (*par)->breakParagraphConservative(current_view->buffer()->params,
-                                                          pos);
+                       breakParagraphConservative(
+                               current_view->buffer()->params,
+                               *par,
+                               pos);
                        paste_the_end = true;
                }
                // set the end for redoing later
                *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);
                // store the new cursor position
                *par = lastbuffer;
@@ -365,19 +373,19 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
                if (lastbuffer->next() && paste_the_end) {
                        if (lastbuffer->next()->hasSameLayout(lastbuffer)) {
                                lastbuffer->pasteParagraph(current_view->buffer()->params);
-                       } else if (!lastbuffer->next()->size()) {
+                       } else if (lastbuffer->next()->empty()) {
                                lastbuffer->next()->makeSameLayout(lastbuffer);
                                lastbuffer->pasteParagraph(current_view->buffer()->params);
-                       } else if (!lastbuffer->size()) {
+                       } else if (lastbuffer->empty()) {
                                lastbuffer->makeSameLayout(lastbuffer->next());
                                lastbuffer->pasteParagraph(current_view->buffer()->params);
                        } else
-                               lastbuffer->next()->stripLeadingSpaces(tc);
+                               lastbuffer->next()->stripLeadingSpaces();
                }
                // restore the simple cut buffer
                buf = simple_cut_clone;
        }
-       
+
        return true;
 }
 
@@ -386,7 +394,7 @@ int CutAndPaste::nrOfParagraphs()
 {
        if (!buf)
                return 0;
-       
+
        int n = 1;
        Paragraph * tmppar = buf;
        while (tmppar->next()) {
@@ -400,37 +408,32 @@ int CutAndPaste::nrOfParagraphs()
 int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
                                             textclass_type c2,
                                             Paragraph * par,
-                                            BufferParams const & bparams)
+                                            BufferParams const & /*bparams*/)
 {
        int ret = 0;
        if (!par || c1 == c2)
                return ret;
 
+       LyXTextClass const & tclass1 = textclasslist[c1];
+       LyXTextClass const & tclass2 = textclasslist[c2];
        ParIterator end = ParIterator();
        for (ParIterator it = ParIterator(par); it != end; ++it) {
                par = *it;
-               string const name = par->layout();
-               LyXTextClass const & tclass = textclasslist[c2];
-               
-               bool hasLayout = tclass.hasLayout(name);
-               
-               string lay = tclass.defaultLayoutName();
-               if (hasLayout) {
-                       lay = name;
-               } else {
-                       // not found: use default layout
-                       lay = tclass.defaultLayoutName();
-               }
-               par->layout(lay);
-               
-               if (name != par->layout()) {
+               string const name = par->layout()->name();
+               bool hasLayout = tclass2.hasLayout(name);
+
+               if (!hasLayout)
+                       par->layout(tclass2.defaultLayout());
+
+               if (!hasLayout && name != tclass1.defaultLayoutName()) {
                        ++ret;
                        string const s = _("Layout had to be changed from\n")
                                + name + _(" to ")
-                               + par->layout()
+                               + par->layout()->name()
                                + _("\nbecause of class conversion from\n")
-                               + textclasslist[c1].name() + _(" to ")
-                               + textclasslist[c2].name();
+                               + tclass1.name() + _(" to ")
+                               + tclass2.name();
+                       freezeUndo();
                        InsetError * new_inset = new InsetError(s);
                        LyXText * txt = current_view->getLyXText();
                        LyXCursor cur = txt->cursor;
@@ -438,6 +441,7 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
                        txt->insertInset(current_view, new_inset);
                        txt->fullRebreak(current_view);
                        txt->setCursorIntern(current_view, cur.par(), cur.pos());
+                       unFreezeUndo();
                }
        }
        return ret;
@@ -447,6 +451,6 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
 bool CutAndPaste::checkPastePossible(Paragraph *)
 {
        if (!buf) return false;
-       
+
        return true;
 }