X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=29471f244af1405d6501efb0ff439260444c5d5b;hb=429f4669b03cae0fd41e2abc6b0144d1c61bfe69;hp=766b698a3ab6019fee063a62c6a0cfca40dc17ac;hpb=6b2232a29c682d8e62d1d2b963bb1a70bee4330b;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 766b698a3a..29471f244a 100644
--- 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,16 +402,20 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
 		// close \lyxadded or \lyxdeleted
 		os << '}';
 		column++;
+		if (oldChange.type == Change::DELETED)
+			--runparams.inulemcmd;
 	}
 
 	docstring chgTime;
-	chgTime += ctime(&change.changetime);
+	chgTime += asctime(gmtime(&change.changetime));
 	// remove trailing '\n'
 	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{");
 	
@@ -459,7 +468,8 @@ void Changes::checkAuthors(AuthorList const & authorList)
 }
 
 
-void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
+void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
+        bool output_active) const
 {
 	if (table_.empty())
 		return;
@@ -481,8 +491,7 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
 			break;
 		case Change::INSERTED:
 			// 0x270d is the hand writting symbol in the Dingbats unicode group.
-			str.push_back(0x270d);
-			break;
+			str.push_back(0x270d); break;
 		}
 		dit.pos() = it->range.start;
 		Paragraph const & par = dit.paragraph();
@@ -493,8 +502,8 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
 		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,
+			change_list.push_back(TocItem(dit, 0, author, output_active));
+			change_list.push_back(TocItem(dit, 1, str, output_active,
 				support::wrapParas(str, 4)));
 			continue;
 		}
@@ -502,7 +511,7 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
 			if (it->depth() == 0 && it->str() != author)
 				break;
 		}
-		change_list.insert(it, TocItem(dit, 1, str,
+		change_list.insert(it, TocItem(dit, 1, str, output_active,
 			support::wrapParas(str, 4)));
 	}
 }