Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index bc18c35e7e146ad1d75b11ca37ad678b6c4b7000..2577abd1f823d63c01452f33c411dac08275068d 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -27,6 +27,7 @@
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Messages.h"
+#include "ModuleList.h"
 #include "Color.h"
 #include "Font.h"
 #include "Lexer.h"
@@ -41,6 +42,7 @@
 #include "insets/InsetListingsParams.h"
 
 #include "support/convert.h"
+#include "support/filetools.h"
 #include "support/Translator.h"
 
 #include <boost/array.hpp>
@@ -55,7 +57,9 @@ using std::istringstream;
 using std::ostream;
 using std::ostringstream;
 using std::pair;
-
+using std::string;
+using lyx::support::FileName;
+using lyx::support::libFileSearch;
 using lyx::support::bformat;
 using lyx::support::rtrim;
 using lyx::support::tokenPos;
@@ -349,6 +353,7 @@ BufferParams::BufferParams()
        listings_params = string();
        pagestyle = "default";
        compressed = false;
+       embedded = false;
        for (int iter = 0; iter < 4; ++iter) {
                user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
                temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
@@ -472,9 +477,13 @@ string const BufferParams::readToken(Lexer & lex, string const & token)
                                                 "for more information.\n"), from_utf8(classname));
                        frontend::Alert::warning(_("Document class not available"),
                                       msg + _("LyX will not be able to produce output."));
-               }
+               } 
+               
        } else if (token == "\\begin_preamble") {
                readPreamble(lex);
+       } else if (token == "\\begin_modules") {
+               readModules(lex);
+               makeTextClass();
        } else if (token == "\\options") {
                lex.eatLine();
                options = lex.getString();
@@ -625,6 +634,8 @@ string const BufferParams::readToken(Lexer & lex, string const & token)
        } else if (token == "\\float_placement") {
                lex >> float_placement;
        } else {
+               lyxerr << "BufferParams::readToken(): Unknown token: " << 
+                       token << endl;
                return token;
        }
 
@@ -653,6 +664,15 @@ void BufferParams::writeFile(ostream & os) const
        if (!options.empty()) {
                os << "\\options " << options << '\n';
        }
+       
+       //the modules
+       if (!layoutModules_.empty()) {
+               os << "\\begin_modules" << '\n';
+               LayoutModuleList::const_iterator it = layoutModules_.begin();
+               for (; it != layoutModules_.end(); it++)
+                       os << *it << '\n';
+               os << "\\end_modules" << '\n';
+       }
 
        // then the text parameters
        if (language != ignore_language)
@@ -1195,20 +1215,30 @@ TextClass const & BufferParams::getTextClass() const
 }
 
 
-TextClass_ptr BufferParams::getTextClass_ptr() const {
+TextClassPtr BufferParams::getTextClassPtr() const {
        return textClass_;
 }
 
 
-void BufferParams::setTextClass(TextClass_ptr tc) {
+void BufferParams::setTextClass(TextClassPtr tc) {
        textClass_ = tc;
 }
 
 
-void BufferParams::setBaseClass(textclass_type tc)
+bool BufferParams::setBaseClass(textclass_type tc)
 {
-       baseClass_ = tc;
+       bool retVal = true;
+       if (textclasslist[tc].load())
+               baseClass_ = tc;
+       else {
+               docstring s = 
+                       bformat(_("The document class %1$s could not be loaded."),
+                from_utf8(textclasslist[tc].name()));
+               frontend::Alert::error(_("Could not load class"), s);
+               retVal = false;
+       }
        makeTextClass();
+       return retVal;
 }
 
 
@@ -1227,6 +1257,69 @@ textclass_type BufferParams::getBaseClass() const
 void BufferParams::makeTextClass()
 {
        textClass_.reset(new TextClass(textclasslist[getBaseClass()]));
+       //FIXME It might be worth loading the children's modules here,
+       //just as we load their bibliographies and such, instead of just 
+       //doing a check in InsetInclude.
+       LayoutModuleList::const_iterator it = layoutModules_.begin();
+       for (; it != layoutModules_.end(); it++) {
+               string const modName = *it;
+               LyXModule * lm = moduleList[modName];
+               if (!lm) {
+                       docstring const msg =
+                               bformat(_("The module %1$s has been requested by\n"
+                                       "this document but has not been found in the list of\n"
+                                       "available modules. If you recently installed it, you\n"
+                                       "probalby need to reconfigure LyX.\n"), from_utf8(modName));
+                       frontend::Alert::warning(_("Module not available"),
+                                       msg + _("Some layouts may not be available."));
+                       lyxerr << "BufferParams::makeTextClass(): Module " <<
+                                       modName << " requested but not found in module list." <<
+                                       endl;
+                       continue;
+               }
+               FileName layout_file = libFileSearch("layouts", lm->filename);
+               textClass_->read(layout_file, TextClass::MODULE);
+       }
+}
+
+
+std::vector<string> const & BufferParams::getModules() const {
+       return layoutModules_;
+}
+
+
+
+bool BufferParams::addLayoutModule(string modName, bool makeClass) {
+       LayoutModuleList::const_iterator it = layoutModules_.begin();
+       LayoutModuleList::const_iterator end = layoutModules_.end();
+       for (; it != end; it++) {
+               if (*it == modName) 
+                       break;
+       }
+       if (it != layoutModules_.end())
+               return false;
+       layoutModules_.push_back(modName);
+       if (makeClass)
+               makeTextClass();
+       return true;
+}
+
+
+bool BufferParams::addLayoutModules(std::vector<string>modNames)
+{
+       bool retval = true;
+       std::vector<string>::const_iterator it = modNames.begin();
+       std::vector<string>::const_iterator end = modNames.end();
+       for (; it != end; ++it)
+               retval &= addLayoutModule(*it, false);
+       makeTextClass();
+       return retval;
+}
+
+
+void BufferParams::clearLayoutModules() {
+       layoutModules_.clear();
+       makeTextClass();
 }
 
 
@@ -1327,6 +1420,23 @@ void BufferParams::readBulletsLaTeX(Lexer & lex)
 }
 
 
+void BufferParams::readModules(Lexer & lex)
+{
+       if (!lex.eatLine()) {
+               lyxerr << "Error (BufferParams::readModules):"
+                               "Unexpected end of input." << endl;
+               return;
+       }
+       while (true) {
+               string mod = lex.getString();
+               if (mod == "\\end_modules")
+                       break;
+               addLayoutModule(mod);
+               lex.eatLine();
+       }
+}
+
+
 string const BufferParams::paperSizeName() const
 {
        char real_papersize = papersize;