bug 2298: cursorTop/Bottom/Home/End does not redraw after dEPM

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 8def8c6f228526645b12cf7cc5b613f76d5c00d4..b5b43d87d7860b2eda1db9f336764bdedf6b2590 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -58,7 +58,12 @@ using std::pair;
 namespace {
 
 bool moveItem(Paragraph & from, Paragraph & to,
-       BufferParams const & params, pos_type i, pos_type j)
+       BufferParams const & params, pos_type i, pos_type j,
+       Change change = Change(Change::INSERTED));
+
+bool moveItem(Paragraph & from, Paragraph & to,
+       BufferParams const & params, pos_type i, pos_type j,
+       Change change)
 {
        Paragraph::value_type const tmpchar = from.getChar(i);
        LyXFont tmpfont = from.getFontSettings(params, i);
@@ -76,11 +81,9 @@ bool moveItem(Paragraph & from, Paragraph & to,
                        return false;
                }
                if (tmpinset)
-                       to.insertInset(j, tmpinset, tmpfont);
+                       to.insertInset(j, tmpinset, tmpfont, change);
        } else {
-               if (!to.checkInsertChar(tmpfont))
-                       return false;
-               to.insertChar(j, tmpchar, tmpfont);
+               to.insertChar(j, tmpchar, tmpfont, change);
        }
        return true;
 }
@@ -154,7 +157,7 @@ void breakParagraph(BufferParams const & bparams,
                // Make sure that we keep the language when
                // breaking paragrpah.
                if (tmp->empty()) {
-                       LyXFont changed = tmp->getFirstFontSettings();
+                       LyXFont changed = tmp->getFirstFontSettings(bparams);
                        LyXFont old = par.getFontSettings(bparams, par.size());
                        changed.setLanguage(old.language());
                        tmp->setFont(0, changed);
@@ -163,10 +166,11 @@ void breakParagraph(BufferParams const & bparams,
                return;
        }
 
-       par.params().clear();
-
-       par.layout(bparams.getLyXTextClass().defaultLayout());
-
+        if (!isempty) {
+                par.params().clear();
+                par.layout(bparams.getLyXTextClass().defaultLayout());
+        }
+        
        // layout stays the same with latex-environments
        if (flag) {
                par.layout(tmp->layout());
@@ -192,6 +196,9 @@ void breakParagraphConservative(BufferParams const & bparams,
        Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
        Paragraph & par = pars[par_offset];
 
+       if (bparams.tracking_changes)
+               tmp.trackChanges();
+
        tmp.makeSameLayout(par);
 
        // When can pos > size()?
@@ -201,12 +208,21 @@ void breakParagraphConservative(BufferParams const & bparams,
                // paragraph
                pos_type pos_end = par.size() - 1;
 
-               for (pos_type i = pos, j = pos; i <= pos_end; ++i)
-                       if (moveItem(par, tmp, bparams, i, j - pos))
+               for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+                       Change::Type change = par.lookupChange(i);
+                       if (moveItem(par, tmp, bparams, i, j - pos, change))
                                ++j;
-
-               for (pos_type k = pos_end; k >= pos; --k)
+               }
+               // Move over end-of-par change attr
+               tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+
+               // If tracking changes, set all the text that is to be
+               // erased to Type::INSERTED.
+               for (pos_type k = pos_end; k >= pos; --k) {
+                       if (bparams.tracking_changes)
+                               par.setChange(k, Change::INSERTED);
                        par.erase(k);
+               }
        }
 }
 
@@ -220,10 +236,28 @@ void mergeParagraph(BufferParams const & bparams,
        pos_type pos_end = next.size() - 1;
        pos_type pos_insert = par.size();
 
+       // What happens is the following. Later on, moveItem() will copy
+       // over characters from the next paragraph to be inserted into this
+       // position. Now, if the first char to be so copied is "red" (i.e.,
+       // marked deleted) and the paragraph break is marked "blue",
+       // insertChar will trigger (eventually, through record(), and see
+       // del() and erase() in changes.C) a "hard" character deletion.
+       // Which doesn't make sense of course at this pos, but the effect is
+       // to shorten the change range to which this para break belongs, by
+       // one. It will (should) remain "orphaned", having no CT info to it,
+       // and check() in changes.C will assert. Setting the para break
+       // forcibly to "black" prevents this scenario. -- MV 13.3.2006
+       par.setChange(par.size(), Change::UNCHANGED);
+
+       Change::Type cr = next.lookupChange(next.size());
        // ok, now copy the paragraph
-       for (pos_type i = 0, j = 0; i <= pos_end; ++i)
-               if (moveItem(next, par, bparams, i, pos_insert + j))
+       for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
+               Change::Type change = next.lookupChange(i);
+               if (moveItem(next, par, bparams, i, pos_insert + j, change))
                        ++j;
+       }
+       // Move the change status of "carriage return" over
+       par.setChange(par.size(), cr);
 
        pars.erase(pars.begin() + par_offset + 1);
 }