X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=8d4a7639ccce7affe01d42cc442a9218749f5b3a;hb=24f8676130d1e0769db394b7142dae7eeb1d955e;hp=ea21f14b0ef57a43ef11bcd0394baa2b624eda51;hpb=d62a9764da0e58808f7d2b3844d9b9c02f7026c4;p=lyx.git

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index ea21f14b0e..8d4a7639cc 100644
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -1,26 +1,21 @@
-/* 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"
@@ -29,6 +24,12 @@
 
 #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;
@@ -42,10 +43,10 @@ pair<bool, textclass_type> const
 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));
 }
 
@@ -54,45 +55,41 @@ LyXTextClassList::NumberOfClass(string const & textclass) const
 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
@@ -133,29 +130,30 @@ 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);
 					}
-					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;
 }
 
@@ -163,10 +161,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 "