Update my email and status.

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index aabbed7e3cd6228f61f94f3639fa6dab928befb4..5831f2211114ef6c78e7a313f9e4d3dd1c2958cb 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -14,6 +14,7 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
+#include "Font.h"
 
 #include "insets/InsetText.h"
 
@@ -96,13 +97,15 @@ size_t DocRange::length() const
 
 class DocPair {
 public:
-       DocPair() {}
+       DocPair()
+       {}
 
        DocPair(DocIterator o_, DocIterator n_)
                : o(o_), n(n_)
        {}
 
-       bool operator!=(DocPair const & rhs) {
+       bool operator!=(DocPair const & rhs)
+       {
                // this might not be intuitive but correct for our purpose
                return o != rhs.o && n != rhs.n;
        }
@@ -145,10 +148,16 @@ public:
        {}
 
        /// Returns the from pair
-       DocPair from() const { return DocPair(o.from, n.from); }
+       DocPair from() const
+       {
+               return DocPair(o.from, n.from);
+       }
 
        /// Returns the to pair
-       DocPair to() const { return DocPair(o.to, n.to); }
+       DocPair to() const
+       {
+               return DocPair(o.to, n.to);
+       }
 
        DocRange o;
        DocRange n;
@@ -180,7 +189,8 @@ static DocRangePair stepIntoInset(DocPair const & inset_location)
 template<class T>
 class compl_vector {
 public:
-       compl_vector() {}
+       compl_vector()
+       {}
 
        void reset(T const & def)
        {
@@ -222,7 +232,8 @@ public:
        {}
 
        ///
-       ~Impl() {}
+       ~Impl()
+       {}
 
        // Algorithm to find the shortest edit string. This algorithm 
        // only needs a linear amount of memory (linear with the sum
@@ -234,7 +245,8 @@ public:
        bool abort_;
 
        ///
-       QString status() {
+       QString status()
+       {
                QString status;
                status += toqstr("recursion level:") + " " + QString::number(recursion_level_)
                        + " " + toqstr("differences:") + " " + QString::number(D_);
@@ -271,7 +283,7 @@ private:
        /// around the middle snake.
        void diff_i(DocRangePair const & rp);
 
-       /// Processes the splitted chunks. It either adds them as deleted,
+       /// Processes the split chunks. It either adds them as deleted,
        /// as added, or call diff_i for further processing.
        void diffPart(DocRangePair const & rp);
 
@@ -443,7 +455,15 @@ static bool equal(Inset const * i_o, Inset const * i_n)
 }
 
 
-static bool equal(DocIterator & o, DocIterator & n) {
+static bool equal(DocIterator & o, DocIterator & n)
+{
+       // Explicitly check for this, so we won't call
+       // Paragraph::getChar for the last pos.
+       bool const o_lastpos = o.pos() == o.lastpos();
+       bool const n_lastpos = n.pos() == n.lastpos();
+       if (o_lastpos || n_lastpos)
+               return o_lastpos && n_lastpos;
+
        Paragraph const & old_par = o.text()->getPar(o.pit());
        Paragraph const & new_par = n.text()->getPar(n.pit());
 
@@ -518,6 +538,7 @@ void Compare::Impl::furthestDpathKdiagonal(int D, int k,
        // Where do we take the step from ?
        int const kk = vertical_step ? k + 1 : k - 1;
        DocPair p(op[kk], np[kk]);
+       DocPair const s(os[kk], ns[kk]);
 
        // If D==0 we simulate a vertical step from (0,-1) by doing nothing.
        if (D != 0) {
@@ -539,8 +560,8 @@ void Compare::Impl::furthestDpathKdiagonal(int D, int k,
                ns[k] = p.n;
        } else {
                // Copy last snake from the previous step
-               os[k] = os[kk];
-               ns[k] = ns[kk];
+               os[k] = s.o;
+               ns[k] = s.n;
        }
 
        //Record new position
@@ -683,7 +704,9 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
        processSnake(snake);
        
        // Start the recursive algorithm
-       diff_i(rp);
+       DocRangePair rp_new(from, rp.to());
+       if (!rp_new.o.empty() || !rp_new.n.empty())
+               diff_i(rp_new);
 
        for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
                (*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));