Almost fix 'make check'. The only remaining problem is an undefined

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 1fed78e8919291b385b56b2deadfc61ee8ff4732..4ec57ef3eed6e957a8e90b7da21ed677d4460512 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -15,11 +15,13 @@
 #include "bufferparams.h"
 #include "lyxtext.h"
 #include "paragraph_pimpl.h"
+#include "debug.h"
 
 
 namespace lyx {
 
 using std::string;
+using std::endl;
 
 
 static bool moveItem(Paragraph & fromPar, pos_type fromPos,
@@ -66,18 +68,12 @@ void breakParagraph(BufferParams const & bparams,
 
        Paragraph & par = pars[par_offset];
 
-       // we will invalidate the row cache
-       par.rows().clear();
-
        // without doing that we get a crash when typing <Return> at the
        // end of a paragraph
        tmp->layout(bparams.getLyXTextClass().defaultLayout());
        // remember to set the inset_owner
        tmp->setInsetOwner(par.inInset());
 
-       // this is an idea for a more userfriendly layout handling, I will
-       // see what the users say
-
        // layout stays the same with latex-environments
        if (flag) {
                tmp->layout(par.layout());
@@ -101,7 +97,7 @@ void breakParagraph(BufferParams const & bparams,
                tmp->params().depth(par.params().depth());
                tmp->params().noindent(par.params().noindent());
 
-               // copy everything behind the break-position
+               // move everything behind the break position
                // to the new paragraph
 
                /* Note: if !keepempty, empty() == true, then we reach
@@ -118,6 +114,11 @@ void breakParagraph(BufferParams const & bparams,
                }
        }
 
+       // Move over the end-of-par change information
+       tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+       par.setChange(par.size(), Change(bparams.trackChanges ?
+                                          Change::INSERTED : Change::UNCHANGED));
+
        if (pos) {
                // Make sure that we keep the language when
                // breaking paragraph.
@@ -142,15 +143,6 @@ void breakParagraph(BufferParams const & bparams,
                par.setLabelWidthString(tmp->params().labelWidthString());
                par.params().depth(tmp->params().depth());
        }
-
-       // subtle, but needed to get empty pars working right
-       if (bparams.trackChanges) {
-               // FIXME: Change tracking (MG)
-               // if (!par.size())
-               //      set 'par' text to INSERTED in CT mode; clear CT info otherwise
-               // else if (!tmp->size())
-               //      set 'tmp' text to INSERTED in CT mode; clear CT info otherwise
-       }
 }
 
 
@@ -192,22 +184,25 @@ void mergeParagraph(BufferParams const & bparams,
        pos_type pos_end = next.size() - 1;
        pos_type pos_insert = par.size();
 
-       // The imaginary end-of-paragraph character (at par.size()) has to be
+       // the imaginary end-of-paragraph character (at par.size()) has to be
        // marked as unmodified. Otherwise, its change is adopted by the first
        // character of the next paragraph.
-       
-       // FIXME: change tracking (MG)
-       par.setChange(par.size(), Change(Change::UNCHANGED));
+       if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+               lyxerr[Debug::CHANGES] <<
+                  "merging par with inserted/deleted end-of-par character" << endl;
+               par.setChange(par.size(), Change(Change::UNCHANGED));
+       }
 
        Change change = next.lookupChange(next.size());
-       // ok, now copy the paragraph
+
+       // move the content of the second paragraph to the end of the first one
        for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
                if (moveItem(next, 0, par, j, bparams)) {
                        ++j;
                }
        }
-       // Move the change of the end-of-paragraph character
-       // FIXME: change tracking (MG)
+
+       // move the change of the end-of-paragraph character
        par.setChange(par.size(), change);
 
        pars.erase(boost::next(pars.begin(), par_offset + 1));
@@ -247,10 +242,12 @@ bool isFirstInSequence(pit_type par_offset, ParagraphList const & pars)
 
        pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth());
 
+       if (dhook_offset == par_offset)
+               return true;
+
        Paragraph const & dhook = pars[dhook_offset];
 
-       return dhook_offset == par_offset
-               || dhook.layout() != par.layout()
+       return dhook.layout() != par.layout()
                || dhook.getDepth() != par.getDepth();
 }