More 'standard conformant blurb' nonsense.

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index ad09f2151730a625adbe6de46a2a0f58fd018c0b..d89d4aa86d5bb88ba2f1f9c85e1026b509e5e73c 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -37,6 +37,7 @@
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetnote.h"
+#include "insets/insetbranch.h"
 #include "insets/insetoptarg.h"
 #include "insets/insetref.h"
 #include "insets/insetspace.h"
@@ -71,7 +72,19 @@ InsetOld * createInset(FuncRequest const & cmd)
                return new InsetMinipage(params);
 
        case LFUN_INSERT_NOTE:
-               return new InsetNote(params, "Note");
+               {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty())
+                               arg = "Note";
+                       return new InsetNote(params, arg);
+               }
+       case LFUN_INSERT_BRANCH:
+               {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty())
+                               arg = "none";
+                       return new InsetBranch(params, arg);
+               }
 
        case LFUN_INSET_ERT:
                return new InsetERT(params);
@@ -124,8 +137,7 @@ InsetOld * createInset(FuncRequest const & cmd)
                if (icp.getContents().empty()) {
                        lv->getDialogs().show("index", data, 0);
                } else {
-                       FuncRequest fr(bv, LFUN_INSET_APPLY, data);
-                       lv->dispatch(fr);
+                       lv->dispatch(FuncRequest(bv, LFUN_INSET_APPLY, data));
                }
                return 0;
        }
@@ -147,8 +159,8 @@ InsetOld * createInset(FuncRequest const & cmd)
                        InsetCaption * inset = new InsetCaption(params);
                        inset->setOwner(bv->theLockingInset());
                        inset->setAutoBreakRows(true);
-                       inset->setDrawFrame(0, InsetText::LOCKED);
-                       inset->setFrameColor(0, LColor::captionframe);
+                       inset->setDrawFrame(InsetText::LOCKED);
+                       inset->setFrameColor(LColor::captionframe);
                        return inset;
                }
                return 0;
@@ -354,6 +366,8 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                } else if (tmptok == "Note"     || tmptok == "Comment"
                                || tmptok == "Greyedout") {
                        inset = new InsetNote(buf.params, tmptok);
+               } else if (tmptok == "Branch") {
+                       inset = new InsetBranch(buf.params, tmptok); 
                } else if (tmptok == "Include") {
                        InsetCommandParams p("Include");
                        inset = new InsetInclude(p, buf);