Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 29471f244af1405d6501efb0ff439260444c5d5b..97596b4b9268a90501b6617e22522dd3fdc6b4b1 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -19,6 +19,7 @@
 #include "BufferParams.h"
 #include "Encoding.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "TocBackend.h"
@@ -30,6 +31,8 @@
 #include "support/mutex.h"
 
 #include "frontends/alert.h"
+#include "frontends/FontMetrics.h"
+#include "frontends/Painter.h"
 
 #include <ostream>
 
@@ -37,6 +40,9 @@ using namespace std;
 
 namespace lyx {
 
+using frontend::Painter;
+using frontend::FontMetrics;
+
 /*
  * 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
@@ -138,6 +144,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
                        << ", author: " << change.author 
                        << ", time: " << long(change.changetime)
                        << ") in range (" << start << ", " << end << ")");
+               if (!isChanged())
+                       is_update_required_ = true;
        }
 
        Range const newRange(start, end);
@@ -298,8 +306,21 @@ bool Changes::isChanged(pos_type const start, pos_type const end) const
 }
 
 
+bool Changes::isChanged() const
+{
+       ChangeTable::const_iterator it = table_.begin();
+       ChangeTable::const_iterator const itend = table_.end();
+       for (; it != itend; ++it) {
+               if (it->change.changed())
+                       return true;
+       }
+       return false;
+}
+
+
 void Changes::merge()
 {
+       bool merged = false;
        ChangeTable::iterator it = table_.begin();
 
        while (it != table_.end()) {
@@ -312,6 +333,7 @@ void Changes::merge()
                                << it->range.start);
 
                        table_.erase(it);
+                       merged = true;
                        // start again
                        it = table_.begin();
                        continue;
@@ -330,6 +352,7 @@ void Changes::merge()
                        (it + 1)->change.changetime = max(it->change.changetime,
                                                          (it + 1)->change.changetime);
                        table_.erase(it);
+                       merged = true;
                        // start again
                        it = table_.begin();
                        continue;
@@ -337,6 +360,8 @@ void Changes::merge()
 
                ++it;
        }
+       if (merged && !isChanged())
+               is_update_required_ = true;
 }
 
 
@@ -474,7 +499,7 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
        if (table_.empty())
                return;
 
-       Toc & change_list = buffer.tocBackend().toc("change");
+       shared_ptr<Toc> change_list = buffer.tocBackend().toc("change");
        AuthorList const & author_list = buffer.params().authors();
        DocIterator dit = cdit;
 
@@ -486,34 +511,86 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
                case Change::UNCHANGED:
                        continue;
                case Change::DELETED:
-                       // 0x2702 is a scissors symbol in the Dingbats unicode group.
+                       // ✂ U+2702 BLACK SCISSORS
                        str.push_back(0x2702);
                        break;
                case Change::INSERTED:
-                       // 0x270d is the hand writting symbol in the Dingbats unicode group.
-                       str.push_back(0x270d); break;
+                       // ✍ U+270D WRITING HAND
+                       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);
+                       // ¶ U+00B6 PILCROW SIGN
+                       str.push_back(0xb6);
                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, output_active));
-                       change_list.push_back(TocItem(dit, 1, str, output_active,
+               Toc::iterator it = TocBackend::findItem(*change_list, 0, author);
+               if (it == change_list->end()) {
+                       change_list->push_back(TocItem(dit, 0, author, true));
+                       change_list->push_back(TocItem(dit, 1, str, output_active,
                                support::wrapParas(str, 4)));
                        continue;
                }
-               for (++it; it != change_list.end(); ++it) {
+               for (++it; it != change_list->end(); ++it) {
                        if (it->depth() == 0 && it->str() != author)
                                break;
                }
-               change_list.insert(it, TocItem(dit, 1, str, output_active,
+               change_list->insert(it, TocItem(dit, 1, str, output_active,
                        support::wrapParas(str, 4)));
        }
 }
 
+
+void Changes::updateBuffer(Buffer const & buf)
+{
+       is_update_required_ = false;
+       if (!buf.areChangesPresent() && isChanged())
+               buf.setChangesPresent(true);
+}
+
+
+void Change::paintCue(PainterInfo & pi, double const x1, double const y,
+                      double const x2, FontInfo const & font) const
+{
+       if (!changed())
+               return;
+       // Calculate 1/3 height of font
+       FontMetrics const & fm = theFontMetrics(font);
+       int const y_bar = deleted() ? y - fm.maxAscent() / 3
+               : y + 2 * pi.base.solidLineOffset() + pi.base.solidLineThickness();
+       pi.pain.line(int(x1), y_bar, int(x2), y_bar, color(),
+                    Painter::line_solid, pi.base.solidLineThickness());
+}
+
+
+void Change::paintCue(PainterInfo & pi, double const x1, double const y1,
+                      double const x2, double const y2) const
+{
+       /*
+        * y1      /
+        *        /
+        *       /
+        *      /
+        *     /
+        * y2 /_____
+        *    x1  x2
+        */
+       double y = 0;
+       switch(type) {
+       case UNCHANGED:
+               return;
+       case INSERTED:
+               y = y2;
+               break;
+       case DELETED:
+               y = y1;
+               break;
+       }
+       pi.pain.line(x1, y2, x2, y, color(), Painter::line_solid,
+                    pi.base.solidLineThickness());
+}
+
+
 } // namespace lyx