I'll find a solution for the 'dirList problem', Abdel.

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 1785887207d487941f7c7c09d305fa188ef5fa56..53d5f83086ddf3f4be020adac17733925228b597 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -13,13 +13,12 @@
 #include "factory.h"
 
 #include "Buffer.h"
-#include "BufferView.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
 #include "LyX.h"
+#include "TextClass.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
@@ -46,7 +45,7 @@
 #include "insets/InsetBox.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetOptArg.h"
-#include "insets/InsetPagebreak.h"
+#include "insets/InsetNewpage.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
@@ -60,11 +59,11 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
 
 #include <boost/assert.hpp>
-#include <boost/current_function.hpp>
 
 #include <sstream>
 
@@ -80,9 +79,9 @@ namespace Alert = frontend::Alert;
 using support::compare_ascii_no_case;
 
 
-Inset * createInset(BufferView * bv, FuncRequest const & cmd)
+Inset * createInset(Buffer & buf, FuncRequest const & cmd)
 {
-       BufferParams const & params = bv->buffer().params();
+       BufferParams const & params = buf.params();
 
        try {
 
@@ -93,6 +92,9 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                case LFUN_LINE_INSERT:
                        return new InsetLine;
 
+               case LFUN_NEWPAGE_INSERT:
+                       return new InsetNewpage;
+
                case LFUN_PAGEBREAK_INSERT:
                        return new InsetPagebreak;
 
@@ -104,8 +106,8 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
 
                case LFUN_FLEX_INSERT: {
                        string s = cmd.getArg(0);
-                       TextClass tclass = params.getTextClass();
-                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       TextClass const & tclass = params.getTextClass();
+                       InsetLayout const & il = tclass.insetlayout(from_utf8(s));
                        return new InsetFlex(params, il);
                }
 
@@ -154,7 +156,6 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        if (params.getTextClass().floats().typeExist(argument))
                                return new InsetFloat(params, argument);
                        lyxerr << "Non-existent float type: " << argument << endl;
-                       return 0;
                }
 
                case LFUN_FLOAT_WIDE_INSERT: {
@@ -182,9 +183,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
 
                case LFUN_NOMENCL_INSERT: {
                        InsetCommandParams icp(NOMENCL_CODE);
-                       icp["symbol"] = cmd.argument().empty() ?
-                               bv->cursor().innerText()->getStringToIndex(bv->cursor()) :
-                               cmd.argument();
+                       icp["symbol"] = cmd.argument();
                        return new InsetNomencl(icp);
                }
 
@@ -198,7 +197,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                                r = 2;
                        if (c <= 0)
                                c = 2;
-                       return new InsetTabular(bv->buffer(), r, c);
+                       return new InsetTabular(buf, r, c);
                }
 
                case LFUN_CAPTION_INSERT: {
@@ -267,18 +266,16 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        }
                        
                        case EXTERNAL_CODE: {
-                               Buffer const & buffer = bv->buffer();
                                InsetExternalParams iep;
-                               InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer, iep);
+                               InsetExternalMailer::string2params(to_utf8(cmd.argument()), buf, iep);
                                auto_ptr<InsetExternal> inset(new InsetExternal);
-                               inset->setParams(iep, buffer);
+                               inset->setParams(iep, buf);
                                return inset.release();
                        }
                        
                        case GRAPHICS_CODE: {
-                               Buffer const & buffer = bv->buffer();
                                InsetGraphicsParams igp;
-                               InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buffer, igp);
+                               InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buf, igp);
                                auto_ptr<InsetGraphics> inset(new InsetGraphics);
                                inset->setParams(igp);
                                return inset.release();
@@ -314,7 +311,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        case REF_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp);
-                               return new InsetRef(icp, bv->buffer());
+                               return new InsetRef(icp, buf);
                        }
                        
                        case TOC_CODE: {
@@ -341,21 +338,21 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        string const name = to_utf8(cmd.argument());
                        if (name == "normal")
                                return new InsetSpace(InsetSpace::NORMAL);
-                       else if (name == "protected")
+                       if (name == "protected")
                                return new InsetSpace(InsetSpace::PROTECTED);
-                       else if (name == "thin")
+                       if (name == "thin")
                                return new InsetSpace(InsetSpace::THIN);
-                       else if (name == "quad")
+                       if (name == "quad")
                                return new InsetSpace(InsetSpace::QUAD);
-                       else if (name == "qquad")
+                       if (name == "qquad")
                                return new InsetSpace(InsetSpace::QQUAD);
-                       else if (name == "enspace")
+                       if (name == "enspace")
                                return new InsetSpace(InsetSpace::ENSPACE);
-                       else if (name == "enskip")
+                       if (name == "enskip")
                                return new InsetSpace(InsetSpace::ENSKIP);
-                       else if (name == "negthinspace")
+                       if (name == "negthinspace")
                                return new InsetSpace(InsetSpace::NEGTHIN);
-                       else if (name.empty())
+                       if (name.empty())
                                lyxerr << "LyX function 'space' needs an argument." << endl;
                        else
                                lyxerr << "Wrong argument for LyX function 'space'." << endl;
@@ -392,7 +389,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 
        auto_ptr<Inset> inset;
 
-       TextClass tclass = buf.params().getTextClass();
+       TextClass const & tclass = buf.params().getTextClass();
 
        lex.next();
        string tmptok = lex.getString();
@@ -487,7 +484,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                } else if (tmptok == "Flex") {
                        lex.next();
                        string s = lex.getString();
-                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       InsetLayout const & il = tclass.insetlayout(from_utf8(s));
                        inset.reset(new InsetFlex(buf.params(), il));
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
@@ -542,18 +539,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();