Enable convertDefault.sh to run even if its executable bit is not set.

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 861b33e2617d53673fb1650fe6985e7a2fe76263..8d4a7639ccce7affe01d42cc442a9218749f5b3a 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -1,20 +1,16 @@
-/* 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"
@@ -28,6 +24,8 @@
 
 #include <utility>
 
+using namespace lyx::support;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;
 #endif
@@ -66,16 +64,22 @@ 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());
        }
 };
 
 
 // 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");
@@ -86,10 +90,6 @@ bool LyXTextClassList::Read ()
                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
@@ -130,13 +130,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);
                                }
                        }
                }
@@ -146,13 +150,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;
 }
 
@@ -160,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 "