X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.cpp;h=f17b91dd49c6a81dc95b94a5225b232e6c3fe382;hb=f1f63fcad0a5512dc277fd8e401ac6cd5736c699;hp=3f1bf64267751f86f29a90e465667d2fed1d0b2f;hpb=4c9f0eb5e6c835f5cf9cd0b0f5380b4b375d2f7c;p=lyx.git

diff --git a/src/factory.cpp b/src/factory.cpp
index 3f1bf64267..f17b91dd49 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -38,6 +38,7 @@
 #include "insets/InsetInclude.h"
 #include "insets/InsetIndex.h"
 #include "insets/InsetInfo.h"
+#include "insets/InsetIPA.h"
 #include "insets/InsetLabel.h"
 #include "insets/InsetLine.h"
 #include "insets/InsetMarginal.h"
@@ -45,9 +46,11 @@
 #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"
+#include "insets/InsetScript.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetTOC.h"
@@ -79,10 +82,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);
@@ -143,14 +143,31 @@ 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()));
+		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;
 		}
@@ -168,6 +185,9 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 			return new InsetIndex(buf, InsetIndexParams(arg));
 		}
 
+		case LFUN_IPA_INSERT:
+			return new InsetIPA(buf);
+
 		case LFUN_NOMENCL_INSERT: {
 			InsetCommandParams icp(NOMENCL_CODE);
 			icp["symbol"] = cmd.argument();
@@ -202,15 +222,21 @@ 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();
 			return inset;
 		}
 
+		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);
@@ -221,19 +247,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);
 			}
 			
@@ -241,12 +267,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;
@@ -267,13 +287,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);
 			}
 			
@@ -284,28 +304,46 @@ 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);
 			}
 
+			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);
@@ -314,7 +352,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);
 			}
 			
@@ -323,6 +361,9 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 				InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
 				return new InsetVSpace(vspace);
 			}
+
+			case PREVIEW_CODE:
+				return new InsetPreview(buf);
 			
 			default:
 				lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT."
@@ -345,6 +386,8 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 				isp.kind = InsetSpaceParams::NORMAL;
 			else if (name == "protected")
 				isp.kind = InsetSpaceParams::PROTECTED;
+			else if (name == "visible")
+				isp.kind = InsetSpaceParams::VISIBLE;
 			else if (name == "thin")
 				isp.kind = InsetSpaceParams::THIN;
 			else if (isp.math && name == "med")
@@ -361,9 +404,9 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 				isp.kind = InsetSpaceParams::ENSKIP;
 			else if (name == "negthinspace")
 				isp.kind = InsetSpaceParams::NEGTHIN;
-			else if (isp.math && name == "negmedspace")
+			else if (name == "negmedspace")
 				isp.kind = InsetSpaceParams::NEGMEDIUM;
-			else if (isp.math && name == "negthickspace")
+			else if (name == "negthickspace")
 				isp.kind = InsetSpaceParams::NEGTHICK;
 			else if (name == "hfill")
 				isp.kind = InsetSpaceParams::HFILL;
@@ -483,6 +526,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;
@@ -539,6 +585,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") {
@@ -555,8 +603,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") {
@@ -571,6 +619,10 @@ Inset * readInset(Lexer & lex, Buffer * buf)
 			inset.reset(new InsetFloatList(buf));
 		} else if (tmptok == "Info") {
 			inset.reset(new InsetInfo(buf));
+		} else if (tmptok == "IPA") {
+			inset.reset(new InsetIPA(buf));
+		} else if (tmptok == "Preview") {
+			inset.reset(new InsetPreview(buf));
 		} else {
 			lyxerr << "unknown Inset type '" << tmptok
 			       << "'" << endl;