#include <config.h>
#include "Changes.h"
-#include "debug.h"
+#include "Author.h"
+#include "BufferParams.h"
+#include "LaTeXFeatures.h"
-#include <boost/assert.hpp>
+#include "support/debug.h"
+#include "support/lassert.h"
-namespace lyx {
+#include <ostream>
+
+using namespace std;
-using std::abs;
-using std::endl;
-using std::string;
-using std::max;
+namespace lyx {
/*
* Class Change has a changetime field that specifies the exact time at which
* 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.
+ * the later change time is preserved.
*/
bool Change::isSimilarTo(Change const & change)
{
- if (type != change.type) {
+ if (type != change.type)
return false;
- }
- if (type == Change::UNCHANGED) {
+ if (type == Change::UNCHANGED)
return true;
- }
return author == change.author;
}
bool operator==(Change const & l, Change const & r)
{
- if (l.type != r.type) {
+ if (l.type != r.type)
return false;
- }
// two changes of type UNCHANGED are always equal
- if (l.type == Change::UNCHANGED) {
+ if (l.type == Change::UNCHANGED)
return true;
- }
-
- return l.author == r.author &&
- l.changetime == r.changetime;
+
+ return l.author == r.author && l.changetime == r.changetime;
}
void Changes::set(Change const & change, pos_type const start, pos_type const end)
{
if (change.type != Change::UNCHANGED) {
- LYXERR(Debug::CHANGES) << "setting change (type: " << change.type
- << ", author: " << change.author << ", time: " << change.changetime
- << ") in range (" << start << ", " << end << ")" << endl;
+ LYXERR(Debug::CHANGES, "setting change (type: " << change.type
+ << ", author: " << change.author
+ << ", time: " << long(change.changetime)
+ << ") in range (" << start << ", " << end << ")");
}
Range const newRange(start, end);
pos_type oldEnd = it->range.end;
it->range.end = start;
- LYXERR(Debug::CHANGES) << " cutting tail of type " << it->change.type
+ LYXERR(Debug::CHANGES, " cutting tail of type " << it->change.type
<< " resulting in range (" << it->range.start << ", "
- << it->range.end << ")" << endl;
+ << it->range.end << ")");
++it;
if (oldEnd >= end) {
- LYXERR(Debug::CHANGES) << " inserting tail in range ("
- << end << ", " << oldEnd << ")" << endl;
+ LYXERR(Debug::CHANGES, " inserting tail in range ("
+ << end << ", " << oldEnd << ")");
it = table_.insert(it, ChangeRange((it-1)->change, Range(end, oldEnd)));
}
continue;
}
if (change.type != Change::UNCHANGED) {
- LYXERR(Debug::CHANGES) << " inserting change" << endl;
+ LYXERR(Debug::CHANGES, " inserting change");
it = table_.insert(it, ChangeRange(change, Range(start, end)));
++it;
}
for (; it != table_.end(); ) {
// new change 'contains' existing change
if (newRange.contains(it->range)) {
- LYXERR(Debug::CHANGES) << " removing subrange ("
- << it->range.start << ", " << it->range.end << ")" << endl;
+ LYXERR(Debug::CHANGES, " removing subrange ("
+ << it->range.start << ", " << it->range.end << ")");
it = table_.erase(it);
continue;
}
// new change precedes existing change
- if (it->range.start >= end) {
+ if (it->range.start >= end)
break;
- }
// new change intersects with existing change
it->range.start = end;
- LYXERR(Debug::CHANGES) << " cutting head of type "
+ LYXERR(Debug::CHANGES, " cutting head of type "
<< it->change.type << " resulting in range ("
- << end << ", " << it->range.end << ")" << endl;
+ << end << ", " << it->range.end << ")");
break; // no need for another iteration
}
void Changes::erase(pos_type const pos)
{
- LYXERR(Debug::CHANGES) << "Erasing change at position " << pos << endl;
+ LYXERR(Debug::CHANGES, "Erasing change at position " << pos);
ChangeTable::iterator it = table_.begin();
ChangeTable::iterator end = table_.end();
for (; it != end; ++it) {
// range (pos,pos+x) becomes (pos,pos+x-1)
- if (it->range.start > pos) {
+ if (it->range.start > pos)
--(it->range.start);
- }
// range (pos-x,pos) stays (pos-x,pos)
- if (it->range.end > pos) {
+ if (it->range.end > pos)
--(it->range.end);
- }
}
merge();
void Changes::insert(Change const & change, lyx::pos_type pos)
{
if (change.type != Change::UNCHANGED) {
- LYXERR(Debug::CHANGES) << "Inserting change of type " << change.type
- << " at position " << pos << endl;
+ LYXERR(Debug::CHANGES, "Inserting change of type " << change.type
+ << " at position " << pos);
}
ChangeTable::iterator it = table_.begin();
for (; it != end; ++it) {
// range (pos,pos+x) becomes (pos+1,pos+x+1)
- if (it->range.start >= pos) {
+ if (it->range.start >= pos)
++(it->range.start);
- }
// range (pos-x,pos) stays as it is
- if (it->range.end > pos) {
+ if (it->range.end > pos)
++(it->range.end);
- }
}
set(change, pos, pos + 1); // set will call merge
Change const & Changes::lookup(pos_type const pos) const
{
static Change const noChange = Change(Change::UNCHANGED);
-
+
ChangeTable::const_iterator it = table_.begin();
ChangeTable::const_iterator const end = table_.end();
for (; it != itend; ++it) {
if (it->range.intersects(Range(start, end))) {
- LYXERR(Debug::CHANGES) << "found intersection of range ("
+ LYXERR(Debug::CHANGES, "found intersection of range ("
<< start << ", " << end << ") with ("
<< it->range.start << ", " << it->range.end
- << ") of type " << it->change.type << endl;
+ << ") of type " << it->change.type);
return true;
}
}
ChangeTable::iterator it = table_.begin();
while (it != table_.end()) {
- LYXERR(Debug::CHANGES) << "found change of type " << it->change.type
+ LYXERR(Debug::CHANGES, "found change of type " << it->change.type
<< " and range (" << it->range.start << ", " << it->range.end
- << ")" << endl;
+ << ")");
if (it->range.start == it->range.end) {
- LYXERR(Debug::CHANGES) << "removing empty range for pos "
- << it->range.start << endl;
+ LYXERR(Debug::CHANGES, "removing empty range for pos "
+ << it->range.start);
table_.erase(it);
// start again
if (it + 1 == table_.end())
break;
- if (it->change.isSimilarTo((it + 1)->change) && it->range.end == (it + 1)->range.start) {
- LYXERR(Debug::CHANGES) << "merging ranges (" << it->range.start << ", "
+ if (it->change.isSimilarTo((it + 1)->change)
+ && it->range.end == (it + 1)->range.start) {
+ LYXERR(Debug::CHANGES, "merging ranges (" << it->range.start << ", "
<< it->range.end << ") and (" << (it + 1)->range.start << ", "
- << (it + 1)->range.end << ")" << endl;
+ << (it + 1)->range.end << ")");
(it + 1)->range.start = it->range.start;
(it + 1)->change.changetime = max(it->change.changetime,
- (it + 1)->change.changetime);
+ (it + 1)->change.changetime);
table_.erase(it);
// start again
it = table_.begin();
}
-int Changes::latexMarkChange(odocstream & os,
- Change::Type const oldChangeType, Change::Type const changeType,
- bool const & output)
+int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
+ Change const & oldChange, Change const & change)
{
- if (!output || oldChangeType == changeType)
+ if (!bparams.outputChanges || oldChange == change)
return 0;
- static docstring const start(from_ascii("\\changestart{}"));
- static docstring const end(from_ascii("\\changeend{}"));
- static docstring const son(from_ascii("\\overstrikeon{}"));
- static docstring const soff(from_ascii("\\overstrikeoff{}"));
-
int column = 0;
- if (oldChangeType == Change::DELETED) {
- os << soff;
- column += soff.length();
+ if (oldChange.type != Change::UNCHANGED) {
+ os << '}'; // close \lyxadded or \lyxdeleted
+ column++;
}
- switch (changeType) {
- case Change::UNCHANGED:
- os << end;
- column += end.length();
- break;
-
- case Change::DELETED:
- if (oldChangeType == Change::UNCHANGED) {
- os << start;
- column += start.length();
- }
- os << son;
- column += son.length();
- break;
-
- case Change::INSERTED:
- if (oldChangeType == Change::UNCHANGED) {
- os << start;
- column += start.length();
- }
- break;
+ docstring chgTime;
+ chgTime += ctime(&change.changetime);
+ chgTime.erase(chgTime.end() - 1); // remove trailing '\n'
+
+ if (change.type == Change::DELETED) {
+ docstring str = "\\lyxdeleted{" +
+ bparams.authors().get(change.author).name() + "}{" +
+ chgTime + "}{";
+ os << str;
+ column += str.size();
+ } else if (change.type == Change::INSERTED) {
+ docstring str = "\\lyxadded{" +
+ bparams.authors().get(change.author).name() + "}{" +
+ chgTime + "}{";
+ os << str;
+ column += str.size();
}
return column;
}
-void Changes::lyxMarkChange(std::ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, int & column,
Change const & old, Change const & change)
{
if (old == change)
}
+void Changes::checkAuthors(AuthorList const & authorList)
+{
+ ChangeTable::const_iterator it = table_.begin();
+ ChangeTable::const_iterator endit = table_.end();
+ for ( ; it != endit ; ++it)
+ if (it->change.type != Change::UNCHANGED)
+ authorList.get(it->change.author).setUsed(true);
+}
+
} // namespace lyx