X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=ea7c5c998ee63da630e8e838dedee1a78fb4cebc;hb=b64d17e9dcaeb84a94095622c93a051e4d93eab7;hp=c14bf9b41eabf2da281312e6e3662977757c3bc7;hpb=1a6c599917355743a868c20a0b62b5f4c47c8294;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index c14bf9b41e..ea7c5c998e 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -354,35 +354,26 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
 	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]).first;
-		} 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;
-			}
-		}
+	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"),
 				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"
+				  "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));
+				  "or change the spelling of the author name."),
+				uncodable_author, author_latexed.second));
 		warned_author = uncodable_author;
 	}