X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=c237df62371bbefa1e19537af884c7706eaddfa0;hb=5f1bfdde1e1eb61987f178f643a08017dc3803f7;hp=753ada4259826da6c251df41f69822b1c871fde3;hpb=3b6931719aa7e1269997d2e950b3ce436d5bd34d;p=lyx.git

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 753ada4259..c237df6237 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -340,8 +340,8 @@ void Changes::merge()
 
 
 namespace {
-docstring getLaTeXMarkup(docstring const macro, docstring const author,
-			 docstring const chgTime,
+docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
+			 docstring const & chgTime,
 			 OutputParams const & runparams)
 {
 	if (macro.empty())
@@ -365,7 +365,7 @@ docstring getLaTeXMarkup(docstring const macro, docstring const author,
 				ods.put(author[n]);
 				ods << "'>";
 			} else {
-				LYXERR0("Ommitting uncodable character '"
+				LYXERR0("Omitting uncodable character '"
 					<< docstring(1, author[n])
 					<< "' in change author name!");
 				uncodable_author = author;
@@ -380,8 +380,8 @@ docstring getLaTeXMarkup(docstring const macro, docstring const author,
 				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"
+				  "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));
 		warned_author = uncodable_author;
 	}
@@ -391,7 +391,7 @@ docstring getLaTeXMarkup(docstring const macro, docstring const author,
 } //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)
 {
@@ -436,24 +436,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;
-		}
 	}
 }
 
@@ -503,14 +501,16 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
 		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, 1, str,
+				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,
+			support::wrapParas(str, 4)));
 	}
 }