X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=29471f244af1405d6501efb0ff439260444c5d5b;hb=2c5c2a66833a0c2aefdfdb8f465a83a912e40e4b;hp=5732434b0a57af576e879d764226f07c405c5560;hpb=cb815e404514a664f9a451064e6086a6eb5c1851;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 5732434b0a..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"
 
@@ -340,6 +341,7 @@ void Changes::merge()
 
 
 namespace {
+
 docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
 			 docstring const & chgTime,
 			 OutputParams const & runparams)
@@ -347,55 +349,51 @@ 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;
 	// convert utf8 author name to something representable
 	// in the current encoding
-	docstring author_latexed;
-	for (size_t n = 0; n < author.size(); ++n) {
-		try {
-			author_latexed += runparams.encoding->latexChar(author[n]);
-		} catch (EncodingException & /* e */) {
-			if (runparams.dryrun) {
-				ods << "<" << _("LyX Warning: ")
-				    << _("uncodable character") << " '";
-				ods.put(author[n]);
-				ods << "'>";
-			} else {
-				LYXERR0("Ommitting uncodable character '"
-					<< docstring(1, author[n])
-					<< "' in change author name!");
-				uncodable_author = author;
-			}
-		}
+	pair<docstring, docstring> author_latexed =
+		runparams.encoding->latexString(author, runparams.dryrun);
+	if (!author_latexed.second.empty()) {
+		LYXERR0("Omitting uncodable characters '"
+			<< author_latexed.second
+			<< "' in change author name!");
+		uncodable_author = author;
 	}
-	ods << author_latexed << "}{" << chgTime << "}{";
+	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 glyphs that cannot be\n"
-				  "represented in the current encoding. The respective glyphs\n"
-				  "will be ommitted in the exported LaTeX file.\n\n"
-				  "Chose an appropriate document encoding (such as utf8)\n"
-				  "or change the spelling of the author name."), uncodable_author));
-		warned_author = uncodable_author;
+				  "used for change tracking, contains the following glyphs that\n"
+				  "cannot be represented in the current encoding: %2$s.\n"
+				  "These glyphs will be omitted in the exported LaTeX file.\n\n"
+				  "Choose an appropriate document encoding (such as utf8)\n"
+				  "or change the spelling of the author name."),
+				uncodable_author, author_latexed.second));
+			warned_authors.insert(uncodable_author);
+		}
 	}
 
 	return ods.str();
 }
+
 } //namespace anon
 
 
-int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
+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;
@@ -404,16 +402,20 @@ int Changes::latexMarkChange(odocstream & 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{");
 	
@@ -436,24 +438,22 @@ void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & co
 
 	column = 0;
 
-	int const buffer_id = bparams.authors().get(change.author).buffer_id();
+	int const buffer_id = bparams.authors().get(change.author).bufferId();
 
 	switch (change.type) {
 		case Change::UNCHANGED:
 			os << "\n\\change_unchanged\n";
 			break;
 
-		case Change::DELETED: {
+		case Change::DELETED:
 			os << "\n\\change_deleted " << buffer_id
 				<< " " << change.changetime << "\n";
 			break;
-		}
 
-		case Change::INSERTED: {
+		case Change::INSERTED:
 			os << "\n\\change_inserted " << buffer_id
 				<< " " << change.changetime << "\n";
 			break;
-		}
 	}
 }
 
@@ -468,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;
@@ -490,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();
@@ -502,15 +502,17 @@ 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;
 		}
 		for (++it; it != change_list.end(); ++it) {
 			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)));
 	}
 }