X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=b2b61f28b53562707f7fbc27baf95a84bc28bb36;hb=acc5af9912533261c37795971af269f77317f14f;hp=b49f2551509ee921b8af5db1e07b6817c8c154b1;hpb=814a8411ebeac155f9ee9df915bce4ff731dd21b;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index b49f255150..b2b61f28b5 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -17,13 +17,18 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Encoding.h"
 #include "LaTeXFeatures.h"
+#include "OutputParams.h"
 #include "Paragraph.h"
 #include "TocBackend.h"
 
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
+
+#include "frontends/alert.h"
 
 #include <ostream>
 
@@ -54,9 +59,9 @@ bool Change::isSimilarTo(Change const & change) const
 }
 
 
-ColorCode Change::color() const
+Color Change::color() const
 {
-	ColorCode color = Color_none;
+	Color color = Color_none;
 	switch (author % 5) {
 		case 0:
 			color = Color_changedtextauthor1;
@@ -74,6 +79,10 @@ ColorCode Change::color() const
 			color = Color_changedtextauthor5;
 			break;
 	}
+
+	if (deleted())
+		color.mergeColor = Color_deletedtextmodifier;
+
 	return color;
 }
 
@@ -252,6 +261,24 @@ Change const & Changes::lookup(pos_type const pos) const
 }
 
 
+bool Changes::isDeleted(pos_type start, pos_type end) const
+{
+	ChangeTable::const_iterator it = table_.begin();
+	ChangeTable::const_iterator const itend = table_.end();
+
+	for (; it != itend; ++it) {
+		if (it->range.contains(Range(start, end))) {
+			LYXERR(Debug::CHANGES, "range ("
+				<< start << ", " << end << ") fully contains ("
+				<< it->range.start << ", " << it->range.end
+				<< ") of type " << it->change.type);
+			return it->change.type == Change::DELETED;
+		}
+	}
+	return false;
+}
+
+
 bool Changes::isChanged(pos_type const start, pos_type const end) const
 {
 	ChangeTable::const_iterator it = table_.begin();
@@ -312,8 +339,61 @@ void Changes::merge()
 }
 
 
+namespace {
+docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
+			 docstring const & chgTime,
+			 OutputParams const & runparams)
+{
+	if (macro.empty())
+		return docstring();
+
+	static docstring warned_author = docstring();
+	docstring uncodable_author = warned_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("Omitting uncodable character '"
+					<< docstring(1, author[n])
+					<< "' in change author name!");
+				uncodable_author = author;
+			}
+		}
+	}
+	ods << author_latexed << "}{" << chgTime << "}{";
+
+	// warn user (once) if we found uncodable glyphs.
+	if (uncodable_author != warned_author) {
+		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 omitted 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;
+	}
+
+	return ods.str();
+}
+} //namespace anon
+
+
 int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
-			     Change const & oldChange, Change const & change)
+			     Change const & oldChange, Change const & change,
+			     OutputParams const & runparams)
 {
 	if (!bparams.outputChanges || oldChange == change)
 		return 0;
@@ -321,33 +401,34 @@ int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
 	int column = 0;
 
 	if (oldChange.type != Change::UNCHANGED) {
-		os << '}'; // close \lyxadded or \lyxdeleted
+		// close \lyxadded or \lyxdeleted
+		os << '}';
 		column++;
 	}
 
 	docstring chgTime;
 	chgTime += ctime(&change.changetime);
-	chgTime.erase(chgTime.end() - 1); // remove trailing '\n'
-
-	if (change.type == Change::DELETED) {
-		docstring str = "\\lyxdeleted{" +
-			bparams.authors().get(change.author).name() + "}{" +
-			chgTime + "}{";
-		os << str;
-		column += str.size();
-	} else if (change.type == Change::INSERTED) {
-		docstring str = "\\lyxadded{" +
-			bparams.authors().get(change.author).name() + "}{" +
-			chgTime + "}{";
-		os << str;
-		column += str.size();
-	}
+	// remove trailing '\n'
+	chgTime.erase(chgTime.end() - 1);
+
+	docstring macro_beg;
+	if (change.type == Change::DELETED)
+		macro_beg = from_ascii("\\lyxdeleted{");
+	else if (change.type == Change::INSERTED)
+		macro_beg = from_ascii("\\lyxadded{");
+	
+	docstring str = getLaTeXMarkup(macro_beg,
+				       bparams.authors().get(change.author).name(),
+				       chgTime, runparams);
+	
+	os << str;
+	column += str.size();
 
 	return column;
 }
 
 
-void Changes::lyxMarkChange(ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & column,
 			    Change const & old, Change const & change)
 {
 	if (old == change)
@@ -355,19 +436,21 @@ void Changes::lyxMarkChange(ostream & os, int & column,
 
 	column = 0;
 
+	int const buffer_id = bparams.authors().get(change.author).buffer_id();
+
 	switch (change.type) {
 		case Change::UNCHANGED:
 			os << "\n\\change_unchanged\n";
 			break;
 
 		case Change::DELETED: {
-			os << "\n\\change_deleted " << change.author
+			os << "\n\\change_deleted " << buffer_id
 				<< " " << change.changetime << "\n";
 			break;
 		}
 
 		case Change::INSERTED: {
-			os << "\n\\change_inserted " << change.author
+			os << "\n\\change_inserted " << buffer_id
 				<< " " << change.changetime << "\n";
 			break;
 		}