Revert 23154.

[lyx.git] / src / TextClassList.cpp

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index 558eae477005c9616f56fb6aa18f4e7e45d0cdbe..eb721bfc9c6c8b5470051da8a78f616fb1c59afd 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -13,9 +13,10 @@
 
 #include "TextClassList.h"
 #include "TextClass.h"
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 
 #include <boost/bind.hpp>
@@ -23,28 +24,15 @@
 
 #include <fstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-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<bool, textclass_type> const
 TextClassList::numberOfClass(string const & textclass) const
@@ -76,7 +64,7 @@ TextClassList::operator[](textclass_type textclass) const
 
 // used when sorting the textclass list.
 class less_textclass_avail_desc
-       : public std::binary_function<TextClass, TextClass, int>
+       : public binary_function<TextClass, TextClass, int>
 {
 public:
        int operator()(TextClass const & tc1,
@@ -97,7 +85,7 @@ public:
 bool TextClassList::read()
 {
        Lexer lex(0, 0);
-       support::FileName const real_file = libFileSearch("", "textclass.lst");
+       FileName const real_file = libFileSearch("", "textclass.lst");
        LYXERR(Debug::TCLASS, "Reading textclasses from `" << real_file << '\'');
 
        if (real_file.empty()) {
@@ -153,6 +141,8 @@ bool TextClassList::read()
                                                // fname, clname, desc, and avail
                                                TextClass tmpl(fname, clname, desc, avail);
                                                if (lyxerr.debugging(Debug::TCLASS)) {
+                                                       // only system layout files are loaded here so no
+                                                       // buffer path is needed.
                                                        tmpl.load();
                                                }
                                                classlist_.push_back(tmpl);
@@ -186,8 +176,8 @@ void TextClassList::reset(textclass_type const textclass) {
 }
 
 
-std::pair<bool, textclass_type> const
-TextClassList::addTextClass(std::string const & textclass, std::string const & path)
+pair<bool, textclass_type> const
+TextClassList::addTextClass(string const & textclass, 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
@@ -222,6 +212,10 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
                                if (pp.first && classlist_[pp.second].description() == tmpl.description())
                                        return pp;
                                classlist_.push_back(tmpl);
+                               // This textclass is added on request so it will definitely be
+                               // used. Load it now because other load() calls may fail if they
+                               // are called in a context without buffer path information.
+                               classlist_.back().load(path);
                                return make_pair(true, classlist_.size() - 1);
                        }
                }