X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=99c2d94a3acf32b2ae8af998a49ff46cdc9270b0;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=59b0a4d5957b7dcbf9dd7d53a0f2e7e8a789d1b6;hpb=1dc25c472f3001b5e558f6dc4d471d8c4401fb1d;p=lyx.git

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 59b0a4d595..99c2d94a3a 100644
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -1,44 +1,43 @@
-/* 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>
 
-#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 "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
@@ -47,7 +46,10 @@ LyXTextClassList::NumberOfClass(string const & textclass) const
 {
 	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));
@@ -67,30 +69,36 @@ LyXTextClassList::operator[](textclass_type textclass) const
 
 
 // used when sorting the textclass list.
-class less_textclass_desc {
+class less_textclass_avail_desc
+	: public std::binary_function<LyXTextClass, LyXTextClass, int>
+{
 public:
-	int operator()(LyXTextClass const & tc1, LyXTextClass const & tc2) {
-		return tc1.description() < tc2.description();
+	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());
 	}
 };
 
 
 // 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
@@ -131,13 +139,17 @@ bool LyXTextClassList::Read ()
 				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);
 				}
 			}
 		}
@@ -147,13 +159,10 @@ bool LyXTextClassList::Read ()
 	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;
 }
 
@@ -161,10 +170,11 @@ bool LyXTextClassList::Read ()
 // 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 "