More requires --> required, for C++2a.

[lyx.git] / src / tex2lyx / Preamble.cpp

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 3e2fa670663d328ffe602f09ab4b85417124684d..8b327b100d0a04622e872e0578b5df52ead4b5bd 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -411,9 +411,9 @@ void Preamble::suppressDate(bool suppress)
 }
 
 
-void Preamble::registerAuthor(std::string const & name)
+void Preamble::registerAuthor(std::string const & name, string const & initials)
 {
-       Author author(from_utf8(name), empty_docstring());
+       Author author(from_utf8(name), empty_docstring(), from_utf8(initials));
        author.setUsed(true);
        authors_.record(author);
        h_tracking_changes = "true";
@@ -423,7 +423,7 @@ void Preamble::registerAuthor(std::string const & name)
 
 Author const & Preamble::getAuthor(std::string const & name) const
 {
-       Author author(from_utf8(name), empty_docstring());
+       Author author(from_utf8(name), empty_docstring(), empty_docstring());
        for (AuthorList::Authors::const_iterator it = authors_.begin();
             it != authors_.end(); ++it)
                if (*it == author)
@@ -555,6 +555,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
        //h_notefontcolor;
        //h_options;
        h_output_changes          = "false";
+       h_change_bars             = "false";
        h_output_sync             = "0";
        //h_output_sync_macro
        h_papercolumns            = "1";
@@ -1175,7 +1176,7 @@ void Preamble::handle_package(Parser &p, string const & name,
        if (is_known(name, known_sans_font_packages)) {
                h_font_sans[0] = name;
                if (contains(opts, "scale")) {
-                       vector<string>::const_iterator it = allopts.begin();
+                       vector<string>::iterator it = allopts.begin();
                        for (; it != allopts.end() ; ++it) {
                                string const opt = *it;
                                if (prefixIs(opt, "scaled=") || prefixIs(opt, "scale=")) {
@@ -1383,7 +1384,7 @@ void Preamble::handle_package(Parser &p, string const & name,
        if (is_known(name, known_typewriter_font_packages)) {
                h_font_typewriter[0] = name;
                if (contains(opts, "scale")) {
-                       vector<string>::const_iterator it = allopts.begin();
+                       vector<string>::iterator it = allopts.begin();
                        for (; it != allopts.end() ; ++it) {
                                string const opt = *it;
                                if (prefixIs(opt, "scaled=") || prefixIs(opt, "scale=")) {
@@ -1782,6 +1783,9 @@ void Preamble::handle_package(Parser &p, string const & name,
                }
        }
 
+       else if (name == "changebar")
+               h_output_changes = "true";
+
        else if (!in_lyx_preamble) {
                if (options.empty())
                        h_preamble << "\\usepackage{" << name << '}';
@@ -2022,6 +2026,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiled
                os << "\\listings_params " << h_listings_params << "\n";
        os << "\\tracking_changes " << h_tracking_changes << "\n"
           << "\\output_changes " << h_output_changes << "\n"
+          << "\\change_bars " << h_change_bars << "\n"
           << "\\html_math_output " << h_html_math_output << "\n"
           << "\\html_css_as_file " << h_html_css_as_file << "\n"
           << "\\html_be_strict " << h_html_be_strict << "\n"