#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxtextclasslist.h"
#include "lyxtextclass.h"
#include "debug.h"
#include "lyxlex.h"
#include "gettext.h"
-
#include "frontends/Alert.h"
#include "support/lyxfunctional.h"
#include <utility>
+using namespace lyx::support;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
using lyx::textclass_type;
using std::pair;
using std::make_pair;
LyXTextClassList::NumberOfClass(string const & textclass) const
{
ClassList::const_iterator cit =
- find_if(classlist.begin(), classlist.end(),
+ find_if(classlist_.begin(), classlist_.end(),
lyx::compare_memfun(&LyXTextClass::name, textclass));
- return cit != classlist.end() ?
- make_pair(true, textclass_type(cit - classlist.begin())) :
+ return cit != classlist_.end() ?
+ make_pair(true, textclass_type(cit - classlist_.begin())) :
make_pair(false, textclass_type(0));
}
LyXTextClass const &
LyXTextClassList::operator[](textclass_type textclass) const
{
- classlist[textclass].load();
- if (textclass < classlist.size())
- return classlist[textclass];
+ classlist_[textclass].load();
+ if (textclass < classlist_.size())
+ return classlist_[textclass];
else
- return classlist[0];
-}
-
-
-void LyXTextClassList::Add(LyXTextClass const & t)
-{
- classlist.push_back(t);
+ return classlist_[0];
}
// used when sorting the textclass list.
-class less_textclass_desc {
+class less_textclass_avail_desc {
public:
int operator()(LyXTextClass const & tc1, LyXTextClass const & tc2) {
- return tc1.description() < tc2.description();
+ // Ordering criteria:
+ // 1. Availability of text class
+ // 2. Description (lexicographic)
+
+ return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
+ (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+ tc1.description() < tc2.description());
}
};
// Reads LyX textclass definitions according to textclass config file
-bool LyXTextClassList::Read ()
+bool LyXTextClassList::Read()
{
LyXLex lex(0, 0);
string real_file = LibFileSearch("", "textclass.lst");
lyxerr[Debug::TCLASS] << "Reading textclasses from `"
- << real_file << "'" << endl;
+ << real_file << '\'' << endl;
if (real_file.empty()) {
lyxerr << "LyXTextClassList::Read: unable to find "
"textclass file `" << MakeDisplayPath(real_file, 1000)
<< "'. Exiting." << endl;
-
- Alert::alert(_("LyX wasn't able to find its layout descriptions!"),
- _("Check that the file \"textclass.lst\""),
- _("is installed correctly. Sorry, has to exit :-("));
return false;
// This causes LyX to end... Not a desirable behaviour. Lgb
// What do you propose? That the user gets a file dialog
if (lex.next()) {
string const desc = lex.getString();
lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
- // This code is run when we have
- // fname, clname and desc
- LyXTextClass tmpl(fname, clname, desc);
- if (lyxerr.debugging(Debug::TCLASS)) {
- tmpl.load();
+ if (lex.next()) {
+ bool avail = lex.getBool();
+ lyxerr[Debug::TCLASS] << "Avail: " << avail << endl;
+ // This code is run when we have
+ // fname, clname, desc, and avail
+ LyXTextClass tmpl(fname, clname, desc, avail);
+ if (lyxerr.debugging(Debug::TCLASS)) {
+ tmpl.load();
+ }
+ classlist_.push_back(tmpl);
}
- Add(tmpl);
}
}
}
}
lyxerr[Debug::TCLASS] << "End of parsing of textclass.lst" << endl;
- if (classlist.empty()) {
+ if (classlist_.empty()) {
lyxerr << "LyXTextClassList::Read: no textclasses found!"
<< endl;
- Alert::alert(_("LyX wasn't able to find any layout description!"),
- _("Check the contents of the file \"textclass.lst\""),
- _("Sorry, has to exit :-("));
return false;
}
// Ok everything loaded ok, now sort the list.
- sort(classlist.begin(), classlist.end(), less_textclass_desc());
+ sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
return true;
}