InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index bdad713932da2346b3b06ae605cc0a019c882712..63224671faafe0748650c59a0c8a87e3ddec4430 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -45,7 +45,7 @@
 #include "insets/InsetNewpage.h"
 #include "insets/InsetNomencl.h"
 #include "insets/InsetNote.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 #include "insets/InsetPhantom.h"
 #include "insets/InsetPreview.h"
 #include "insets/InsetRef.h"
@@ -80,10 +80,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 {
        try {
 
-               switch (cmd.action) {
-
-               case LFUN_LINE_INSERT:
-                       return new InsetLine;
+               switch (cmd.action()) {
 
                case LFUN_NEWPAGE_INSERT: {
                        string const name = cmd.getArg(0);
@@ -144,8 +141,8 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                case LFUN_MARGINALNOTE_INSERT:
                        return new InsetMarginal(buf);
 
-               case LFUN_OPTIONAL_INSERT:
-                       return new InsetOptArg(buf);
+               case LFUN_ARGUMENT_INSERT:
+                       return new InsetArgument(buf);
 
                case LFUN_FLOAT_INSERT:
                        return new InsetFloat(buf, to_utf8(cmd.argument()));
@@ -203,9 +200,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();
@@ -225,19 +219,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);
                        }
                        
@@ -245,12 +239,6 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                                return new InsetERT(buf,
                                        InsetERT::string2params(to_utf8(cmd.argument())));
                        }
-                               
-                       case LISTINGS_CODE: {
-                               InsetListingsParams par;
-                               InsetListings::string2params(to_utf8(cmd.argument()), par);
-                               return new InsetListings(buf, par);
-                       }
                        
                        case EXTERNAL_CODE: {
                                InsetExternalParams iep;
@@ -271,13 +259,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);
                        }
                        
@@ -288,25 +276,37 @@ 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 NOMENCL_CODE: {
+                       case LABEL_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
-                               return new InsetNomencl(buf, icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
+                               return new InsetLabel(buf, icp);
                        }
                        
-                       case LABEL_CODE: {
+                       case LINE_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
-                               return new InsetLabel(buf, icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
+                               return new InsetLine(buf, icp);
+                       }
+                               
+                       case LISTINGS_CODE: {
+                               InsetListingsParams par;
+                               InsetListings::string2params(to_utf8(cmd.argument()), par);
+                               return new InsetListings(buf, par);
+                       }
+                       
+                       case NOMENCL_CODE: {
+                               InsetCommandParams icp(code);
+                               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);
                        }
 
@@ -318,7 +318,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 +490,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;
@@ -562,8 +565,8 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        inset.reset(new InsetNewpage);
                } else if (tmptok == "Newline") {
                        inset.reset(new InsetNewline);
-               } else if (tmptok == "OptArg") {
-                       inset.reset(new InsetOptArg(buf));
+               } else if (tmptok == "Argument") {
+                       inset.reset(new InsetArgument(buf));
                } else if (tmptok == "Float") {
                        inset.reset(new InsetFloat(buf, string()));
                } else if (tmptok == "Wrap") {