* src/LyXRC.{cpp,h}:

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 557b2be2767cdd9166c41eea71e9ffbf9095744f..64eb68047e1e2ac97a35139efa3947291f374356 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -18,7 +18,6 @@
 #include "debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "Color.h"
 #include "Lexer.h"
 #include "LyX.h"
 
@@ -206,7 +205,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        auto_ptr<InsetCaption> inset(new InsetCaption(params));
                        inset->setAutoBreakRows(true);
                        inset->setDrawFrame(true);
-                       inset->setFrameColor(Color::captionframe);
+                       inset->setFrameColor(Color_captionframe);
                        return inset.release();
                }
 
@@ -292,9 +291,9 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        }
                        
                        case INCLUDE_CODE: {
-                               InsetCommandParams iip(code);
-                               InsetIncludeMailer::string2params(to_utf8(cmd.argument()), iip);
-                               return new InsetInclude(iip);
+                               InsetCommandParams icp(code);
+                               InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp);
+                               return new InsetInclude(icp);
                        }
                        
                        case INDEX_CODE:
@@ -434,14 +433,9 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                        case HYPERLINK_CODE:
                                inset.reset(new InsetHyperlink(inscmd));
                                break;
-                       // FIXME Currently non-functional, since InsetInclude
-                       // does not write itself as a CommandInset.
                        case INCLUDE_CODE:
                                inset.reset(new InsetInclude(inscmd));
                                break;
-                       case INDEX_CODE:
-                               inset.reset(new InsetIndex(buf.params()));
-                               break;
                        case INDEX_PRINT_CODE:
                                inset.reset(new InsetPrintIndex(inscmd));
                                break;
@@ -498,10 +492,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
                                                    InsetBranchParams()));
-               } else if (tmptok == "Include") {
-                       //FIXME
-                       InsetCommandParams p(INCLUDE_CODE);
-                       inset.reset(new InsetInclude(p));
                } else if (tmptok == "Environment") {
                        lex.next();
                        inset.reset(new InsetEnvironment(buf.params(), lex.getDocString()));
@@ -552,18 +542,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                }
 
                inset->read(buf, lex);
-
-// FIXME: hack..
-               if (inset->lyxCode() == MATHMACRO_CODE) {
-                       MathMacroTemplate const * tmpl =
-                               static_cast<MathMacroTemplate*>(inset.get());
-                       MacroTable::globalMacros().insert
-                               (tmpl->name(), tmpl->asMacroData());
-                       LYXERR(Debug::DEBUG)
-                               << BOOST_CURRENT_FUNCTION
-                               << ": creating local macro " << to_utf8(tmpl->name())
-                               << endl;
-               }
        }
 
        return inset.release();