fix bug #6584

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index b2b61f28b53562707f7fbc27baf95a84bc28bb36..598a5bdb5fc9a35b1f761db17075ac62284dc1c6 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -381,7 +381,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
                                  "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"
+                                 "Choose an appropriate document encoding (such as utf8)\n"
                                  "or change the spelling of the author name."), uncodable_author));
                warned_author = uncodable_author;
        }
@@ -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)));
        }
 }