Fixed insert File inside tabulars/insettext (fix #301,#302).

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index ff19fbc4934c40c6e28ae83dabb78f299f5fd4da..9418b24464e77029deaab2cd3e95a66a486e04fa 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *          Copyright 1995 Matthias Ettrich
  *          Copyright 1995-2001 The LyX Team.
  *
@@ -69,7 +69,7 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
                lay.reslabelfont.realize(defaultfont(), default_language);
 #endif
                return false; // no errors
-       } 
+       }
        lyxerr << "Error parsing style `" << lay.name() << "'" << endl;
        return true;
 }
@@ -131,37 +131,37 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                lyxerr[Debug::TCLASS] << "Reading input file "
                                     << MakeDisplayPath(filename)
                                     << endl;
-       
+
        LyXLex lexrc(textClassTags, TC_RIGHTMARGIN);
        bool error = false;
 
-        lexrc.setFile(filename);
-       if (!lexrc.isOK()) error = true; 
+       lexrc.setFile(filename);
+       if (!lexrc.isOK()) error = true;
 
        // parsing
        while (lexrc.isOK() && !error) {
                int le = lexrc.lex();
                switch (le) {
                case LyXLex::LEX_FEOF:
-                       continue; 
+                       continue;
 
-               case LyXLex::LEX_UNDEF:                                 
+               case LyXLex::LEX_UNDEF:
                        lexrc.printError("Unknown TextClass tag `$$Token'");
                        error = true;
-                       continue; 
+                       continue;
                default: break;
                }
                switch (static_cast<TextClassTags>(le)) {
                case TC_OUTPUTTYPE:   // output type definition
                        readOutputType(lexrc);
                        break;
-                       
+
                case TC_INPUT: // Include file
-                       if (lexrc.next()) {
-                               string tmp = LibFileSearch("layouts",
-                                                           lexrc.getString(), 
+                       if (lexrc.next()) {
+                               string tmp = LibFileSearch("layouts",
+                                                           lexrc.getString(),
                                                            "layout");
-                               
+
                                if (Read(tmp, true)) {
                                        lexrc.printError("Error reading input"
                                                         "file: "+tmp);
@@ -177,13 +177,14 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                defaultlayout_ = name;
                        }
                        break;
-                       
+
                case TC_STYLE:
                        if (lexrc.next()) {
                                string const name = subst(lexrc.getString(),
                                                    '_', ' ');
                                if (hasLayout(name)) {
-                                       LyXLayout & lay = operator[](name);
+                                       LyXLayout & lay =
+                                               const_cast<LyXLayout &>(operator[](name));
                                        error = do_readStyle(lexrc, lay);
                                } else {
                                        LyXLayout lay;
@@ -220,7 +221,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        if (lexrc.next())
                                columns_ = lexrc.getInteger();
                        break;
-                       
+
                case TC_SIDES:
                        if (lexrc.next()) {
                                switch (lexrc.getInteger()) {
@@ -235,12 +236,12 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                }
                        }
                        break;
-                       
+
                case TC_PAGESTYLE:
-                       lexrc.next();
+                       lexrc.next();
                        pagestyle_ = strip(lexrc.getString());
                        break;
-                       
+
                case TC_DEFAULTFONT:
                        defaultfont_.lyxRead(lexrc);
                        if (!defaultfont_.resolved()) {
@@ -250,7 +251,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                defaultfont_.realize(LyXFont(LyXFont::ALL_SANE));
 #else
                                defaultfont_.realize(LyXFont(LyXFont::ALL_SANE),
-                                                    default_language);
+                                                    default_language);
 #endif
                        }
                        break;
@@ -269,10 +270,10 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        tocdepth_ = lexrc.getInteger();
                        break;
 
-                       // First step to support options 
-               case TC_CLASSOPTIONS:
+                       // First step to support options
+               case TC_CLASSOPTIONS:
                        readClassOptions(lexrc);
-                       break;
+                       break;
 
                case TC_PREAMBLE:
                        preamble_ = lexrc.getLongString("EndPreamble");
@@ -294,19 +295,19 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        break;
 
                case TC_LEFTMARGIN:     // left margin type
-                       if (lexrc.next())
+                       if (lexrc.next())
                                leftmargin_ = lexrc.getString();
-                       break;                  
+                       break;
 
                case TC_RIGHTMARGIN:    // right margin type
                        if (lexrc.next())
                                rightmargin_ = lexrc.getString();
                        break;
                }
-       }       
+       }
 
        if (!merge) { // we are at top level here.
-               lyxerr[Debug::TCLASS] << "Finished reading textclass " 
+               lyxerr[Debug::TCLASS] << "Finished reading textclass "
                                      << MakeDisplayPath(filename)
                                      << endl;
                if (defaultlayout_.empty()) {
@@ -315,7 +316,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        error = true;
                }
        } else
-               lyxerr[Debug::TCLASS] << "Finished reading input file " 
+               lyxerr[Debug::TCLASS] << "Finished reading input file "
                                      << MakeDisplayPath(filename)
                                      << endl;
 
@@ -388,7 +389,7 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
        switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown MaxCounter tag `$$Token'");
-               return; 
+               return;
        default: break;
        }
        switch (static_cast<MaxCounterTags>(le)) {
@@ -450,7 +451,7 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc)
                switch (le) {
                case LyXLex::LEX_UNDEF:
                        lexrc.printError("Unknown ClassOption tag `$$Token'");
-                       continue; 
+                       continue;
                default: break;
                }
                switch (static_cast<ClassOptionsTags>(le)) {
@@ -460,7 +461,7 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc)
                        break;
                case CO_PAGESTYLE:
                        lexrc.next();
-                       opt_pagestyle_ = strip(lexrc.getString()); 
+                       opt_pagestyle_ = strip(lexrc.getString());
                        break;
                case CO_OTHER:
                        lexrc.next();
@@ -496,7 +497,7 @@ string const & LyXTextClass::rightmargin() const
 bool LyXTextClass::hasLayout(string const & n) const
 {
        string const name = (n.empty() ? defaultLayoutName() : n);
-       
+
        return find_if(layoutlist.begin(), layoutlist.end(),
                       lyx::compare_memfun(&LyXLayout::name, name))
                != layoutlist.end();
@@ -506,54 +507,37 @@ bool LyXTextClass::hasLayout(string const & n) const
 LyXLayout const & LyXTextClass::operator[](string const & n) const
 {
        lyx::Assert(!n.empty());
-       
+
        if (n.empty())
                lyxerr << "Operator[] called with empty n" << endl;
-       
-       string const name = (n.empty() ? defaultLayoutName() : n);
-       
-       LayoutList::const_iterator cit =
-               find_if(layoutlist.begin(),
-                       layoutlist.end(),
-                       lyx::compare_memfun(&LyXLayout::name, name));
 
-       if (cit == layoutlist.end()) {
-               lyxerr << "We failed to find the layout '" << name
-                      << "' in the layout list. You MUST investigate!"
-                      << endl;
-               
-               // we require the name to exist
-               lyx::Assert(false);
-       }
-
-       return *cit;
-}
+       string const name = (n.empty() ? defaultLayoutName() : n);
 
+       static string lastLayoutName;
+       static LayoutList::difference_type lastLayoutIndex;
 
-LyXLayout & LyXTextClass::operator[](string const & n)
-{
-       lyx::Assert(!n.empty());
+       if (name == lastLayoutName)
+               return layoutlist[lastLayoutIndex];
 
-       if (n.empty())
-               lyxerr << "Operator[] called with empty n" << endl;
 
-       string const name = (n.empty() ? defaultLayoutName() : n);
-       
-       LayoutList::iterator it =
+       LayoutList::const_iterator cit =
                find_if(layoutlist.begin(),
                        layoutlist.end(),
                        lyx::compare_memfun(&LyXLayout::name, name));
 
-       if (it == layoutlist.end()) {
+       if (cit == layoutlist.end()) {
                lyxerr << "We failed to find the layout '" << name
                       << "' in the layout list. You MUST investigate!"
                       << endl;
-               
+
                // we require the name to exist
                lyx::Assert(false);
        }
-       
-       return *it;
+
+       lastLayoutName = name;
+       lastLayoutIndex = std::distance(layoutlist.begin(), cit);
+
+       return *cit;
 }
 
 
@@ -561,7 +545,7 @@ bool LyXTextClass::delete_layout(string const & name)
 {
        if (name == defaultLayoutName())
                return false;
-       
+
        LayoutList::iterator it =
                remove_if(layoutlist.begin(), layoutlist.end(),
                          lyx::compare_memfun(&LyXLayout::name, name));
@@ -591,7 +575,7 @@ bool LyXTextClass::load() const
        }
        loaded = true;
        return loaded;
-       
+
 }
 
 
@@ -608,12 +592,6 @@ LyXLayout const & LyXTextClass::defaultLayout() const
 }
 
 
-LyXLayout & LyXTextClass::defaultLayout()
-{
-       return operator[](defaultLayoutName());
-}
-
-
 string const & LyXTextClass::name() const
 {
        return name_;
@@ -691,7 +669,7 @@ bool LyXTextClass::provides(LyXTextClass::Provides p) const
 {
        return provides_ & p;
 }
-       
+
 
 unsigned int LyXTextClass::columns() const
 {