X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=214f25cc7f7d6dee5b45abf3c8934902a4c2eab2;hb=79cf3f5ec1088e7de988e889247ec300d42fb70b;hp=5831f2211114ef6c78e7a313f9e4d3dd1c2958cb;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git diff --git a/src/Compare.cpp b/src/Compare.cpp index 5831f22111..214f25cc7f 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -12,17 +12,20 @@ #include "Compare.h" +#include "Author.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/lyxalgo.h" #include "support/qstring_helpers.h" -#include - using namespace std; using namespace lyx::support; @@ -57,14 +60,14 @@ static void step(DocIterator & dit, DocIterator const & end, Direction direction */ 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(); } @@ -109,7 +112,7 @@ public: // this might not be intuitive but correct for our purpose return o != rhs.o && n != rhs.n; } - + DocPair & operator++() { @@ -129,17 +132,17 @@ public: /// 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) {} @@ -227,15 +230,18 @@ private: 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_(0), compare_(compare), + old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0), + 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, @@ -268,8 +274,8 @@ private: /// the forward and backward path. SnakeResult retrieveMiddleSnake(int k, int D, Direction direction, DocPair & middle_snake); - - /// Find the the furthest reaching D-path (number of horizontal + + /// 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). void furthestDpathKdiagonal(int D, int k, @@ -277,7 +283,7 @@ private: /// 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. @@ -287,7 +293,7 @@ private: /// 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); @@ -298,14 +304,14 @@ private: /// 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_; @@ -341,7 +347,7 @@ private: compl_vector nrp; compl_vector ors; compl_vector nrs; - + /// The number of differences in the path the algorithm /// is currently processing. int D_; @@ -375,16 +381,37 @@ void Compare::run() 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(); - // 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. + ErrorList el; + cap::switchBetweenClasses( + olddc, dest_buffer->params().documentClassPtr(), + static_cast(dest_buffer->inset()), el); + finished(pimpl_->abort_); return; } @@ -412,8 +439,8 @@ static void getParagraphList(DocRange const & range, 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(lyx::next(ps_.begin(), startpit), + lyx::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 @@ -436,7 +463,7 @@ static bool equal(Inset const * i_o, Inset const * i_n) 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. @@ -478,7 +505,7 @@ static bool equal(DocIterator & o, DocIterator & n) 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()); @@ -486,7 +513,7 @@ static bool equal(DocIterator & o, DocIterator & n) } -/// 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. @@ -494,7 +521,7 @@ static bool traverseSnake(DocPair & p, DocRangePair const & range, Direction direction) { bool ret = false; - DocPair const & p_end = + DocPair const & p_end = direction == Forward ? range.to() : range.from(); while (p != p_end) { @@ -551,8 +578,8 @@ void Compare::Impl::furthestDpathKdiagonal(int D, int k, 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 @@ -602,10 +629,10 @@ Compare::Impl::SnakeResult Compare::Impl::retrieveMiddleSnake( 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. @@ -624,12 +651,12 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp, 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. @@ -645,19 +672,19 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp, 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); @@ -702,14 +729,14 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf, 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(*dest_buf)); + (*dest_pars_)[p].setInsetBuffers(const_cast(*dest_buf)); (*dest_pars_)[p].setInsetOwner(&dest_buf_->inset()); } @@ -751,11 +778,11 @@ void Compare::Impl::diff_i(DocRangePair const & rp) 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); @@ -777,7 +804,7 @@ void Compare::Impl::diffPart(DocRangePair const & rp) // 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); @@ -797,7 +824,7 @@ void Compare::Impl::diffInset(Inset * inset, DocPair const & p) ParagraphList * backup_dest_pars = dest_pars_; dest_pars_ = &inset->asInsetText()->text().paragraphs(); dest_pars_->clear(); - + ++nested_inset_level_; diff_i(rp); --nested_inset_level_; @@ -822,7 +849,7 @@ void Compare::Impl::processSnake(DocRangePair const & rp) 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); } }