* docstream: factorize out some code and introduce odocfstream::reset()

[lyx.git] / src / TextClassList.cpp

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index bfda9d35d59f8c3e1533677052b5f19f86098a4d..02d065df6608fdc914f6dfc1159fa4c031dc5ba2 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -13,19 +13,18 @@
 
 #include "TextClassList.h"
 #include "TextClass.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include "support/filetools.h"
 
 #include <boost/bind.hpp>
 #include <boost/regex.hpp>
-#include <boost/filesystem/operations.hpp>
+
 #include <fstream>
 
 
 namespace lyx {
-namespace fs = boost::filesystem;
 
 using support::FileName;
 using support::addName;
@@ -99,8 +98,7 @@ bool TextClassList::read()
 {
        Lexer lex(0, 0);
        support::FileName const real_file = libFileSearch("", "textclass.lst");
-       LYXERR(Debug::TCLASS) << "Reading textclasses from `"
-                             << real_file << '\'' << endl;
+       LYXERR(Debug::TCLASS, "Reading textclasses from `" << real_file << '\'');
 
        if (real_file.empty()) {
                lyxerr << "TextClassList::Read: unable to find "
@@ -132,25 +130,25 @@ bool TextClassList::read()
 
        bool finished = false;
        // Parse config-file
-       LYXERR(Debug::TCLASS) << "Starting parsing of textclass.lst" << endl;
+       LYXERR(Debug::TCLASS, "Starting parsing of textclass.lst");
        while (lex.isOK() && !finished) {
-               LYXERR(Debug::TCLASS) << "\tline by line" << endl;
+               LYXERR(Debug::TCLASS, "\tline by line");
                switch (lex.lex()) {
                case Lexer::LEX_FEOF:
                        finished = true;
                        break;
                default:
                        string const fname = lex.getString();
-                       LYXERR(Debug::TCLASS) << "Fname: " << fname << endl;
+                       LYXERR(Debug::TCLASS, "Fname: " << fname);
                        if (lex.next()) {
                                string const clname = lex.getString();
-                               LYXERR(Debug::TCLASS) << "Clname: " << clname << endl;
+                               LYXERR(Debug::TCLASS, "Clname: " << clname);
                                if (lex.next()) {
                                        string const desc = lex.getString();
-                                       LYXERR(Debug::TCLASS) << "Desc: " << desc << endl;
+                                       LYXERR(Debug::TCLASS, "Desc: " << desc);
                                        if (lex.next()) {
                                                bool avail = lex.getBool();
-                                               LYXERR(Debug::TCLASS) << "Avail: " << avail << endl;
+                                               LYXERR(Debug::TCLASS, "Avail: " << avail);
                                                // This code is run when we have
                                                // fname, clname, desc, and avail
                                                TextClass tmpl(fname, clname, desc, avail);
@@ -163,15 +161,17 @@ bool TextClassList::read()
                        }
                }
        }
-       LYXERR(Debug::TCLASS) << "End of parsing of textclass.lst" << endl;
+       LYXERR(Debug::TCLASS, "End of parsing of textclass.lst");
 
-       if (classlist_.empty()) {
+       // lyx will start with an empty classlist_, but only reconfigure is allowed
+       // in this case. This gives users a second chance to configure lyx if
+       // initial configuration fails. (c.f. bug 2829)
+       if (classlist_.empty())
                lyxerr << "TextClassList::Read: no textclasses found!"
                       << endl;
-               return false;
-       }
-       // Ok everything loaded ok, now sort the list.
-       sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
+       else 
+               // Ok everything loaded ok, now sort the list.
+               sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
        return true;
 }
 
@@ -192,8 +192,8 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
        // 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;
+       if (layout_file.exists()) {
+               LYXERR(Debug::TCLASS, "Adding class " << textclass << " from directory " << path);
                // Read .layout file and get description, real latex classname etc
                //
                // This is a C++ version of function processLayoutFile in configure.py,
@@ -228,18 +228,29 @@ TextClassList::addTextClass(std::string const & textclass, std::string const & p
 TextClassList textclasslist;
 
 
+textclass_type defaultTextclass()
+{
+       // We want to return the article class. if `first' is
+       // true in the returned pair, then `second' is the textclass
+       // number; if it is false, second is 0. In both cases, second
+       // is what we want.
+       return textclasslist.numberOfClass("article").second;
+}
+
+
+
 // Reads the style files
 bool LyXSetStyle()
 {
-       LYXERR(Debug::TCLASS) << "LyXSetStyle: parsing configuration..." << endl;
+       LYXERR(Debug::TCLASS, "LyXSetStyle: parsing configuration...");
 
        if (!textclasslist.read()) {
-               LYXERR(Debug::TCLASS) << "LyXSetStyle: an error occured "
-                       "during parsing.\n             Exiting." << endl;
+               LYXERR(Debug::TCLASS, "LyXSetStyle: an error occured "
+                       "during parsing.\n             Exiting.");
                return false;
        }
 
-       LYXERR(Debug::TCLASS) << "LyXSetStyle: configuration parsed." << endl;
+       LYXERR(Debug::TCLASS, "LyXSetStyle: configuration parsed.");
        return true;
 }