don't rm emergency saves ever

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index d44748b0e5cec4e526fcc78bc15a8bef6348f259..462e9ed74c58c21a820afd09e37ca41f02d239c8 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -32,22 +32,27 @@ using std::ostream;
 namespace { // anon
 
 struct compare_name {
+
        compare_name(string const & name)
-               : name_(name) {}
-       template <class C>
-       bool operator()(C & c) {
+               : name_(name)
+       {}
+
+       bool operator()(boost::shared_ptr<LyXLayout> const & c)
+       {
                return c->name() == name_;
        }
+
        string name_;
+
 };
 
 } // anon
 
 
 LyXTextClass::LyXTextClass(string const & fn, string const & cln,
-                          string const & desc)
+                          string const & desc, bool texClassAvail )
        : name_(fn), latexname_(cln), description_(desc),
-         floatlist_(new FloatList), ctrs_(new Counters)
+         floatlist_(new FloatList), ctrs_(new Counters), texClassAvail_(texClassAvail)
 {
        outputType_ = LATEX;
        columns_ = 1;
@@ -66,6 +71,12 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
 }
 
 
+bool LyXTextClass::isTeXClassAvailable() const
+{
+       return texClassAvail_;
+}
+
+
 bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
 {
        lyxerr[Debug::TCLASS] << "Reading style " << lay.name() << endl;
@@ -87,6 +98,7 @@ enum TextClassTags {
        TC_INPUT,
        TC_STYLE,
        TC_DEFAULTSTYLE,
+       TC_ENVIRONMENT,
        TC_NOSTYLE,
        TC_COLUMNS,
        TC_SIDES,
@@ -119,6 +131,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                { "counter",         TC_COUNTER },
                { "defaultfont",     TC_DEFAULTFONT },
                { "defaultstyle",    TC_DEFAULTSTYLE },
+               { "environment",     TC_ENVIRONMENT },
                { "float",           TC_FLOAT },
                { "input",           TC_INPUT },
                { "leftmargin",      TC_LEFTMARGIN },
@@ -150,7 +163,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                     << MakeDisplayPath(filename)
                                     << endl;
 
-       LyXLex lexrc(textClassTags, TC_TITLELATEXTYPE);
+       LyXLex lexrc(textClassTags,
+               sizeof(textClassTags) / sizeof(textClassTags[0]));
        bool error = false;
 
        lexrc.setFile(filename);
@@ -159,6 +173,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
        // parsing
        while (lexrc.isOK() && !error) {
                int le = lexrc.lex();
+
                switch (le) {
                case LyXLex::LEX_FEOF:
                        continue;
@@ -167,9 +182,13 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        lexrc.printError("Unknown TextClass tag `$$Token'");
                        error = true;
                        continue;
-               default: break;
+
+               default:
+                       break;
                }
+
                switch (static_cast<TextClassTags>(le)) {
+
                case TC_OUTPUTTYPE:   // output type definition
                        readOutputType(lexrc);
                        break;
@@ -201,14 +220,14 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                string const name = subst(lexrc.getString(),
                                                    '_', ' ');
                                if (hasLayout(name)) {
-                                       LyXLayout * lay =
-                                               operator[](name).get();
+                                       LyXLayout * lay = operator[](name).get();
                                        error = do_readStyle(lexrc, *lay);
                                } else {
                                        LyXLayout lay;
                                        lay.setName(name);
                                        if (!(error = do_readStyle(lexrc, lay)))
-                                               layoutlist_.push_back(boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
+                                               layoutlist_.push_back
+                                                       (boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
                                        if (defaultlayout_.empty()) {
                                                // We do not have a default
                                                // layout yet, so we choose
@@ -224,6 +243,29 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        }
                        break;
 
+               case TC_ENVIRONMENT:
+                       if (lexrc.next()) {
+                               string const name = subst(lexrc.getString(),
+                                                   '_', ' ');
+                               if (hasLayout(name)) {
+                                       LyXLayout * lay = operator[](name).get();
+                                       error = do_readStyle(lexrc, *lay);
+                               } else {
+                                       LyXLayout lay;
+                                       lay.setName(name);
+                                       if (!(error = do_readStyle(lexrc, lay)))
+                                               envlist_.push_back
+                                                       (boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
+                                       else
+                                               lexrc.printError("Problems reading environment: `$$Token'.");
+                               }
+                       }
+                       else {
+                               lexrc.printError("No name given for style: `$$Token'.");
+                               error = true;
+                       }
+                       break;
+
                case TC_NOSTYLE:
                        if (lexrc.next()) {
                                string const style = subst(lexrc.getString(),
@@ -450,13 +492,16 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
        };
 
        pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
+
        int le = lexrc.lex();
        switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown MaxCounter tag `$$Token'");
                return;
-       default: break;
+       default:
+               break;
        }
+
        switch (static_cast<MaxCounterTags>(le)) {
        case MC_COUNTER_CHAPTER:
                maxcounter_ = LABEL_COUNTER_CHAPTER;
@@ -732,7 +777,7 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
        lyx::Assert(!n.empty());
 
        if (n.empty())
-               lyxerr << "Operator[] called with empty n" << endl;
+               lyxerr << "LyXTextClass::operator[] called with empty n" << endl;
 
        string const name = (n.empty() ? defaultLayoutName() : n);
 
@@ -763,6 +808,28 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
 }
 
 
+LyXLayout_ptr const & LyXTextClass::getEnv(string const & name) const
+{
+       lyx::Assert(!name.empty());
+
+       if (name.empty())
+               lyxerr << "LyXTextClass::getEnv() called with empty n" << endl;
+
+       LayoutList::const_iterator cit =
+               find_if(envlist_.begin(), envlist_.end(), compare_name(name));
+
+       if (cit == envlist_.end()) {
+               lyxerr << "We failed to find the environment '" << name
+                      << "' in the layout list. You MUST investigate!"
+                      << endl;
+               // we require the name to exist
+               lyx::Assert(false);
+       }
+
+       return *cit;
+}
+
+
 bool LyXTextClass::delete_layout(string const & name)
 {
        if (name == defaultLayoutName())