Ignore ligature breaks and hyphenations during simple search (fixes #1468).

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 7fa0c55dce7f0b1751012bdc4dc9a3e86c44bdf5..d763e52f5becb22227881dd8c4b3e52e61f41672 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"
@@ -219,19 +220,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);
                        }
                        
@@ -259,13 +260,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);
                        }
                        
@@ -276,19 +277,19 @@ 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(name, to_utf8(cmd.argument()), icp);
+                               InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetLine(buf, icp);
                        }
                                
@@ -300,16 +301,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 +325,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);
                        }
                        
@@ -549,6 +556,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") {