Load local textclass in addTextClass(), reload local layout correctly in LFUN_TEXTCLA...

[lyx.git] / src / TextClassList.cpp

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index 02d065df6608fdc914f6dfc1159fa4c031dc5ba2..8a2f86923917a652dc0a9bf2e5f6c55ace7f2f4a 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,30 +24,17 @@
 
 #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
+pair<bool, TextClassIndex> const
 TextClassList::numberOfClass(string const & textclass) const
 {
        ClassList::const_iterator cit =
@@ -56,14 +44,24 @@ TextClassList::numberOfClass(string const & textclass) const
                             textclass));
 
        return cit != classlist_.end() ?
-               make_pair(true, textclass_type(cit - classlist_.begin())) :
-               make_pair(false, textclass_type(0));
+               make_pair(true, TextClassIndex(cit - classlist_.begin())) :
+               make_pair(false, TextClassIndex(0));
 }
 
 
 // Gets a textclass structure from number
 TextClass const &
-TextClassList::operator[](textclass_type textclass) const
+TextClassList::operator[](TextClassIndex textclass) const
+{
+       if (textclass >= classlist_.size())
+               return classlist_[0];
+       
+       //FIXME I don't believe the following line is actually necessary (rgh)
+       classlist_[textclass].load();
+       return classlist_[textclass];
+}
+
+TextClass & TextClassList::at(TextClassIndex textclass)
 {
        if (textclass >= classlist_.size())
                return classlist_[0];
@@ -76,7 +74,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 +95,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 +151,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);
@@ -176,7 +176,8 @@ bool TextClassList::read()
 }
 
 
-void TextClassList::reset(textclass_type const textclass) {
+void TextClassList::reset(TextClassIndex const & textclass)
+{
        if (textclass >= classlist_.size())
                return;
        TextClass const & tc = classlist_[textclass];
@@ -186,8 +187,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, TextClassIndex> 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
@@ -209,18 +210,29 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
                        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.
+                               // now, create a TextClass with description containing path information
                                TextClass tmpl(textclass, sub.str(2)==""?textclass:sub.str(2),
                                        sub.str(3) + " <" + path + ">", true);
                                if (lyxerr.debugging(Debug::TCLASS))
                                        tmpl.load(path);
+                               // Do not add this local TextClass to classlist_ if it has
+                               // already been loaded by, for example, a master buffer.
+                               pair<bool, lyx::TextClassIndex> pp =
+                                       textclasslist.numberOfClass(textclass);
+                               // only layouts from the same directory are considered to be identical.
+                               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);
                        }
                }
        }
        // If .layout is not in local directory, or an invalid layout is found, return false
-       return make_pair(false, textclass_type(0));
+       return make_pair(false, TextClassIndex(0));
 }
 
 
@@ -228,7 +240,7 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
 TextClassList textclasslist;
 
 
-textclass_type defaultTextclass()
+TextClassIndex defaultTextclass()
 {
        // We want to return the article class. if `first' is
        // true in the returned pair, then `second' is the textclass