2009-10-25 10:43:16 +00:00
|
|
|
/**
|
|
|
|
* \file Compare.cpp
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author Vincent van Ravesteijn
|
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "Compare.h"
|
|
|
|
|
2014-02-07 13:06:39 +00:00
|
|
|
#include "Author.h"
|
2009-10-25 10:43:16 +00:00
|
|
|
#include "BufferParams.h"
|
2009-12-19 18:15:20 +00:00
|
|
|
#include "Changes.h"
|
2010-03-31 19:38:05 +00:00
|
|
|
#include "Font.h"
|
2009-10-25 10:43:16 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
#include "insets/InsetText.h"
|
|
|
|
|
2015-03-04 21:22:18 +00:00
|
|
|
#include "support/lassert.h"
|
2010-01-14 00:41:47 +00:00
|
|
|
#include "support/qstring_helpers.h"
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
#include <boost/next_prior.hpp>
|
2010-01-10 12:37:50 +00:00
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
using namespace std;
|
|
|
|
using namespace lyx::support;
|
|
|
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
2010-01-09 22:58:20 +00:00
|
|
|
|
|
|
|
enum Direction {
|
|
|
|
Forward = 0,
|
|
|
|
Backward
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2010-01-09 23:56:46 +00:00
|
|
|
static void step(DocIterator & dit, Direction direction)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
2010-01-09 23:56:46 +00:00
|
|
|
if (direction == Forward)
|
|
|
|
dit.top().forwardPos();
|
|
|
|
else
|
|
|
|
dit.top().backwardPos();
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-09 23:56:46 +00:00
|
|
|
static void step(DocIterator & dit, DocIterator const & end, Direction direction)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
2010-01-09 23:56:46 +00:00
|
|
|
if (dit != end)
|
|
|
|
step(dit, direction);
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A pair of two DocIterators that form a range.
|
|
|
|
*/
|
|
|
|
class DocRange {
|
|
|
|
public:
|
2015-03-04 21:22:18 +00:00
|
|
|
DocRange(DocIterator const & from_, DocIterator const & to_)
|
2009-12-19 18:15:20 +00:00
|
|
|
: from(from_), to(to_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
DocRange(Buffer const * buf)
|
|
|
|
{
|
|
|
|
from = doc_iterator_begin(buf);
|
|
|
|
to = doc_iterator_end(buf);
|
|
|
|
to.backwardPos();
|
|
|
|
}
|
|
|
|
|
|
|
|
///
|
|
|
|
Text * text() const { return from.text(); }
|
|
|
|
///
|
|
|
|
bool empty() const { return to <= from; }
|
|
|
|
///
|
|
|
|
size_t length() const;
|
|
|
|
|
|
|
|
/// The begin of the range
|
|
|
|
DocIterator from;
|
|
|
|
/// The end of the range
|
|
|
|
DocIterator to;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
size_t DocRange::length() const
|
|
|
|
{
|
2010-01-10 13:55:42 +00:00
|
|
|
ParagraphList const & ps = from.text()->paragraphs();
|
2009-12-19 18:15:20 +00:00
|
|
|
size_t length = 0;
|
2010-01-10 13:55:42 +00:00
|
|
|
pit_type pit = from.pit();
|
|
|
|
pit_type const endpit = to.pit();
|
|
|
|
for (; pit < endpit; ++pit)
|
|
|
|
length += ps[pit].size() + 1;
|
|
|
|
length += to.pos() - from.pos();
|
|
|
|
return length;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class DocPair {
|
|
|
|
public:
|
2012-10-27 13:45:27 +00:00
|
|
|
DocPair()
|
|
|
|
{}
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
DocPair(DocIterator o_, DocIterator n_)
|
|
|
|
: o(o_), n(n_)
|
|
|
|
{}
|
|
|
|
|
2012-10-27 13:45:27 +00:00
|
|
|
bool operator!=(DocPair const & rhs)
|
|
|
|
{
|
2010-01-09 21:17:10 +00:00
|
|
|
// this might not be intuitive but correct for our purpose
|
|
|
|
return o != rhs.o && n != rhs.n;
|
|
|
|
}
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2010-01-09 21:17:10 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
DocPair & operator++()
|
|
|
|
{
|
2010-01-09 23:56:46 +00:00
|
|
|
step(o, Forward);
|
|
|
|
step(n, Forward);
|
2009-12-19 18:15:20 +00:00
|
|
|
return *this;
|
|
|
|
}
|
2010-01-09 21:17:10 +00:00
|
|
|
|
|
|
|
DocPair & operator--()
|
|
|
|
{
|
2010-01-09 23:56:46 +00:00
|
|
|
step(o, Backward);
|
|
|
|
step(n, Backward);
|
2010-01-09 21:17:10 +00:00
|
|
|
return *this;
|
|
|
|
}
|
2009-12-19 18:15:20 +00:00
|
|
|
///
|
|
|
|
DocIterator o;
|
|
|
|
///
|
|
|
|
DocIterator n;
|
|
|
|
};
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
/**
|
|
|
|
* A pair of two DocRanges.
|
|
|
|
*/
|
|
|
|
class DocRangePair {
|
|
|
|
public:
|
2015-03-04 21:22:18 +00:00
|
|
|
DocRangePair(DocRange const & o_, DocRange const & n_)
|
2009-12-19 18:15:20 +00:00
|
|
|
: o(o_), n(n_)
|
|
|
|
{}
|
2015-03-04 21:22:18 +00:00
|
|
|
|
|
|
|
DocRangePair(DocPair const & from, DocPair const & to)
|
2009-12-19 18:15:20 +00:00
|
|
|
: o(from.o, to.o), n(from.n, to.n)
|
|
|
|
{}
|
|
|
|
|
|
|
|
DocRangePair(Buffer const * o_buf, Buffer const * n_buf)
|
|
|
|
: o(o_buf), n(n_buf)
|
|
|
|
{}
|
|
|
|
|
|
|
|
/// Returns the from pair
|
2012-10-27 13:45:27 +00:00
|
|
|
DocPair from() const
|
|
|
|
{
|
|
|
|
return DocPair(o.from, n.from);
|
|
|
|
}
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
/// Returns the to pair
|
2012-10-27 13:45:27 +00:00
|
|
|
DocPair to() const
|
|
|
|
{
|
|
|
|
return DocPair(o.to, n.to);
|
|
|
|
}
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
DocRange o;
|
|
|
|
DocRange n;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2010-01-09 23:59:33 +00:00
|
|
|
static DocRangePair stepIntoInset(DocPair const & inset_location)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
|
|
|
DocRangePair rp(inset_location, inset_location);
|
|
|
|
rp.o.from.forwardPos();
|
|
|
|
rp.n.from.forwardPos();
|
2010-01-09 23:56:46 +00:00
|
|
|
step(rp.o.to, Forward);
|
|
|
|
step(rp.n.to, Forward);
|
2009-12-19 18:15:20 +00:00
|
|
|
rp.o.to.backwardPos();
|
|
|
|
rp.n.to.backwardPos();
|
|
|
|
return rp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 00:06:02 +00:00
|
|
|
/**
|
|
|
|
* This class is designed to hold a vector that has both positive as
|
|
|
|
* negative indices. It is internally represented as two vectors, one
|
|
|
|
* for non-zero indices and one for negative indices. In this way, the
|
|
|
|
* vector can grow in both directions.
|
|
|
|
* If an index is not available in the vector, the default value is
|
|
|
|
* returned. If an object is put in the vector beyond its size, the
|
|
|
|
* empty spots in between are also filled with the default value.
|
|
|
|
*/
|
|
|
|
template<class T>
|
|
|
|
class compl_vector {
|
|
|
|
public:
|
2012-10-27 13:45:27 +00:00
|
|
|
compl_vector()
|
|
|
|
{}
|
2010-01-10 00:06:02 +00:00
|
|
|
|
|
|
|
void reset(T const & def)
|
|
|
|
{
|
|
|
|
default_ = def;
|
|
|
|
Vp_.clear();
|
|
|
|
Vn_.clear();
|
|
|
|
}
|
|
|
|
|
2010-01-10 13:54:06 +00:00
|
|
|
/// Gets the value at index. If it is not in the vector
|
|
|
|
/// the default value is inserted and returned.
|
2010-01-10 13:17:10 +00:00
|
|
|
T & operator[](int index) {
|
|
|
|
vector<T> & V = index >= 0 ? Vp_ : Vn_;
|
2010-01-10 13:54:06 +00:00
|
|
|
unsigned int const ii = index >= 0 ? index : -index - 1;
|
|
|
|
while (ii >= V.size())
|
2010-01-10 13:17:10 +00:00
|
|
|
V.push_back(default_);
|
2010-01-10 13:54:06 +00:00
|
|
|
return V[ii];
|
2010-01-10 00:06:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
/// The vector for positive indices
|
|
|
|
vector<T> Vp_;
|
|
|
|
/// The vector for negative indices
|
|
|
|
vector<T> Vn_;
|
|
|
|
/// The default value that is inserted in the vector
|
|
|
|
/// if more space is needed
|
|
|
|
T default_;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
/**
|
|
|
|
* The implementation of the algorithm that does the comparison
|
|
|
|
* between two documents.
|
|
|
|
*/
|
|
|
|
class Compare::Impl {
|
|
|
|
public:
|
|
|
|
///
|
2015-03-04 21:22:18 +00:00
|
|
|
Impl(Compare const & compare)
|
2015-03-04 21:35:40 +00:00
|
|
|
: abort_(false), N_(0), M_(0), offset_reverse_diagonal_(0),
|
|
|
|
odd_offset_(0), compare_(compare),
|
|
|
|
old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0),
|
|
|
|
recursion_level_(0), nested_inset_level_(0), D_(0)
|
2009-10-25 10:43:16 +00:00
|
|
|
{}
|
|
|
|
|
|
|
|
///
|
2012-10-27 13:45:27 +00:00
|
|
|
~Impl()
|
|
|
|
{}
|
2009-10-25 10:43:16 +00:00
|
|
|
|
2015-03-04 21:22:18 +00:00
|
|
|
// Algorithm to find the shortest edit string. This algorithm
|
2009-12-19 18:15:20 +00:00
|
|
|
// only needs a linear amount of memory (linear with the sum
|
|
|
|
// of the number of characters in the two paragraph-lists).
|
|
|
|
bool diff(Buffer const * new_buf, Buffer const * old_buf,
|
|
|
|
Buffer const * dest_buf);
|
|
|
|
|
|
|
|
/// Set to true to cancel the algorithm
|
2009-10-25 10:43:16 +00:00
|
|
|
bool abort_;
|
|
|
|
|
2010-01-14 00:41:47 +00:00
|
|
|
///
|
2012-10-27 13:45:27 +00:00
|
|
|
QString status()
|
|
|
|
{
|
2010-01-14 00:41:47 +00:00
|
|
|
QString status;
|
|
|
|
status += toqstr("recursion level:") + " " + QString::number(recursion_level_)
|
|
|
|
+ " " + toqstr("differences:") + " " + QString::number(D_);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
private:
|
2010-01-09 16:51:51 +00:00
|
|
|
/// Finds the middle snake and returns the length of the
|
|
|
|
/// shortest edit script.
|
2010-01-10 21:55:11 +00:00
|
|
|
int findMiddleSnake(DocRangePair const & rp, DocPair & middle_snake);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
2010-01-10 00:09:48 +00:00
|
|
|
enum SnakeResult {
|
|
|
|
NoSnake,
|
|
|
|
SingleSnake,
|
|
|
|
NormalSnake
|
|
|
|
};
|
|
|
|
|
|
|
|
/// Retrieve the middle snake when there is overlap between
|
|
|
|
/// the forward and backward path.
|
2010-01-10 21:55:11 +00:00
|
|
|
SnakeResult retrieveMiddleSnake(int k, int D, Direction direction,
|
2010-01-10 00:09:48 +00:00
|
|
|
DocPair & middle_snake);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2013-04-19 21:26:58 +00:00
|
|
|
/// Find the furthest reaching D-path (number of horizontal
|
2010-01-10 00:09:48 +00:00
|
|
|
/// and vertical steps; differences between the old and new
|
|
|
|
/// document) in the k-diagonal (vertical minus horizontal steps).
|
2010-01-10 21:55:11 +00:00
|
|
|
void furthestDpathKdiagonal(int D, int k,
|
2010-01-10 00:09:48 +00:00
|
|
|
DocRangePair const & rp, Direction direction);
|
|
|
|
|
|
|
|
/// Is there overlap between the forward and backward path
|
|
|
|
bool overlap(int k, int D);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2010-01-09 16:51:51 +00:00
|
|
|
/// This function is called recursively by a divide and conquer
|
|
|
|
/// algorithm. Each time, the string is divided into two split
|
|
|
|
/// around the middle snake.
|
2009-12-19 18:15:20 +00:00
|
|
|
void diff_i(DocRangePair const & rp);
|
|
|
|
|
2012-06-05 10:22:13 +00:00
|
|
|
/// Processes the split chunks. It either adds them as deleted,
|
2009-12-19 18:15:20 +00:00
|
|
|
/// as added, or call diff_i for further processing.
|
2010-01-10 21:55:11 +00:00
|
|
|
void diffPart(DocRangePair const & rp);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
2015-03-04 21:22:18 +00:00
|
|
|
/// Runs the algorithm for the inset located at /c it and /c it_n
|
2009-12-19 18:15:20 +00:00
|
|
|
/// and adds the result to /c pars.
|
2010-01-10 21:55:11 +00:00
|
|
|
void diffInset(Inset * inset, DocPair const & p);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
2010-01-09 16:51:51 +00:00
|
|
|
/// Adds the snake to the destination buffer. The algorithm will
|
|
|
|
/// recursively be applied to any InsetTexts that are within the snake.
|
2010-01-10 21:55:11 +00:00
|
|
|
void processSnake(DocRangePair const & rp);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
/// Writes the range to the destination buffer
|
|
|
|
void writeToDestBuffer(DocRange const & range,
|
|
|
|
Change::Type type = Change::UNCHANGED);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
/// Writes the paragraph list to the destination buffer
|
|
|
|
void writeToDestBuffer(ParagraphList const & copy_pars) const;
|
|
|
|
|
2010-01-09 16:51:51 +00:00
|
|
|
/// The length of the old chunk currently processed
|
2010-01-09 23:59:33 +00:00
|
|
|
int N_;
|
2010-01-09 16:51:51 +00:00
|
|
|
/// The length of the new chunk currently processed
|
2010-01-09 23:59:33 +00:00
|
|
|
int M_;
|
2010-01-10 00:09:48 +00:00
|
|
|
/// The offset diagonal of the reverse path of the
|
|
|
|
/// currently processed chunk
|
|
|
|
int offset_reverse_diagonal_;
|
|
|
|
/// Is the offset odd or even ?
|
|
|
|
bool odd_offset_;
|
2009-12-19 18:15:20 +00:00
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
/// The thread object, used to emit signals to the GUI
|
|
|
|
Compare const & compare_;
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
/// The buffer containing text that will be marked as old
|
|
|
|
Buffer const * old_buf_;
|
|
|
|
/// The buffer containing text that will be marked as new
|
|
|
|
Buffer const * new_buf_;
|
|
|
|
/// The buffer containing text that will be marked as new
|
|
|
|
Buffer const * dest_buf_;
|
|
|
|
|
|
|
|
/// The paragraph list of the destination buffer
|
|
|
|
ParagraphList * dest_pars_;
|
|
|
|
|
|
|
|
/// The level of recursion
|
|
|
|
int recursion_level_;
|
|
|
|
|
|
|
|
/// The number of nested insets at this level
|
|
|
|
int nested_inset_level_;
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
/// The position/snake in the old/new document
|
|
|
|
/// of the forward/reverse search
|
|
|
|
compl_vector<DocIterator> ofp;
|
|
|
|
compl_vector<DocIterator> nfp;
|
|
|
|
compl_vector<DocIterator> ofs;
|
|
|
|
compl_vector<DocIterator> nfs;
|
|
|
|
compl_vector<DocIterator> orp;
|
|
|
|
compl_vector<DocIterator> nrp;
|
|
|
|
compl_vector<DocIterator> ors;
|
|
|
|
compl_vector<DocIterator> nrs;
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2010-01-14 00:41:47 +00:00
|
|
|
/// The number of differences in the path the algorithm
|
|
|
|
/// is currently processing.
|
|
|
|
int D_;
|
2009-10-25 10:43:16 +00:00
|
|
|
};
|
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// Compare
|
|
|
|
//
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
2009-10-25 10:43:16 +00:00
|
|
|
|
|
|
|
Compare::Compare(Buffer const * new_buf, Buffer const * old_buf,
|
|
|
|
Buffer * const dest_buf, CompareOptions const & options)
|
|
|
|
: new_buffer(new_buf), old_buffer(old_buf), dest_buffer(dest_buf),
|
|
|
|
options_(options), pimpl_(new Impl(*this))
|
|
|
|
{
|
2010-01-14 00:41:47 +00:00
|
|
|
connect(&status_timer_, SIGNAL(timeout()),
|
|
|
|
this, SLOT(doStatusMessage()));
|
|
|
|
status_timer_.start(1000);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Compare::doStatusMessage()
|
|
|
|
{
|
|
|
|
statusMessage(pimpl_->status());
|
2009-10-25 10:43:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Compare::run()
|
|
|
|
{
|
2009-12-19 18:15:20 +00:00
|
|
|
if (!dest_buffer || !new_buffer || !old_buffer)
|
2009-10-25 10:43:16 +00:00
|
|
|
return;
|
|
|
|
|
2014-02-07 13:06:39 +00:00
|
|
|
// Copy the buffer params to the destination buffer
|
2009-10-25 10:43:16 +00:00
|
|
|
dest_buffer->params() = options_.settings_from_new
|
|
|
|
? new_buffer->params() : old_buffer->params();
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2014-02-07 13:06:39 +00:00
|
|
|
// Copy extra authors to the destination buffer
|
|
|
|
AuthorList const & extra_authors = options_.settings_from_new ?
|
|
|
|
old_buffer->params().authors() : new_buffer->params().authors();
|
|
|
|
AuthorList::Authors::const_iterator it = extra_authors.begin();
|
2014-04-04 19:54:32 +00:00
|
|
|
for (; it != extra_authors.end(); ++it)
|
2014-02-07 13:06:39 +00:00
|
|
|
dest_buffer->params().authors().record(*it);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2010-01-14 00:41:47 +00:00
|
|
|
doStatusMessage();
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
// do the real work
|
|
|
|
if (!doCompare())
|
2009-12-19 18:15:20 +00:00
|
|
|
return;
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
finished(pimpl_->abort_);
|
2009-10-25 10:43:16 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
int Compare::doCompare()
|
|
|
|
{
|
|
|
|
return pimpl_->diff(new_buffer, old_buffer, dest_buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
void Compare::abort()
|
|
|
|
{
|
|
|
|
pimpl_->abort_ = true;
|
|
|
|
condition_.wakeOne();
|
|
|
|
wait();
|
|
|
|
pimpl_->abort_ = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
static void getParagraphList(DocRange const & range,
|
2009-12-19 18:15:20 +00:00
|
|
|
ParagraphList & pars)
|
|
|
|
{
|
|
|
|
// Clone the paragraphs within the selection.
|
|
|
|
pit_type startpit = range.from.pit();
|
|
|
|
pit_type endpit = range.to.pit();
|
|
|
|
ParagraphList const & ps_ = range.text()->paragraphs();
|
|
|
|
ParagraphList tmp_pars(boost::next(ps_.begin(), startpit),
|
|
|
|
boost::next(ps_.begin(), endpit + 1));
|
|
|
|
|
|
|
|
// Remove the end of the last paragraph; afterwards, remove the
|
|
|
|
// beginning of the first paragraph. Keep this order - there may only
|
|
|
|
// be one paragraph!
|
|
|
|
Paragraph & back = tmp_pars.back();
|
|
|
|
back.eraseChars(range.to.pos(), back.size(), false);
|
|
|
|
Paragraph & front = tmp_pars.front();
|
|
|
|
front.eraseChars(0, range.from.pos(), false);
|
|
|
|
|
|
|
|
pars.insert(pars.begin(), tmp_pars.begin(), tmp_pars.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-09 23:59:33 +00:00
|
|
|
static bool equal(Inset const * i_o, Inset const * i_n)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
|
|
|
if (!i_o || !i_n)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Different types of insets
|
|
|
|
if (i_o->lyxCode() != i_n->lyxCode())
|
|
|
|
return false;
|
|
|
|
|
2015-03-04 21:22:18 +00:00
|
|
|
// Editable insets are assumed to be the same as they are of the
|
2009-12-19 18:15:20 +00:00
|
|
|
// same type. If we later on decide that we insert them in the
|
|
|
|
// document as being unchanged, we will run the algorithm on the
|
|
|
|
// contents of the two insets.
|
|
|
|
// FIXME: This fails if the parameters of the insets differ.
|
|
|
|
// FIXME: We do not recurse into InsetTabulars.
|
|
|
|
// FIXME: We need methods inset->equivalent(inset).
|
|
|
|
if (i_o->editable() && !i_o->asInsetMath()
|
|
|
|
&& i_o->asInsetText())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
ostringstream o_os;
|
|
|
|
ostringstream n_os;
|
|
|
|
i_o->write(o_os);
|
|
|
|
i_n->write(n_os);
|
|
|
|
return o_os.str() == n_os.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-10-27 13:45:27 +00:00
|
|
|
static bool equal(DocIterator & o, DocIterator & n)
|
|
|
|
{
|
2010-01-16 00:22:15 +00:00
|
|
|
// 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;
|
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
Paragraph const & old_par = o.text()->getPar(o.pit());
|
|
|
|
Paragraph const & new_par = n.text()->getPar(n.pit());
|
|
|
|
|
2010-01-09 16:58:55 +00:00
|
|
|
char_type const c_o = old_par.getChar(o.pos());
|
|
|
|
char_type const c_n = new_par.getChar(n.pos());
|
|
|
|
if (c_o != c_n)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (old_par.isInset(o.pos())) {
|
|
|
|
Inset const * i_o = old_par.getInset(o.pos());
|
|
|
|
Inset const * i_n = new_par.getInset(n.pos());
|
|
|
|
|
|
|
|
if (i_o && i_n)
|
|
|
|
return equal(i_o, i_n);
|
2015-03-04 21:22:18 +00:00
|
|
|
}
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
Font fo = old_par.getFontSettings(o.buffer()->params(), o.pos());
|
|
|
|
Font fn = new_par.getFontSettings(n.buffer()->params(), n.pos());
|
2010-01-09 16:58:55 +00:00
|
|
|
return fo == fn;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-03-04 21:22:18 +00:00
|
|
|
/// Traverses a snake in a certain direction. p points to a
|
2010-01-09 23:59:33 +00:00
|
|
|
/// position in the old and new file and they are synchronously
|
|
|
|
/// moved along the snake. The function returns true if a snake
|
|
|
|
/// was found.
|
2010-01-10 21:55:11 +00:00
|
|
|
static bool traverseSnake(DocPair & p, DocRangePair const & range,
|
2010-01-09 23:59:33 +00:00
|
|
|
Direction direction)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
2010-01-09 21:17:10 +00:00
|
|
|
bool ret = false;
|
2015-03-04 21:22:18 +00:00
|
|
|
DocPair const & p_end =
|
2010-01-09 23:59:33 +00:00
|
|
|
direction == Forward ? range.to() : range.from();
|
|
|
|
|
2010-01-09 21:17:10 +00:00
|
|
|
while (p != p_end) {
|
2010-01-09 22:58:20 +00:00
|
|
|
if (direction == Backward)
|
2010-01-09 21:17:10 +00:00
|
|
|
--p;
|
|
|
|
if (!equal(p.o, p.n)) {
|
2010-01-09 22:58:20 +00:00
|
|
|
if (direction == Backward)
|
2010-01-09 21:17:10 +00:00
|
|
|
++p;
|
|
|
|
return ret;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
2010-01-09 22:58:20 +00:00
|
|
|
if (direction == Forward)
|
2010-01-09 21:17:10 +00:00
|
|
|
++p;
|
|
|
|
ret = true;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
2010-01-09 21:17:10 +00:00
|
|
|
return ret;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// Compare::Impl
|
|
|
|
//
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
2010-01-10 00:09:48 +00:00
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
void Compare::Impl::furthestDpathKdiagonal(int D, int k,
|
2010-01-10 00:09:48 +00:00
|
|
|
DocRangePair const & rp, Direction direction)
|
|
|
|
{
|
2010-01-10 13:17:10 +00:00
|
|
|
compl_vector<DocIterator> & op = direction == Forward ? ofp : orp;
|
|
|
|
compl_vector<DocIterator> & np = direction == Forward ? nfp : nrp;
|
|
|
|
compl_vector<DocIterator> & os = direction == Forward ? ofs : ors;
|
|
|
|
compl_vector<DocIterator> & ns = direction == Forward ? nfs : nrs;
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// A vertical step means stepping one character in the new document.
|
|
|
|
bool vertical_step = k == -D;
|
|
|
|
if (!vertical_step && k != D) {
|
|
|
|
vertical_step = direction == Forward
|
2010-01-10 13:17:10 +00:00
|
|
|
? op[k - 1] < op[k + 1] : op[k - 1] > op[k + 1];
|
2010-01-10 00:09:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Where do we take the step from ?
|
|
|
|
int const kk = vertical_step ? k + 1 : k - 1;
|
2010-01-10 13:17:10 +00:00
|
|
|
DocPair p(op[kk], np[kk]);
|
2010-01-21 18:58:55 +00:00
|
|
|
DocPair const s(os[kk], ns[kk]);
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// If D==0 we simulate a vertical step from (0,-1) by doing nothing.
|
|
|
|
if (D != 0) {
|
|
|
|
// Take a step
|
|
|
|
if (vertical_step && direction == Forward)
|
|
|
|
step(p.n, rp.n.to, direction);
|
|
|
|
else if (vertical_step && direction == Backward)
|
|
|
|
step(p.n, rp.n.from, direction);
|
|
|
|
else if (!vertical_step && direction == Forward)
|
|
|
|
step(p.o, rp.o.to, direction);
|
|
|
|
else if (!vertical_step && direction == Backward)
|
|
|
|
step(p.o, rp.o.from, direction);
|
2015-03-04 21:22:18 +00:00
|
|
|
}
|
|
|
|
|
2010-01-10 00:09:48 +00:00
|
|
|
// Traverse snake
|
2010-01-10 21:55:11 +00:00
|
|
|
if (traverseSnake(p, rp, direction)) {
|
2010-01-10 00:09:48 +00:00
|
|
|
// Record last snake
|
2010-01-10 13:17:10 +00:00
|
|
|
os[k] = p.o;
|
|
|
|
ns[k] = p.n;
|
2010-01-10 00:09:48 +00:00
|
|
|
} else {
|
|
|
|
// Copy last snake from the previous step
|
2010-01-21 18:58:55 +00:00
|
|
|
os[k] = s.o;
|
|
|
|
ns[k] = s.n;
|
2010-01-10 00:09:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//Record new position
|
2010-01-10 13:17:10 +00:00
|
|
|
op[k] = p.o;
|
|
|
|
np[k] = p.n;
|
2010-01-10 00:09:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Compare::Impl::overlap(int k, int D)
|
|
|
|
{
|
|
|
|
// To generalize for the forward and reverse checks
|
|
|
|
int kk = offset_reverse_diagonal_ - k;
|
|
|
|
|
|
|
|
// Can we have overlap ?
|
|
|
|
if (kk <= D && kk >= -D) {
|
|
|
|
// Do we have overlap ?
|
|
|
|
if (odd_offset_)
|
2010-01-10 13:17:10 +00:00
|
|
|
return ofp[k] >= orp[kk] && nfp[k] >= nrp[kk];
|
2010-01-10 00:09:48 +00:00
|
|
|
else
|
2010-01-10 13:17:10 +00:00
|
|
|
return ofp[kk] >= orp[k] && nfp[kk] >= nrp[k];
|
2010-01-10 00:09:48 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
Compare::Impl::SnakeResult Compare::Impl::retrieveMiddleSnake(
|
2010-01-10 00:09:48 +00:00
|
|
|
int k, int D, Direction direction, DocPair & middle_snake)
|
|
|
|
{
|
2010-01-10 13:17:10 +00:00
|
|
|
compl_vector<DocIterator> & os = direction == Forward ? ofs : ors;
|
|
|
|
compl_vector<DocIterator> & ns = direction == Forward ? nfs : nrs;
|
|
|
|
compl_vector<DocIterator> & os_r = direction == Forward ? ors : ofs;
|
|
|
|
compl_vector<DocIterator> & ns_r = direction == Forward ? nrs : nfs;
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// The diagonal while doing the backward search
|
|
|
|
int kk = -k + offset_reverse_diagonal_;
|
|
|
|
|
|
|
|
// Did we find a snake ?
|
2010-01-10 13:17:10 +00:00
|
|
|
if (os[k].empty() && os_r[kk].empty()) {
|
2010-01-10 00:09:48 +00:00
|
|
|
// No, there is no snake at all, in which case
|
|
|
|
// the length of the shortest edit script is M+N.
|
2013-04-25 21:27:10 +00:00
|
|
|
LATTEST(2 * D - odd_offset_ == M_ + N_);
|
2010-01-10 00:09:48 +00:00
|
|
|
return NoSnake;
|
2015-03-04 21:22:18 +00:00
|
|
|
}
|
|
|
|
|
2010-01-10 13:17:10 +00:00
|
|
|
if (os[k].empty()) {
|
2010-01-10 00:09:48 +00:00
|
|
|
// Yes, but there is only 1 snake and we found it in the
|
|
|
|
// reverse path.
|
2010-01-10 13:17:10 +00:00
|
|
|
middle_snake.o = os_r[kk];
|
|
|
|
middle_snake.n = ns_r[kk];
|
2010-01-10 00:09:48 +00:00
|
|
|
return SingleSnake;
|
|
|
|
}
|
|
|
|
|
2010-01-10 13:17:10 +00:00
|
|
|
middle_snake.o = os[k];
|
|
|
|
middle_snake.n = ns[k];
|
2010-01-10 00:09:48 +00:00
|
|
|
return NormalSnake;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
|
2010-01-10 00:09:48 +00:00
|
|
|
DocPair & middle_snake)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
2010-01-10 00:09:48 +00:00
|
|
|
// The lengths of the old and new chunks.
|
2010-01-09 23:59:33 +00:00
|
|
|
N_ = rp.o.length();
|
|
|
|
M_ = rp.n.length();
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// Forward paths are centered around the 0-diagonal; reverse paths
|
|
|
|
// are centered around the diagonal N - M. (Delta in the article)
|
|
|
|
offset_reverse_diagonal_ = N_ - M_;
|
|
|
|
|
|
|
|
// If the offset is odd, only check for overlap while extending forward
|
|
|
|
// paths, otherwise only check while extending reverse paths.
|
|
|
|
odd_offset_ = (offset_reverse_diagonal_ % 2 != 0);
|
|
|
|
|
|
|
|
ofp.reset(rp.o.from);
|
|
|
|
nfp.reset(rp.n.from);
|
|
|
|
ofs.reset(DocIterator());
|
|
|
|
nfs.reset(DocIterator());
|
|
|
|
orp.reset(rp.o.to);
|
|
|
|
nrp.reset(rp.n.to);
|
|
|
|
ors.reset(DocIterator());
|
|
|
|
nrs.reset(DocIterator());
|
|
|
|
|
2010-01-15 16:32:05 +00:00
|
|
|
// In the formula below, the "+ 1" ensures we round like ceil()
|
|
|
|
int const D_max = (M_ + N_ + 1)/2;
|
2010-01-10 00:09:48 +00:00
|
|
|
// D is the number of horizontal and vertical steps, i.e.
|
|
|
|
// different characters in the old and new chunk.
|
|
|
|
for (int D = 0; D <= D_max; ++D) {
|
2010-01-14 00:41:47 +00:00
|
|
|
// to be used in the status messages
|
2015-03-04 21:22:18 +00:00
|
|
|
D_ = D;
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// Forward and reverse paths
|
|
|
|
for (int f = 0; f < 2; ++f) {
|
|
|
|
Direction direction = f == 0 ? Forward : Backward;
|
|
|
|
|
|
|
|
// Diagonals between -D and D can be reached by a D-path
|
2015-03-04 21:22:18 +00:00
|
|
|
for (int k = -D; k <= D; k += 2) {
|
2010-01-10 00:09:48 +00:00
|
|
|
// Find the furthest reaching D-path on this diagonal
|
2010-01-10 21:55:11 +00:00
|
|
|
furthestDpathKdiagonal(D, k, rp, direction);
|
2010-01-10 00:09:48 +00:00
|
|
|
|
|
|
|
// Only check for overlap for forward paths if the offset is odd
|
|
|
|
// and only for reverse paths if the offset is even.
|
|
|
|
if (odd_offset_ == (direction == Forward)) {
|
|
|
|
|
|
|
|
// Do the forward and backward paths overlap ?
|
|
|
|
if (overlap(k, D - odd_offset_)) {
|
2010-01-10 21:55:11 +00:00
|
|
|
retrieveMiddleSnake(k, D, direction, middle_snake);
|
2010-01-10 00:09:48 +00:00
|
|
|
return 2 * D - odd_offset_;
|
|
|
|
}
|
|
|
|
}
|
2010-01-14 00:56:55 +00:00
|
|
|
if (abort_)
|
|
|
|
return 0;
|
2010-01-10 00:09:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// This should never be reached
|
|
|
|
return -2;
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
|
|
|
|
Buffer const * dest_buf)
|
|
|
|
{
|
|
|
|
if (!new_buf || !old_buf || !dest_buf)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
old_buf_ = old_buf;
|
|
|
|
new_buf_ = new_buf;
|
|
|
|
dest_buf_ = dest_buf;
|
|
|
|
dest_pars_ = &dest_buf->inset().asInsetText()->paragraphs();
|
|
|
|
dest_pars_->clear();
|
|
|
|
|
|
|
|
recursion_level_ = 0;
|
|
|
|
nested_inset_level_ = 0;
|
|
|
|
|
|
|
|
DocRangePair rp(old_buf_, new_buf_);
|
|
|
|
|
|
|
|
DocPair from = rp.from();
|
2010-01-10 21:55:11 +00:00
|
|
|
traverseSnake(from, rp, Forward);
|
2010-01-09 21:17:10 +00:00
|
|
|
DocRangePair const snake(rp.from(), from);
|
2010-01-10 21:55:11 +00:00
|
|
|
processSnake(snake);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
// Start the recursive algorithm
|
2010-01-24 00:55:08 +00:00
|
|
|
DocRangePair rp_new(from, rp.to());
|
|
|
|
if (!rp_new.o.empty() || !rp_new.n.empty())
|
|
|
|
diff_i(rp_new);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
|
|
|
|
(*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));
|
|
|
|
(*dest_pars_)[p].setInsetOwner(&dest_buf_->inset());
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Compare::Impl::diff_i(DocRangePair const & rp)
|
|
|
|
{
|
2010-01-14 00:56:55 +00:00
|
|
|
if (abort_)
|
|
|
|
return;
|
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
// The middle snake
|
|
|
|
DocPair middle_snake;
|
|
|
|
|
|
|
|
// Divides the problem into two smaller problems, split around
|
|
|
|
// the snake in the middle.
|
2010-01-10 21:55:11 +00:00
|
|
|
int const L_ses = findMiddleSnake(rp, middle_snake);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
// Set maximum of progress bar
|
|
|
|
if (++recursion_level_ == 1)
|
|
|
|
compare_.progressMax(L_ses);
|
|
|
|
|
|
|
|
// There are now three possibilities: the strings were the same,
|
|
|
|
// the strings were completely different, or we found a middle
|
|
|
|
// snake and we can split the string into two parts to process.
|
|
|
|
if (L_ses == 0)
|
|
|
|
// Two the same strings (this must be a very rare case, because
|
|
|
|
// usually this will be part of a snake adjacent to these strings).
|
|
|
|
writeToDestBuffer(rp.o);
|
|
|
|
|
|
|
|
else if (middle_snake.o.empty()) {
|
|
|
|
// Two totally different strings
|
|
|
|
writeToDestBuffer(rp.o, Change::DELETED);
|
|
|
|
writeToDestBuffer(rp.n, Change::INSERTED);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
// Retrieve the complete snake
|
2010-01-09 21:17:10 +00:00
|
|
|
DocPair first_part_end = middle_snake;
|
2010-01-10 21:55:11 +00:00
|
|
|
traverseSnake(first_part_end, rp, Backward);
|
2010-01-09 21:17:10 +00:00
|
|
|
DocRangePair first_part(rp.from(), first_part_end);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2010-01-09 21:17:10 +00:00
|
|
|
DocPair second_part_begin = middle_snake;
|
2010-01-10 21:55:11 +00:00
|
|
|
traverseSnake(second_part_begin, rp, Forward);
|
2010-01-09 21:17:10 +00:00
|
|
|
DocRangePair second_part(second_part_begin, rp.to());
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
// Split the string in three parts:
|
|
|
|
// 1. in front of the snake
|
2010-01-10 21:55:11 +00:00
|
|
|
diffPart(first_part);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
// 2. the snake itself, and
|
|
|
|
DocRangePair const snake(first_part.to(), second_part.from());
|
2010-01-10 21:55:11 +00:00
|
|
|
processSnake(snake);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
// 3. behind the snake.
|
2010-01-10 21:55:11 +00:00
|
|
|
diffPart(second_part);
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
--recursion_level_;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
void Compare::Impl::diffPart(DocRangePair const & rp)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
|
|
|
// Is there a finite length string in both buffers, if not there
|
|
|
|
// is an empty string and we write the other one to the buffer.
|
|
|
|
if (!rp.o.empty() && !rp.n.empty())
|
|
|
|
diff_i(rp);
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
else if (!rp.o.empty())
|
|
|
|
writeToDestBuffer(rp.o, Change::DELETED);
|
|
|
|
|
|
|
|
else if (!rp.n.empty())
|
|
|
|
writeToDestBuffer(rp.n, Change::INSERTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
void Compare::Impl::diffInset(Inset * inset, DocPair const & p)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
|
|
|
// Find the dociterators for the beginning and the
|
|
|
|
// end of the inset, for the old and new document.
|
|
|
|
DocRangePair const rp = stepIntoInset(p);
|
|
|
|
|
|
|
|
// Recurse into the inset. Temporarily replace the dest_pars
|
|
|
|
// paragraph list by the paragraph list of the nested inset.
|
|
|
|
ParagraphList * backup_dest_pars = dest_pars_;
|
|
|
|
dest_pars_ = &inset->asInsetText()->text().paragraphs();
|
|
|
|
dest_pars_->clear();
|
2015-03-04 21:22:18 +00:00
|
|
|
|
2009-12-19 18:15:20 +00:00
|
|
|
++nested_inset_level_;
|
|
|
|
diff_i(rp);
|
|
|
|
--nested_inset_level_;
|
|
|
|
|
|
|
|
dest_pars_ = backup_dest_pars;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-10 21:55:11 +00:00
|
|
|
void Compare::Impl::processSnake(DocRangePair const & rp)
|
2009-12-19 18:15:20 +00:00
|
|
|
{
|
|
|
|
ParagraphList pars;
|
2010-01-10 21:55:11 +00:00
|
|
|
getParagraphList(rp.o, pars);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
// Find insets in this paragaph list
|
|
|
|
DocPair it = rp.from();
|
|
|
|
for (; it.o < rp.o.to; ++it) {
|
|
|
|
Inset * inset = it.o.text()->getPar(it.o.pit()).getInset(it.o.pos());
|
|
|
|
if (inset && inset->editable() && inset->asInsetText()) {
|
|
|
|
// Find the inset in the paragraph list that will be pasted into
|
|
|
|
// the final document. The contents of the inset will be replaced
|
|
|
|
// by the output of the algorithm below.
|
|
|
|
pit_type const pit = it.o.pit() - rp.o.from.pit();
|
|
|
|
pos_type const pos = pit ? it.o.pos() : it.o.pos() - rp.o.from.pos();
|
|
|
|
inset = pars[pit].getInset(pos);
|
2013-04-25 21:27:10 +00:00
|
|
|
LASSERT(inset, continue);
|
2010-01-10 21:55:11 +00:00
|
|
|
diffInset(inset, it);
|
2009-12-19 18:15:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
writeToDestBuffer(pars);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Compare::Impl::writeToDestBuffer(DocRange const & range,
|
|
|
|
Change::Type type)
|
|
|
|
{
|
|
|
|
ParagraphList pars;
|
2010-01-10 21:55:11 +00:00
|
|
|
getParagraphList(range, pars);
|
2009-12-19 18:15:20 +00:00
|
|
|
|
|
|
|
pos_type size = 0;
|
|
|
|
|
|
|
|
// Set the change
|
|
|
|
ParagraphList::iterator it = pars.begin();
|
|
|
|
for (; it != pars.end(); ++it) {
|
|
|
|
it->setChange(Change(type));
|
|
|
|
size += it->size();
|
|
|
|
}
|
|
|
|
|
|
|
|
writeToDestBuffer(pars);
|
|
|
|
|
|
|
|
if (nested_inset_level_ == 0)
|
|
|
|
compare_.progress(size);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Compare::Impl::writeToDestBuffer(ParagraphList const & pars) const
|
2009-10-25 10:43:16 +00:00
|
|
|
{
|
2009-12-19 18:15:20 +00:00
|
|
|
pit_type const pit = dest_pars_->size() - 1;
|
|
|
|
dest_pars_->insert(dest_pars_->end(), pars.begin(), pars.end());
|
|
|
|
if (pit >= 0)
|
|
|
|
mergeParagraph(dest_buf_->params(), *dest_pars_, pit);
|
2009-10-25 10:43:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#include "moc_Compare.cpp"
|
|
|
|
|
|
|
|
} // namespace lyx
|