- lyxsweave.R: set missing SVN EOL style and add missing makefile entry

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 5732434b0a57af576e879d764226f07c405c5560..b2fec78d4096561360fb14605fa8d3d255d00e6b 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -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;
        }
@@ -503,14 +503,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)));
        }
 }