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];
}
}
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)
{