Fix tab order for crossref dialog.

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 6df3d268ca959ca2945a2a772f2cfed17dcfd679..bdae9a01f9f660d5e555f89e2e980157f4a5f645 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -49,6 +49,7 @@
 #include "insets/InsetPhantom.h"
 #include "insets/InsetPreview.h"
 #include "insets/InsetRef.h"
+#include "insets/InsetScript.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetTOC.h"
@@ -82,9 +83,6 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 
                switch (cmd.action()) {
 
-               case LFUN_LINE_INSERT:
-                       return new InsetLine;
-
                case LFUN_NEWPAGE_INSERT: {
                        string const name = cmd.getArg(0);
                        InsetNewpageParams inp;
@@ -147,11 +145,28 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                case LFUN_ARGUMENT_INSERT:
                        return new InsetArgument(buf);
 
-               case LFUN_FLOAT_INSERT:
-                       return new InsetFloat(buf, to_utf8(cmd.argument()));
+               case LFUN_FLOAT_INSERT: {
+                       string argument = to_utf8(cmd.argument());
+                       if (!argument.empty()) {
+                               if (!contains(argument, "sideways")) {
+                                       if (!contains(argument, "wide"))
+                                               argument += "\nwide false";
+                                       argument += "\nsideways false";
+                               }
+                       }
+                       return new InsetFloat(buf, argument);
+               }
 
                case LFUN_FLOAT_WIDE_INSERT: {
-                       InsetFloat * fl = new InsetFloat(buf, to_utf8(cmd.argument()));
+                       string argument = to_utf8(cmd.argument());
+                       if (!argument.empty()) {
+                               if (!contains(argument, "sideways")) {
+                                       if (!contains(argument, "wide"))
+                                               argument += "\nwide true";
+                                       argument += "\nsideways false";
+                               }
+                       }
+                       InsetFloat * fl = new InsetFloat(buf, argument);
                        fl->setWide(true);
                        return fl;
                }
@@ -203,9 +218,6 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        return new InsetPrintNomencl(buf, icp);
                }
 
-               case LFUN_TOC_INSERT:
-                       return new InsetTOC(buf, InsetCommandParams(TOC_CODE));
-
                case LFUN_INFO_INSERT: {
                        InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument()));
                        inset->updateInfo();
@@ -215,6 +227,12 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                case LFUN_PREVIEW_INSERT:
                        return new InsetPreview(buf);
 
+               case LFUN_SCRIPT_INSERT: {
+                       InsetScriptParams isp;
+                       InsetScript::string2params("script script " + to_utf8(cmd.argument()), isp);
+                       return new InsetScript(buf, isp);
+               }
+
                case LFUN_INSET_INSERT: {
                        string const name = cmd.getArg(0);
                        InsetCode code = insetCode(name);
@@ -225,19 +243,19 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        
                        case BIBITEM_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetBibitem(buf, icp);
                        }
                        
                        case BIBTEX_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetBibtex(buf, icp);
                        }
                        
                        case CITE_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetCitation(buf, icp);
                        }
                        
@@ -265,13 +283,13 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        
                        case HYPERLINK_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetHyperlink(buf, icp);
                        }
                        
                        case INCLUDE_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetInclude(buf, icp);
                        }
                        
@@ -282,16 +300,22 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        
                        case INDEX_PRINT_CODE:  {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetPrintIndex(buf, icp);
                        }
                        
                        case LABEL_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetLabel(buf, icp);
                        }
                        
+                       case LINE_CODE: {
+                               InsetCommandParams icp(code);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
+                               return new InsetLine(buf, icp);
+                       }
+                               
                        case LISTINGS_CODE: {
                                InsetListingsParams par;
                                InsetListings::string2params(to_utf8(cmd.argument()), par);
@@ -300,16 +324,22 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        
                        case NOMENCL_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetNomencl(buf, icp);
                        }
                        
                        case REF_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetRef(buf, icp);
                        }
 
+                       case SCRIPT_CODE: {
+                               InsetScriptParams isp;
+                               InsetScript::string2params(to_utf8(cmd.argument()), isp);
+                               return new InsetScript(buf, isp);
+                       }
+
                        case SPACE_CODE: {
                                InsetSpaceParams isp;
                                InsetSpace::string2params(to_utf8(cmd.argument()), isp);
@@ -318,7 +348,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        
                        case TOC_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetTOC(buf, icp);
                        }
                        
@@ -490,6 +520,9 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        case LABEL_CODE:
                                inset.reset(new InsetLabel(buf, inscmd));
                                break;
+                       case LINE_CODE:
+                               inset.reset(new InsetLine(buf, inscmd));
+                               break;
                        case NOMENCL_CODE:
                                inset.reset(new InsetNomencl(buf, inscmd));
                                break;
@@ -546,6 +579,8 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        inset.reset(new InsetERT(buf));
                } else if (tmptok == "listings") {
                        inset.reset(new InsetListings(buf));
+               } else if (tmptok == "script") {
+                       inset.reset(new InsetScript(buf));
                } else if (tmptok == "space") {
                        inset.reset(new InsetSpace);
                } else if (tmptok == "Tabular") {