More ascii-export fixes and when making copy of single tabular cells now the

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 80c62c28f2b6892cb04e4339af04a63bec782279..40650a530b2ecdf2d5dd5d0f63aa1f4f0f6e333d 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -17,6 +17,7 @@
 #include "lyx_gui_misc.h"
 #include "lyxcursor.h"
 #include "gettext.h"
+#include "iterators.h"
 
 #ifdef __GNUG__
 #pragma implementation
@@ -24,6 +25,8 @@
 
 using std::pair;
 using lyx::pos_type;
+using lyx::layout_type;
+using lyx::textclass_type;
 
 extern BufferView * current_view;
 
@@ -49,7 +52,7 @@ extern BufferView * current_view;
 namespace {
 
 Paragraph * buf = 0;
-LyXTextClassList::size_type textclass = 0;
+textclass_type textclass = 0;
 
 // for now here this should be in another Cut&Paste Class!
 // Jürgen, I moved this out of CutAndPaste since it does not operate on any
@@ -139,7 +142,7 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
                }
                // this paragraph's are of noone's owner!
                Paragraph * p = buf;
-               while(p) {
+               while (p) {
                        p->setInsetOwner(0);
                        p = p->next();
                }
@@ -196,7 +199,7 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
                }
                // this paragraph's are of noone's owner!
                tmppar = buf;
-               while(tmppar) {
+               while (tmppar) {
                        tmppar->setInsetOwner(0);
                        tmppar = tmppar->next();
                }
@@ -260,9 +263,33 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
                        tmpbuf2->next()->previous(tmpbuf2);
                        tmpbuf2 = tmpbuf2->next();
                }
+
+               // now remove all out of the buffer which is NOT allowed in the
+               // new environment and set also another font if that is required
+               tmpbuf = buf;
+               while(tmpbuf) {
+                       for(pos_type i = 0; i < tmpbuf->size(); ++i) {
+                               if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
+                                       if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode()))
+                                       {
+                                               tmpbuf->erase(i--);
+                                       }
+                               } else {
+                                       LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i);
+                                       LyXFont f2 = f1;
+                                       if (!(*par)->checkInsertChar(f1)) {
+                                               tmpbuf->erase(i--);
+                                       } else if (f1 != f2) {
+                                               tmpbuf->setFont(i, f1);
+                                       }
+                               }
+                       }
+                       tmpbuf = tmpbuf->next();
+               }
                
                // make sure there is no class difference
-               SwitchLayoutsBetweenClasses(textclass, tc, buf);
+               SwitchLayoutsBetweenClasses(textclass, tc, buf,
+                                           current_view->buffer()->params);
                
                // make the buf exactly the same layout than
                // the cursor paragraph
@@ -327,7 +354,7 @@ int CutAndPaste::nrOfParagraphs()
        
        int n = 1;
        Paragraph * tmppar = buf;
-       while(tmppar->next()) {
+       while (tmppar->next()) {
                ++n;
                tmppar = tmppar->next();
        }
@@ -335,24 +362,26 @@ int CutAndPaste::nrOfParagraphs()
 }
 
 
-int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
-                                            LyXTextClassList::size_type c2,
-                                            Paragraph * par)
+int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
+                                            textclass_type c2,
+                                            Paragraph * par,
+                                            BufferParams const & bparams)
 {
        int ret = 0;
        if (!par || c1 == c2)
                return ret;
-       
-       while (par) {
-               string const name = textclasslist.NameOfLayout(c1,
-                                                              par->layout);
+
+       ParIterator end = ParIterator();
+       for (ParIterator it = ParIterator(par); it != end; ++it) {
+               par = *it;
+               string const name = textclasslist.NameOfLayout(c1, par->layout);
                int lay = 0;
-               pair<bool, LyXTextClass::LayoutList::size_type> pp =
+               pair<bool, layout_type> pp =
                        textclasslist.NumberOfLayout(c2, name);
                if (pp.first) {
                        lay = pp.second;
-               } else { // layout not found
-                       // use default layout "Standard" (0)
+               } else {
+                       // not found: use default layout "Standard" (0)
                        lay = 0;
                }
                par->layout = lay;
@@ -366,9 +395,10 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
                                + textclasslist.NameOfClass(c1) + _(" to ")
                                + textclasslist.NameOfClass(c2);
                        InsetError * new_inset = new InsetError(s);
-                       par->insertInset(0, new_inset);
+                       par->insertInset(0, new_inset,
+                                        LyXFont(LyXFont::ALL_INHERIT,
+                                                bparams.language));
                }
-               par = par->next();
        }
        return ret;
 }