#include "changes.h"
#include "debug.h"
+#include <cmath>
#include <boost/assert.hpp>
namespace lyx {
+using std::abs;
using std::endl;
using std::string;
-
+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().
+ */
bool operator==(Change const & l, Change const & r)
{
- return l.type == r.type && l.author == r.author
- && l.changetime == r.changetime;
+ if (l.type != r.type) {
+ return false;
+ }
+
+ 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;
}
ChangeTable::iterator it = table_.begin();
for (; it != table_.end(); ) {
- // find super change, check for equal types, and do nothing
- if (it->range.contains(newRange) && it->change.type == change.type) {
- return;
- }
-
// current change starts like or follows new change
if (it->range.start >= start) {
break;
<< (it + 1)->range.end << ")" << endl;
}
(it + 1)->range.start = it->range.start;
+ (it + 1)->change.changetime = max(it->change.changetime,
+ (it + 1)->change.changetime);
table_.erase(it);
// start again
it = table_.begin();
int Changes::latexMarkChange(odocstream & os,
- Change::Type const old, Change::Type const change,
+ Change::Type const oldChangeType, Change::Type const changeType,
bool const & output)
{
- // FIXME: change tracking (MG)
- if (!output || old == change)
+ if (!output || oldChangeType == changeType)
return 0;
static docstring const start(from_ascii("\\changestart{}"));
int column = 0;
- if (old == Change::DELETED) {
+ if (oldChangeType == Change::DELETED) {
os << soff;
column += soff.length();
}
- switch (change) {
+ switch (changeType) {
case Change::UNCHANGED:
os << end;
column += end.length();
break;
case Change::DELETED:
- if (old == Change::UNCHANGED) {
+ if (oldChangeType == Change::UNCHANGED) {
os << start;
column += start.length();
}
break;
case Change::INSERTED:
- if (old == Change::UNCHANGED) {
+ if (oldChangeType == Change::UNCHANGED) {
os << start;
column += start.length();
}
void Changes::lyxMarkChange(std::ostream & os, int & column,
- time_type const curtime,
Change const & old, Change const & change)
{
- // FIXME: change tracking (MG)
if (old == change)
return;
break;
case Change::DELETED: {
- time_type t = change.changetime;
- if (!t)
- t = curtime;
os << "\n\\change_deleted " << change.author
- << " " << t << "\n";
-
+ << " " << change.changetime << "\n";
break;
}
- case Change::INSERTED: {
- time_type t = change.changetime;
- if (!t)
- t = curtime;
+ case Change::INSERTED: {
os << "\n\\change_inserted " << change.author
- << " " << t << "\n";
+ << " " << change.changetime << "\n";
break;
- }
+ }
}
}