X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=8d4a7639ccce7affe01d42cc442a9218749f5b3a;hb=24f8676130d1e0769db394b7142dae7eeb1d955e;hp=9c1c447d1b57ca4ee9d849704326d94000879b9b;hpb=22c088071d45822551069b9b616e3d87f66666e3;p=lyx.git diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C index 9c1c447d1b..8d4a7639cc 100644 --- a/src/lyxtextclasslist.C +++ b/src/lyxtextclasslist.C @@ -1,26 +1,21 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. +/** + * \file lyxtextclasslist.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== + * \author Lars Gullik Bjønnes + * \author John Levon + * + * 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" @@ -29,7 +24,12 @@ #include -using lyx::layout_type; +using namespace lyx::support; + +#ifndef CXX_GLOBAL_CSTD +using std::exit; +#endif + using lyx::textclass_type; using std::pair; using std::make_pair; @@ -43,136 +43,53 @@ pair 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)); } -// Gets layout structure from style number and textclass number -LyXLayout const & -LyXTextClassList::Style(textclass_type textclass, - layout_type layout) const -{ - classlist[textclass].load(); - if (layout < classlist[textclass].numLayouts()) - return classlist[textclass][layout]; - return classlist[textclass][0]; -} - - -// Gets layout number from name and textclass number -pair const -LyXTextClassList::NumberOfLayout(textclass_type textclass, - string const & name) const -{ - classlist[textclass].load(); - for (unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) { - if (classlist[textclass][i].name() == name) - return make_pair(true, i); - } - return make_pair(false, layout_type(0)); // not found -} - - -// Gets a layout (style) name from layout number and textclass number -string const & -LyXTextClassList::NameOfLayout(textclass_type textclass, - layout_type layout) const -{ - static string const dummy("dummy"); - classlist[textclass].load(); - if (layout < classlist[textclass].numLayouts()) - return classlist[textclass][layout].name(); - return dummy; -} - - -// Gets a textclass name from number -string const & -LyXTextClassList::NameOfClass(textclass_type number) const -{ - static string const dummy("dummy"); - if (classlist.empty()) { - return dummy; - } - lyx::Assert(number < classlist.size()); - return classlist[number].name(); -} - - -// Gets a textclass latexname from number -string const & -LyXTextClassList::LatexnameOfClass(textclass_type number) const -{ - static string const dummy("dummy"); - classlist[number].load(); - if (classlist.empty()) { - return dummy; - } - lyx::Assert(number < classlist.size()); - return classlist[number].latexname(); -} - - -// Gets a textclass description from number -string const & -LyXTextClassList::DescOfClass(textclass_type number) const -{ - static string const dummy("dummy"); - if (classlist.empty()) { - return dummy; - } - lyx::Assert(number < classlist.size()); - return classlist[number].description(); -} - - // Gets a textclass structure from number LyXTextClass const & -LyXTextClassList::TextClass(textclass_type textclass) 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 @@ -186,13 +103,13 @@ bool LyXTextClassList::Read () "lyxlex was not able to set file: " << real_file << endl; } - + if (!lex.isOK()) { lyxerr << "LyXTextClassList::Read: unable to open " "textclass file `" << MakeDisplayPath(real_file, 1000) << "'\nCheck your installation. LyX can't continue." << endl; - return false; + return false; } bool finished = false; @@ -209,68 +126,47 @@ 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; } - -/* Load textclass - Returns false if this fails -*/ -bool LyXTextClassList::Load(textclass_type number) const -{ - bool result = true; - if (number < classlist.size()) { - classlist[number].load(); - if (classlist[number].numLayouts() == 0) { - result = false; - } - } else { - result = false; - } - return result; -} - // 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 " "during parsing.\n Exiting." << endl;