Change mouse cursor on tabular selection zones

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 39f2a8ebc75a8d0b947ea9d60538ea6ff948d931..832ccacd76b9dd6db3d181dae26fd5bd6db64e0d 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -27,6 +27,7 @@
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 
 #include "frontends/alert.h"
 
@@ -348,9 +349,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        if (macro.empty())
                return docstring();
 
-       // FIXME THREAD
-       static docstring warned_author = docstring();
-       docstring uncodable_author = warned_author;
+       docstring uncodable_author;
        odocstringstream ods;
 
        ods << macro;
@@ -367,8 +366,12 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        ods << author_latexed.first << "}{" << chgTime << "}{";
 
        // warn user (once) if we found uncodable glyphs.
-       if (uncodable_author != warned_author) {
-               frontend::Alert::warning(_("Uncodable character in author name"),
+       if (!uncodable_author.empty()) {
+               static std::set<docstring> warned_authors;
+               static Mutex warned_mutex;
+               Mutex::Locker locker(&warned_mutex);
+               if (warned_authors.find(uncodable_author) == warned_authors.end()) {
+                       frontend::Alert::warning(_("Uncodable character in author name"),
                                support::bformat(_("The author name '%1$s',\n"
                                  "used for change tracking, contains the following glyphs that\n"
                                  "cannot be represented in the current encoding: %2$s.\n"
@@ -376,7 +379,8 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
                                  "Choose an appropriate document encoding (such as utf8)\n"
                                  "or change the spelling of the author name."),
                                uncodable_author, author_latexed.second));
-               warned_author = uncodable_author;
+                       warned_authors.insert(uncodable_author);
+               }
        }
 
        return ods.str();
@@ -470,7 +474,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;
 
@@ -482,32 +486,33 @@ 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 = change_list->item(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)));
        }
 }