ws changes only

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index d764c5c043c405f12ff0fbba4f7494891bbdf1c8..98339a046a3446cb898384a69ee1de774f4981a4 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -1,12 +1,12 @@
-/* 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>
@@ -15,25 +15,25 @@
 #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>
+using lyx::textclass_type;
+
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;
 #endif
 
-using lyx::textclass_type;
-using std::pair;
-using std::make_pair;
 using std::endl;
 using std::find_if;
+using std::make_pair;
 using std::sort;
+using std::string;
+using std::pair;
 
 
 // Gets textclass number from name
@@ -62,10 +62,16 @@ LyXTextClassList::operator[](textclass_type textclass) const
 
 
 // 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());
        }
 };
 
@@ -122,13 +128,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);
                                }
                        }
                }
@@ -141,7 +151,7 @@ bool LyXTextClassList::Read()
                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;
 }
 
@@ -149,10 +159,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 "