X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=99c2d94a3acf32b2ae8af998a49ff46cdc9270b0;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=6050c266cba0e2ed98b5a98b7bba41c8178feb0c;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C index 6050c266cb..99c2d94a3a 100644 --- a/src/lyxtextclasslist.C +++ b/src/lyxtextclasslist.C @@ -1,40 +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 -#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 +#include using lyx::textclass_type; -using std::pair; -using std::make_pair; + +using lyx::support::LibFileSearch; +using lyx::support::MakeDisplayPath; + +using boost::bind; + +#ifndef CXX_GLOBAL_CSTD +using std::exit; +#endif + 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 @@ -42,10 +45,13 @@ pair const LyXTextClassList::NumberOfClass(string const & textclass) const { ClassList::const_iterator cit = - find_if(classlist.begin(), classlist.end(), - lyx::compare_memfun(&LyXTextClass::name, textclass)); - return cit != classlist.end() ? - make_pair(true, textclass_type(cit - classlist.begin())) : + find_if(classlist_.begin(), classlist_.end(), + bind(equal_to(), + bind(&LyXTextClass::name, _1), + textclass)); + + return cit != classlist_.end() ? + make_pair(true, textclass_type(cit - classlist_.begin())) : make_pair(false, textclass_type(0)); } @@ -54,45 +60,45 @@ 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 std::binary_function +{ 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 @@ -129,38 +135,34 @@ bool LyXTextClassList::Read () lyxerr[Debug::TCLASS] << "Fname: " << fname << endl; if (lex.next()) { string const clname = lex.getString(); - lyxerr[Debug::TCLASS] - << "Clname: " << clname << endl; + lyxerr[Debug::TCLASS] << "Clname: " << clname << endl; 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(); - } - Add (tmpl); + string const desc = lex.getString(); + lyxerr[Debug::TCLASS] << "Desc: " << desc << endl; + 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); + } } } } } 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; } @@ -168,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 "