* src/CutAndPaste.C:

[lyx.git] / src / changes.C

diff --git a/src/changes.C b/src/changes.C
index 53d89e494e70c7e5d3256d8e483ef388a67b646d..511e429ede717258b03927e40e0335fc533a34c5 100644 (file)
--- a/src/changes.C
+++ b/src/changes.C
@@ -16,7 +16,6 @@
 #include "changes.h"
 #include "debug.h"
 
-#include <cmath>
 #include <boost/assert.hpp>
 
 
@@ -31,27 +30,40 @@ using std::max;
  * Class Change has a changetime field that specifies the exact time at which
  * a specific change was made. The change time is used as a guidance for the
  * user while editing his document. Presently, it is not considered for LaTeX
- * export. To avoid that every keystroke results in a separate change, a 
- * tolerance interval of 5 minutes is used. That means if there are two adjacent
- * changes that only differ in their change time with abs(ct1 - ct2) < 300 sec,
- * they will be merged (and the later change time is preserved).
- * Technically, the check for equality (or similarity) is made in operator==(...).
- * The merging of similar changes happens in method merge().
+ * export.
+ * When merging two adjacent changes, the changetime is not considered,
+ * only the equality of the change type and author is checked (in method
+ * isSimilarTo(...)). If two changes are in fact merged (in method merge()),
+ * the later change time is preserved. 
  */
 
+bool Change::isSimilarTo(Change const & change)
+{
+       if (type != change.type) {
+               return false;
+       }
+
+       if (type == Change::UNCHANGED) {
+               return true;
+       }
+
+       return author == change.author;
+}
+
+
 bool operator==(Change const & l, Change const & r)
 {
        if (l.type != r.type) {
                return false;
        }
 
+       // two changes of type UNCHANGED are always equal
        if (l.type == Change::UNCHANGED) {
                return true;
        }
-
-       return l.author == r.author
-              // both changes made within 5 minutes?
-              && abs(difftime(l.changetime, r.changetime)) < 300;
+       
+       return l.author == r.author &&
+              l.changetime == r.changetime;
 }
 
 
@@ -73,18 +85,6 @@ bool operator!=(Changes::Range const & r1, Changes::Range const & r2)
 }
 
 
-bool Changes::Range::contains(Range const & r) const
-{
-       return r.start >= start && r.end <= end;
-}
-
-
-bool Changes::Range::contains(pos_type const pos) const
-{
-       return pos >= start && pos < end;
-}
-
-
 bool Changes::Range::intersects(Range const & r) const
 {
        return r.start < end && r.end > start; // end itself is not in the range!
@@ -226,11 +226,10 @@ void Changes::insert(Change const & change, lyx::pos_type pos)
 }
 
 
-Change const Changes::lookup(pos_type const pos) const
+Change const & Changes::lookup(pos_type const pos) const
 {
-       if (table_.empty()) {
-               return Change(Change::UNCHANGED);
-       }
+       static Change const noChange = Change(Change::UNCHANGED);
+               
        ChangeTable::const_iterator it = table_.begin();
        ChangeTable::const_iterator const end = table_.end();
 
@@ -239,7 +238,7 @@ Change const Changes::lookup(pos_type const pos) const
                        return it->change;
        }
 
-       return Change(Change::UNCHANGED);
+       return noChange;
 }
 
 
@@ -293,7 +292,7 @@ void Changes::merge()
                if (it + 1 == table_.end())
                        break;
 
-               if (it->change == (it + 1)->change && it->range.end == (it + 1)->range.start) {
+               if (it->change.isSimilarTo((it + 1)->change) && it->range.end == (it + 1)->range.start) {
                        if (lyxerr.debugging(Debug::CHANGES)) {
                                lyxerr[Debug::CHANGES] << "  merging ranges (" << it->range.start << ", "
                                        << it->range.end << ") and (" << (it + 1)->range.start << ", "