-/* This file is part of
- * ======================================================
+/**
+ * \file lyxtextclasslist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "lyxtextclass.h"
#include "debug.h"
#include "lyxlex.h"
-#include "gettext.h"
-#include "frontends/Alert.h"
-#include "support/lyxfunctional.h"
-#include "support/LAssert.h"
#include "support/filetools.h"
-#include <utility>
+#include <boost/bind.hpp>
+
+using lyx::textclass_type;
+
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+
+using boost::bind;
#ifndef CXX_GLOBAL_CSTD
using std::exit;
#endif
-using lyx::textclass_type;
-using std::pair;
-using std::make_pair;
using std::endl;
+using std::equal_to;
using std::find_if;
+using std::make_pair;
using std::sort;
+using std::string;
+using std::pair;
// Gets textclass number from name
{
ClassList::const_iterator cit =
find_if(classlist_.begin(), classlist_.end(),
- lyx::compare_memfun(&LyXTextClass::name, textclass));
+ bind(equal_to<string>(),
+ bind(&LyXTextClass::name, _1),
+ textclass));
+
return cit != classlist_.end() ?
make_pair(true, textclass_type(cit - classlist_.begin())) :
make_pair(false, textclass_type(0));
// used when sorting the textclass list.
-class less_textclass_desc {
-public:
- int operator()(LyXTextClass const & tc1, LyXTextClass const & tc2) {
- return tc1.description() < tc2.description();
+struct less_textclass_avail_desc
+ : public std::binary_function<LyXTextClass, LyXTextClass, int>
+{
+ int operator()(LyXTextClass const & tc1,
+ LyXTextClass const & tc2) const
+ {
+ // 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;
}
// Global variable: textclass table.
LyXTextClassList textclasslist;
+
// Reads the style files
void LyXSetStyle()
{
- lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration...\n";
+ lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration..." << endl;
if (!textclasslist.Read()) {
lyxerr[Debug::TCLASS] << "LyXSetStyle: an error occured "