Test invalid sanitizeLatexOption() input as well

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index d24df403ccf07f478d54792b71cc781aac711466..29471f244af1405d6501efb0ff439260444c5d5b 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,8 +349,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        if (macro.empty())
                return docstring();
 
-       static docstring warned_author = docstring();
-       docstring uncodable_author = warned_author;
+       docstring uncodable_author;
        odocstringstream ods;
 
        ods << macro;
@@ -366,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"
@@ -375,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();
@@ -388,7 +393,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                             Change const & oldChange, Change const & change,
                             OutputParams const & runparams)
 {
-       if (!bparams.outputChanges || oldChange == change)
+       if (!bparams.output_changes || oldChange == change)
                return 0;
 
        int column = 0;
@@ -397,6 +402,8 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                // close \lyxadded or \lyxdeleted
                os << '}';
                column++;
+               if (oldChange.type == Change::DELETED)
+                       --runparams.inulemcmd;
        }
 
        docstring chgTime;
@@ -405,8 +412,10 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
        chgTime.erase(chgTime.end() - 1);
 
        docstring macro_beg;
-       if (change.type == Change::DELETED)
+       if (change.type == Change::DELETED) {
                macro_beg = from_ascii("\\lyxdeleted{");
+               ++runparams.inulemcmd;
+       }
        else if (change.type == Change::INSERTED)
                macro_beg = from_ascii("\\lyxadded{");