A GUI for nomencl settings. Adds the possibility to enter a custom length.

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index e390b228c81e6f1e2d2a612983b1481dd53e45e7..85c84d9b945ea09d6d504394af7405dbcecba121 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -22,6 +22,8 @@
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
+#include "insets/InsetBox.h"
+#include "insets/InsetBranch.h"
 #include "insets/InsetCaption.h"
 #include "insets/InsetCitation.h"
 #include "insets/InsetFlex.h"
@@ -32,26 +34,23 @@
 #include "insets/InsetFloatList.h"
 #include "insets/InsetFoot.h"
 #include "insets/InsetGraphics.h"
+#include "insets/InsetHyperlink.h"
 #include "insets/InsetInclude.h"
 #include "insets/InsetIndex.h"
 #include "insets/InsetInfo.h"
-#include "insets/InsetNomencl.h"
 #include "insets/InsetLabel.h"
 #include "insets/InsetLine.h"
 #include "insets/InsetMarginal.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetNewpage.h"
+#include "insets/InsetNomencl.h"
 #include "insets/InsetNote.h"
-#include "insets/InsetBox.h"
-#include "insets/InsetBranch.h"
-#include "insets/InsetPhantom.h"
 #include "insets/InsetOptArg.h"
-#include "insets/InsetNewpage.h"
+#include "insets/InsetPhantom.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetTOC.h"
-#include "insets/InsetHyperlink.h"
 #include "insets/InsetVSpace.h"
 #include "insets/InsetWrap.h"
 
@@ -177,8 +176,10 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
                        return 0;
                }
 
-               case LFUN_INDEX_INSERT:
-                       return new InsetIndex(buf);
+               case LFUN_INDEX_INSERT: {
+                       docstring arg = cmd.argument();
+                       return new InsetIndex(buf, InsetIndexParams(arg));
+               }
 
                case LFUN_NOMENCL_INSERT: {
                        InsetCommandParams icp(NOMENCL_CODE);
@@ -202,11 +203,17 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
                case LFUN_CAPTION_INSERT:
                        return new InsetCaption(buf);
 
-               case LFUN_INDEX_PRINT:
-                       return new InsetPrintIndex(InsetCommandParams(INDEX_PRINT_CODE));
+               case LFUN_INDEX_PRINT:  {
+                       InsetCommandParams icp(INDEX_PRINT_CODE);
+                       icp["type"] = cmd.argument();
+                       return new InsetPrintIndex(icp);
+               }
 
-               case LFUN_NOMENCL_PRINT:
-                       return new InsetPrintNomencl(InsetCommandParams(NOMENCL_PRINT_CODE));
+               case LFUN_NOMENCL_PRINT: {
+                       InsetCommandParams icp(NOMENCL_PRINT_CODE);
+                       icp["set_width"] = from_ascii("auto");
+                       return new InsetPrintNomencl(icp);
+               }
 
                case LFUN_TOC_INSERT:
                        return new InsetTOC(InsetCommandParams(TOC_CODE));
@@ -283,12 +290,20 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
                                return new InsetInclude(icp);
                        }
                        
-                       case INDEX_CODE:
-                               return new InsetIndex(buf);
+                       case INDEX_CODE: {
+                               docstring arg = cmd.argument();
+                               return new InsetIndex(buf, InsetIndexParams(arg));
+                       }
+                       
+                       case INDEX_PRINT_CODE:  {
+                               InsetCommandParams icp(code);
+                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
+                               return new InsetPrintIndex(icp);
+                       }
                        
                        case NOMENCL_CODE: {
                                InsetCommandParams icp(code);
-                               InsetCommand::string2params(name, lyx::to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
                                return new InsetNomencl(icp);
                        }
                        
@@ -566,7 +581,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                } else if (tmptok == "Caption") {
                        inset.reset(new InsetCaption(buf));
                } else if (tmptok == "Index") {
-                       inset.reset(new InsetIndex(buf));
+                       inset.reset(new InsetIndex(buf, InsetIndexParams()));
                } else if (tmptok == "FloatList") {
                        inset.reset(new InsetFloatList);
                } else if (tmptok == "Info") {