#include "Compare.h"
+#include "Author.h"
+#include "Buffer.h"
#include "BufferParams.h"
#include "Changes.h"
+#include "CutAndPaste.h"
+#include "ErrorList.h"
#include "Font.h"
#include "insets/InsetText.h"
-#include "support/lassert.h"
+#include "support/docstream.h"
+#include "support/lassert.h"
#include "support/qstring_helpers.h"
-#include <boost/next_prior.hpp>
-
using namespace std;
using namespace lyx::support;
*/
class DocRange {
public:
- DocRange(DocIterator from_, DocIterator to_)
+ DocRange(DocIterator const & from_, DocIterator const & to_)
: from(from_), to(to_)
{}
- DocRange(Buffer const * buf)
+ DocRange(Buffer const * buf) :
+ from(doc_iterator_begin(buf)),
+ to(doc_iterator_end(buf))
{
- from = doc_iterator_begin(buf);
- to = doc_iterator_end(buf);
to.backwardPos();
}
DocPair()
{}
- DocPair(DocIterator o_, DocIterator n_)
+ DocPair(DocIterator const & o_, DocIterator const & n_)
: o(o_), n(n_)
{}
- bool operator!=(DocPair const & rhs)
+ bool operator!=(DocPair const & rhs) const
{
// this might not be intuitive but correct for our purpose
return o != rhs.o && n != rhs.n;
}
-
+
DocPair & operator++()
{
///
DocIterator n;
};
-
+
/**
* A pair of two DocRanges.
*/
class DocRangePair {
public:
- DocRangePair(DocRange o_, DocRange n_)
+ DocRangePair(DocRange const & o_, DocRange const & n_)
: o(o_), n(n_)
{}
-
- DocRangePair(DocPair from, DocPair to)
+
+ DocRangePair(DocPair const & from, DocPair const & to)
: o(from.o, to.o), n(from.n, to.n)
{}
class Compare::Impl {
public:
///
- Impl(Compare const & compare)
- : abort_(false), compare_(compare), recursion_level_(0), D_(0)
+ Impl(Compare const & compare)
+ : abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
+ odd_offset_(false), compare_(compare),
+ old_buf_(nullptr), new_buf_(nullptr), dest_buf_(nullptr),
+ dest_pars_(nullptr), recursion_level_(0), nested_inset_level_(0), D_(0)
{}
///
~Impl()
{}
- // Algorithm to find the shortest edit string. This algorithm
+ // Algorithm to find the shortest edit string. This algorithm
// 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,
/// the forward and backward path.
SnakeResult retrieveMiddleSnake(int k, int D, Direction direction,
DocPair & middle_snake);
-
+
/// Find the furthest reaching D-path (number of horizontal
/// and vertical steps; differences between the old and new
/// document) in the k-diagonal (vertical minus horizontal steps).
/// Is there overlap between the forward and backward path
bool overlap(int k, int D);
-
+
/// This function is called recursively by a divide and conquer
/// algorithm. Each time, the string is divided into two split
/// around the middle snake.
/// as added, or call diff_i for further processing.
void diffPart(DocRangePair const & rp);
- /// Runs the algorithm for the inset located at /c it and /c it_n
+ /// Runs the algorithm for the inset located at /c it and /c it_n
/// and adds the result to /c pars.
void diffInset(Inset * inset, DocPair const & p);
/// Writes the range to the destination buffer
void writeToDestBuffer(DocRange const & range,
Change::Type type = Change::UNCHANGED);
-
+
/// Writes the paragraph list to the destination buffer
void writeToDestBuffer(ParagraphList const & copy_pars) const;
/// The length of the old chunk currently processed
- int N_;
+ int n_;
/// The length of the new chunk currently processed
- int M_;
+ int m_;
/// The offset diagonal of the reverse path of the
/// currently processed chunk
int offset_reverse_diagonal_;
compl_vector<DocIterator> nrp;
compl_vector<DocIterator> ors;
compl_vector<DocIterator> nrs;
-
+
/// The number of differences in the path the algorithm
/// is currently processing.
int D_;
if (!dest_buffer || !new_buffer || !old_buffer)
return;
- // Copy the buffer params to the new buffer
+ // Copy the buffer params to the destination buffer
dest_buffer->params() = options_.settings_from_new
? new_buffer->params() : old_buffer->params();
-
- doStatusMessage();
+ // 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();
+ for (; it != extra_authors.end(); ++it)
+ dest_buffer->params().authors().record(*it);
+
+ // We will need this later
+ DocumentClassConstPtr const olddc =
+ dest_buffer->params().documentClassPtr();
+ // We do not want to share the DocumentClass with the other Buffer.
+ // See bug #10295.
+ dest_buffer->params().makeDocumentClass(dest_buffer->isClone(), dest_buffer->isInternal());
- // do the real work
+ doStatusMessage();
+ // Do the real work
if (!doCompare())
return;
-
+
+ // The comparison routine simply copies the paragraphs over into the
+ // new buffer with the document class from wherever they came from.
+ // So we need to reset the document class of all the paragraphs.
+ // See bug #10295.
+ cap::switchBetweenClasses(
+ olddc, dest_buffer->params().documentClassPtr(),
+ static_cast<InsetText &>(dest_buffer->inset()));
+
finished(pimpl_->abort_);
- return;
}
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));
+ ParagraphList tmp_pars(ps_.iterator_at(startpit),
+ ps_.iterator_at(endpit + 1));
// Remove the end of the last paragraph; afterwards, remove the
// beginning of the first paragraph. Keep this order - there may only
if (i_o->lyxCode() != i_n->lyxCode())
return false;
- // Editable insets are assumed to be the same as they are of the
+ // Editable insets are assumed to be the same as they are of the
// 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.
if (i_o && i_n)
return equal(i_o, i_n);
- }
+ }
Font fo = old_par.getFontSettings(o.buffer()->params(), o.pos());
Font fn = new_par.getFontSettings(n.buffer()->params(), n.pos());
}
-/// Traverses a snake in a certain direction. p points to a
+/// Traverses a snake in a certain direction. p points to a
/// position in the old and new file and they are synchronously
/// moved along the snake. The function returns true if a snake
/// was found.
Direction direction)
{
bool ret = false;
- DocPair const & p_end =
+ DocPair const & p_end =
direction == Forward ? range.to() : range.from();
while (p != p_end) {
step(p.o, rp.o.to, direction);
else if (!vertical_step && direction == Backward)
step(p.o, rp.o.from, direction);
- }
-
+ }
+
// Traverse snake
if (traverseSnake(p, rp, direction)) {
// Record last snake
if (os[k].empty() && os_r[kk].empty()) {
// No, there is no snake at all, in which case
// the length of the shortest edit script is M+N.
- LASSERT(2 * D - odd_offset_ == M_ + N_, /**/);
+ LATTEST(2 * D - odd_offset_ == m_ + n_);
return NoSnake;
- }
-
+ }
+
if (os[k].empty()) {
// Yes, but there is only 1 snake and we found it in the
// reverse path.
DocPair & middle_snake)
{
// The lengths of the old and new chunks.
- N_ = rp.o.length();
- M_ = rp.n.length();
+ n_ = rp.o.length();
+ m_ = rp.n.length();
// 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_;
+ 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.
nrs.reset(DocIterator());
// In the formula below, the "+ 1" ensures we round like ceil()
- int const D_max = (M_ + N_ + 1)/2;
+ int const D_max = (m_ + n_ + 1)/2;
// 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) {
// to be used in the status messages
- D_ = D;
+ D_ = D;
// 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
- for (int k = -D; k <= D; k += 2) {
+ for (int k = -D; k <= D; k += 2) {
// Find the furthest reaching D-path on this diagonal
furthestDpathKdiagonal(D, k, rp, direction);
traverseSnake(from, rp, Forward);
DocRangePair const snake(rp.from(), from);
processSnake(snake);
-
+
// Start the recursive algorithm
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));
+ (*dest_pars_)[p].setInsetBuffers(const_cast<Buffer &>(*dest_buf));
(*dest_pars_)[p].setInsetOwner(&dest_buf_->inset());
}
DocPair first_part_end = middle_snake;
traverseSnake(first_part_end, rp, Backward);
DocRangePair first_part(rp.from(), first_part_end);
-
+
DocPair second_part_begin = middle_snake;
traverseSnake(second_part_begin, rp, Forward);
DocRangePair second_part(second_part_begin, rp.to());
-
+
// Split the string in three parts:
// 1. in front of the snake
diffPart(first_part);
// is an empty string and we write the other one to the buffer.
if (!rp.o.empty() && !rp.n.empty())
diff_i(rp);
-
+
else if (!rp.o.empty())
writeToDestBuffer(rp.o, Change::DELETED);
ParagraphList * backup_dest_pars = dest_pars_;
dest_pars_ = &inset->asInsetText()->text().paragraphs();
dest_pars_->clear();
-
+
++nested_inset_level_;
diff_i(rp);
--nested_inset_level_;
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);
- LASSERT(inset, /**/);
+ LASSERT(inset, continue);
diffInset(inset, it);
}
}
// Set the change
ParagraphList::iterator it = pars.begin();
for (; it != pars.end(); ++it) {
- it->setChange(Change(type));
+ it->setChange(Change(type, compare_.options_.author));
size += it->size();
}
projects / lyx.git / blobdiff