X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=d9048a75be9dd4d603f7e6c7730c52729ce3d33e;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=d764c5c043c405f12ff0fbba4f7494891bbdf1c8;hpb=06242eb145379e15ce539900a58b5f7cff58a47b;p=lyx.git diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C index d764c5c043..d9048a75be 100644 --- 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 @@ -15,34 +15,47 @@ #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 +#include +#include +#include -#ifndef CXX_GLOBAL_CSTD -using std::exit; -#endif -using lyx::textclass_type; -using std::pair; -using std::make_pair; +namespace lyx { +namespace fs = boost::filesystem; + +using support::FileName; +using support::addName; +using support::libFileSearch; +using support::makeDisplayPath; + +using boost::bind; +using boost::regex; +using boost::smatch; + using std::endl; +using std::equal_to; using std::find_if; +using std::make_pair; using std::sort; +using std::string; +using std::pair; +using std::ifstream; // Gets textclass number from name pair const -LyXTextClassList::NumberOfClass(string const & textclass) const +LyXTextClassList::numberOfClass(string const & textclass) const { ClassList::const_iterator cit = find_if(classlist_.begin(), classlist_.end(), - lyx::compare_memfun(&LyXTextClass::name, textclass)); + 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)); @@ -62,25 +75,36 @@ LyXTextClassList::operator[](textclass_type textclass) const // 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"); + support::FileName const real_file = libFileSearch("", "textclass.lst"); lyxerr[Debug::TCLASS] << "Reading textclasses from `" << real_file << '\'' << endl; if (real_file.empty()) { lyxerr << "LyXTextClassList::Read: unable to find " - "textclass file `" << MakeDisplayPath(real_file, 1000) + "textclass file `" + << to_utf8(makeDisplayPath(real_file.absFilename(), 1000)) << "'. Exiting." << endl; return false; // This causes LyX to end... Not a desirable behaviour. Lgb @@ -98,7 +122,8 @@ bool LyXTextClassList::Read() if (!lex.isOK()) { lyxerr << "LyXTextClassList::Read: unable to open " - "textclass file `" << MakeDisplayPath(real_file, 1000) + "textclass file `" + << to_utf8(makeDisplayPath(real_file.absFilename(), 1000)) << "'\nCheck your installation. LyX can't continue." << endl; return false; @@ -122,13 +147,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,24 +170,67 @@ 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; } +std::pair const +LyXTextClassList::addTextClass(std::string const & textclass, std::string const & path) +{ + // only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS + // NOTE: latex class name is defined in textclass.layout, which can be different from textclass + FileName const layout_file(addName(path, textclass + ".layout")); + if (fs::exists(layout_file.toFilesystemEncoding())) { + lyxerr[Debug::TCLASS] << "Adding class " << textclass << " from directory " << path << endl; + // Read .layout file and get description, real latex classname etc + // + // This is a C++ version of function processLayoutFile in configure.py, + // which uses the following regex + // \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)} + ifstream ifs(layout_file.toFilesystemEncoding().c_str()); + static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*" + "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*"); + string line; + while (getline(ifs, line)) { + // look for the \DeclareXXXClass line + smatch sub; + if (regex_match(line, sub, reg)) { + // returns: whole string, classtype (not used here), first option, description + BOOST_ASSERT(sub.size()==4); + // now, add the layout to textclass. + LyXTextClass tmpl(textclass, sub.str(2)==""?textclass:sub.str(2), + sub.str(3) + " <" + path + ">", true); + if (lyxerr.debugging(Debug::TCLASS)) + tmpl.load(path); + classlist_.push_back(tmpl); + return make_pair(true, classlist_.size() - 1); + } + } + } + // If .layout is not in local directory, or an invalid layout is found, return false + return make_pair(false, textclass_type(0)); +} + + // Global variable: textclass table. LyXTextClassList textclasslist; + // Reads the style files -void LyXSetStyle() +bool LyXSetStyle() { - lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration...\n"; + lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration..." << endl; - if (!textclasslist.Read()) { + if (!textclasslist.read()) { lyxerr[Debug::TCLASS] << "LyXSetStyle: an error occured " "during parsing.\n Exiting." << endl; - exit(1); + return false; } lyxerr[Debug::TCLASS] << "LyXSetStyle: configuration parsed." << endl; + return true; } + + +} // namespace lyx