}
-ColorCode Change::color() const
+Color Change::color() const
{
- ColorCode color = Color_none;
+ Color color = Color_none;
switch (author % 5) {
case 0:
color = Color_changedtextauthor1;
color = Color_changedtextauthor5;
break;
}
+
+ if (deleted())
+ color.mergeColor = Color_deletedtextmodifier;
+
return color;
}
str.push_back(0x2702);
break;
case Change::INSERTED:
- // 0x2702 is the hand writting symbol in the Dingbats unicode group.
+ // 0x270d is the hand writting symbol in the Dingbats unicode group.
str.push_back(0x270d);
break;
}
dit.pos() = it->range.start;
- str += " " + dit.paragraph().asString(it->range.start, it->range.end);
+ Paragraph const & par = dit.paragraph();
+ str += " " + par.asString(it->range.start, min(par.size(), it->range.end));
+ if (it->range.end > par.size())
+ // the end of paragraph symbol from the Punctuation group
+ str.push_back(0x204B);
docstring const & author = author_list.get(it->change.author).name();
Toc::iterator it = change_list.item(0, author);
if (it == change_list.end()) {