adjust

[lyx.git] / src / TextClassList.cpp

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index 546e02e92c9805bd6288eb411cae2cb17e3dfe25..708b1ac534dcf0ecb3b16ccaeea5b6b15e58213c 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -66,11 +66,12 @@ TextClassList::numberOfClass(string const & textclass) const
 TextClass const &
 TextClassList::operator[](textclass_type textclass) const
 {
-       classlist_[textclass].load();
-       if (textclass < classlist_.size())
-               return classlist_[textclass];
-       else
+       if (textclass >= classlist_.size())
                return classlist_[0];
+       
+       //FIXME I don't believe the following line is actually necessary (rgh)
+       classlist_[textclass].load();
+       return classlist_[textclass];
 }
 
 
@@ -103,7 +104,7 @@ bool TextClassList::read()
 
        if (real_file.empty()) {
                lyxerr << "TextClassList::Read: unable to find "
-                         "textclass file  `"
+                         "textclass file  `"
                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
                       << "'. Exiting." << endl;
                return false;
@@ -122,7 +123,7 @@ bool TextClassList::read()
 
        if (!lex.isOK()) {
                lyxerr << "TextClassList::Read: unable to open "
-                         "textclass file  `"
+                         "textclass file  `"
                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
                       << "'\nCheck your installation. LyX can't continue."
                       << endl;
@@ -164,17 +165,29 @@ bool TextClassList::read()
        }
        LYXERR(Debug::TCLASS) << "End of parsing of textclass.lst" << endl;
 
-       if (classlist_.empty()) {
+       // lyx will start with an empty classlist_, but only reconfigure is allowed
+       // in this case. This gives users a second chance to configure lyx if
+       // initial configuration fails. (c.f. bug 2829)
+       if (classlist_.empty())
                lyxerr << "TextClassList::Read: no textclasses found!"
                       << endl;
-               return false;
-       }
-       // Ok everything loaded ok, now sort the list.
-       sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
+       else 
+               // Ok everything loaded ok, now sort the list.
+               sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
        return true;
 }
 
 
+void TextClassList::reset(textclass_type const textclass) {
+       if (textclass >= classlist_.size())
+               return;
+       TextClass const & tc = classlist_[textclass];
+       TextClass tmpl(tc.name(), tc.latexname(), tc.description(), 
+                      tc.isTeXClassAvailable());
+       classlist_[textclass] = tmpl;
+}
+
+
 std::pair<bool, textclass_type> const
 TextClassList::addTextClass(std::string const & textclass, std::string const & path)
 {
@@ -199,7 +212,7 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
                                // returns: whole string, classtype (not used here), first option, description
                                BOOST_ASSERT(sub.size()==4);
                                // now, add the layout to textclass.
-                               TextClass tmpl(textclass, sub.str(2)==""?textclass:sub.str(2), 
+                               TextClass tmpl(textclass, sub.str(2)==""?textclass:sub.str(2),
                                        sub.str(3) + " <" + path + ">", true);
                                if (lyxerr.debugging(Debug::TCLASS))
                                        tmpl.load(path);
@@ -211,7 +224,7 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
        // If .layout is not in local directory, or an invalid layout is found, return false
        return make_pair(false, textclass_type(0));
 }
-       
+
 
 // Global variable: textclass table.
 TextClassList textclasslist;