Get InsetCollapsable working, at least to some extent.

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index c2677736cd68713a7f964584b39ac958921f44f2..34db257f583b2d63b24cf3b8f7682ec1cc73aac5 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -15,11 +15,14 @@
 
 #include "Changes.h"
 #include "Author.h"
+#include "Buffer.h"
 #include "BufferParams.h"
 #include "LaTeXFeatures.h"
+#include "Paragraph.h"
+#include "TocBackend.h"
 
 #include "support/debug.h"
-
+#include "support/gettext.h"
 #include "support/lassert.h"
 
 #include <ostream>
@@ -51,9 +54,9 @@ bool Change::isSimilarTo(Change const & change) const
 }
 
 
-ColorCode Change::color() const
+Color Change::color() const
 {
-       ColorCode color = Color_none;
+       Color color = Color_none;
        switch (author % 5) {
                case 0:
                        color = Color_changedtextauthor1;
@@ -71,6 +74,10 @@ ColorCode Change::color() const
                        color = Color_changedtextauthor5;
                        break;
        }
+
+       if (deleted())
+               color.mergeColor = Color_deletedtextmodifier;
+
        return color;
 }
 
@@ -249,6 +256,24 @@ Change const & Changes::lookup(pos_type const pos) const
 }
 
 
+bool Changes::isFullyDeleted(pos_type start, pos_type end) const
+{
+       ChangeTable::const_iterator it = table_.begin();
+       ChangeTable::const_iterator const itend = table_.end();
+
+       for (; it != itend; ++it) {
+               if (it->range.contains(Range(start, end))) {
+                       LYXERR(Debug::CHANGES, "range ("
+                               << start << ", " << end << ") fully contains ("
+                               << it->range.start << ", " << it->range.end
+                               << ") of type " << it->change.type);
+                       return it->change.type == Change::DELETED;
+               }
+       }
+       return false;
+}
+
+
 bool Changes::isChanged(pos_type const start, pos_type const end) const
 {
        ChangeTable::const_iterator it = table_.begin();
@@ -381,4 +406,51 @@ void Changes::checkAuthors(AuthorList const & authorList)
                        authorList.get(it->change.author).setUsed(true);
 }
 
+
+void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
+{
+       if (table_.empty())
+               return;
+
+       Toc & change_list = buffer.tocBackend().toc("change");
+       AuthorList const & author_list = buffer.params().authors();
+       DocIterator dit = cdit;
+
+       ChangeTable::const_iterator it = table_.begin();
+       ChangeTable::const_iterator const itend = table_.end();
+       for (; it != itend; ++it) {
+               docstring str;
+               switch (it->change.type) {
+               case Change::UNCHANGED:
+                       continue;
+               case Change::DELETED:
+                       // 0x2702 is a scissors symbol in the Dingbats unicode group.
+                       str.push_back(0x2702);
+                       break;
+               case Change::INSERTED:
+                       // 0x270d is the hand writting symbol in the Dingbats unicode group.
+                       str.push_back(0x270d);
+                       break;
+               }
+               dit.pos() = it->range.start;
+               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()) {
+                       change_list.push_back(TocItem(dit, 0, author));
+                       change_list.push_back(TocItem(dit, 1, str));
+                       continue;
+               }
+               for (++it; it != change_list.end(); ++it) {
+                       if (it->depth() == 0 && it->str() != author)
+                               break;
+               }
+               change_list.insert(it, TocItem(dit, 1, str));
+       }
+}
+
 } // namespace lyx