code cosmetics to the iterator fix

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index 8d3b9b6ac10bcf0ceea4373ab80158f84bb22268..f642f4bd83d9d99a70904cde355b3676540710fe 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -56,13 +56,12 @@
 #include "mathed/math_macrotemplate.h"
 #include "mathed/math_hullinset.h"
 
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
-
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/assert.hpp>
+#include <boost/current_function.hpp>
+
+#include <sstream>
 
 using lyx::support::compare_ascii_no_case;
 
@@ -87,8 +86,12 @@ InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
 
        case LFUN_INSERT_CHARSTYLE: {
                string s = cmd.getArg(0);
-               CharStyles::iterator found_cs = params.getLyXTextClass().charstyle(s);
-               return new InsetCharStyle(params, found_cs);
+               LyXTextClass tclass = params.getLyXTextClass();
+               CharStyles::iterator found_cs = tclass.charstyle(s);
+               if (found_cs != tclass.charstyles().end())
+                       return new InsetCharStyle(params, found_cs);
+               else
+                       return new InsetCharStyle(params, s);
        }
 
        case LFUN_INSERT_NOTE: {
@@ -157,40 +160,28 @@ InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
                        bv->getLyXText()->getStringToIndex(bv->cursor()) :
                        cmd.argument;
                icp.setContents(contents);
-
-               string data = InsetCommandMailer::params2string("index", icp);
-               LyXView * lv = bv->owner();
-
-               if (icp.getContents().empty()) {
-                       lv->getDialogs().show("index", data, 0);
-               } else {
-                       lv->dispatch(FuncRequest(LFUN_INSET_APPLY, data));
-               }
-               return 0;
+               return new InsetIndex(icp);
        }
 
-       case LFUN_TABULAR_INSERT:
-               if (!cmd.argument.empty()) {
-                       std::istringstream ss(cmd.argument);
-                       int r = 0, c = 0;
-                       ss >> r >> c;
-                       if (r <= 0) r = 2;
-                       if (c <= 0) c = 2;
-                       return new InsetTabular(*bv->buffer(), r, c);
-               }
-               bv->owner()->getDialogs().show("tabularcreate");
-               return 0;
+       case LFUN_TABULAR_INSERT: {
+               if (cmd.argument.empty()) 
+                       return 0;
+               std::istringstream ss(cmd.argument);
+               int r = 0, c = 0;
+               ss >> r >> c;
+               if (r <= 0)
+                       r = 2;
+               if (c <= 0)
+                       c = 2;
+               return new InsetTabular(*bv->buffer(), r, c);
+       }
 
        case LFUN_INSET_CAPTION: {
-               UpdatableInset * up = bv->cursor().inset().asUpdatableInset();
-               if (!up) {
-                       auto_ptr<InsetCaption> inset(new InsetCaption(params));
-                       inset->setAutoBreakRows(true);
-                       inset->setDrawFrame(InsetText::LOCKED);
-                       inset->setFrameColor(LColor::captionframe);
-                       return inset.release();
-               }
-               return 0;
+               auto_ptr<InsetCaption> inset(new InsetCaption(params));
+               inset->setAutoBreakRows(true);
+               inset->setDrawFrame(true);
+               inset->setFrameColor(LColor::captionframe);
+               return inset.release();
        }
 
        case LFUN_INDEX_PRINT:
@@ -416,7 +407,12 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
                        lex.next();
                        string s = lex.getString();
                        CharStyles::iterator found_cs = tclass.charstyle(s);
-                       inset.reset(new InsetCharStyle(buf.params(), found_cs));
+                       if (found_cs != tclass.charstyles().end())
+                               inset.reset(new InsetCharStyle(buf.params(), found_cs));
+                       else {
+                               // "Undefined" inset
+                               inset.reset(new InsetCharStyle(buf.params(), s));
+                       }
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
                                                    InsetBranchParams()));
@@ -478,7 +474,10 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
                                static_cast<MathMacroTemplate*>(inset.get());
                        MacroTable::globalMacros().insert
                                (tmpl->name(), tmpl->asMacroData());
-                       lyxerr << "creating local macro " << tmpl->name() << endl;
+                       lyxerr[Debug::DEBUG]
+                                << BOOST_CURRENT_FUNCTION
+                                << ": creating local macro " << tmpl->name()
+                                << endl;
                }
        }