#include <utility>
+using namespace lyx::support;
+
#ifndef CXX_GLOBAL_CSTD
using std::exit;
#endif
// 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());
}
};
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);
}
- classlist_.push_back(tmpl);
}
}
}
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;
}