X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.cpp;h=b8d94336b9f74294f14d61161e360294a9251d23;hb=7855c0c1fc98b154768d3014883873387bd64c95;hp=e25a2630490b1598042ec1c890f750d24ed2bae1;hpb=6b2232a29c682d8e62d1d2b963bb1a70bee4330b;p=lyx.git

diff --git a/src/factory.cpp b/src/factory.cpp
index e25a263049..b8d94336b9 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -52,6 +52,7 @@
 #include "insets/InsetPreview.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetScript.h"
+#include "insets/InsetSeparator.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetTOC.h"
@@ -99,6 +100,22 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 			return new InsetNewpage(inp);
 		}
 
+		case LFUN_SEPARATOR_INSERT: {
+			string const name = cmd.getArg(0);
+			InsetSeparatorParams inp;
+			if (name.empty() || name == "plain")
+				inp.kind = InsetSeparatorParams::PLAIN;
+			else if (name == "parbreak")
+				inp.kind = InsetSeparatorParams::PARBREAK;
+			else if (name == "latexpar")
+				inp.kind = InsetSeparatorParams::LATEXPAR;
+			else {
+				lyxerr << "Wrong argument for LyX function 'separator-insert'." << endl;
+				break;
+			}
+			return new InsetSeparator(inp);
+		}
+
 		case LFUN_FLEX_INSERT: {
 			string s = cmd.getArg(0);
 			return new InsetFlex(buf, s);
@@ -154,8 +171,14 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 		case LFUN_MARGINALNOTE_INSERT:
 			return new InsetMarginal(buf);
 
-		case LFUN_ARGUMENT_INSERT:
-			return new InsetArgument(buf);
+		case LFUN_ARGUMENT_INSERT: {
+			string arg = cmd.getArg(0);
+			if (arg.empty()) {
+				LYXERR0("argument-insert needs an argument!");
+				return 0;
+			}
+			return new InsetArgument(buf, arg);
+		}
 
 		case LFUN_FLOAT_INSERT: {
 			string argument = to_utf8(cmd.argument());
@@ -218,8 +241,12 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 			return new InsetTabular(buf, r, c);
 		}
 
-		case LFUN_CAPTION_INSERT:
-			return new InsetCaption(buf);
+		case LFUN_CAPTION_INSERT: {
+			string arg = cmd.getArg(0);
+			if (arg.empty())
+				arg = "Standard";
+			return new InsetCaption(buf, arg);
+		}
 
 		case LFUN_INDEX_PRINT:  {
 			InsetCommandParams icp(INDEX_PRINT_CODE);
@@ -513,7 +540,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
 		//Worst case, we could put it in each case below. Better, we could
 		//pass the lexer to the constructor and let the params be built there.
 		InsetCommandParams inscmd(code);
-		inscmd.read(lex);
+		inscmd.Read(lex, buf);
 
 		switch (code) {
 			case BIBITEM_CODE:
@@ -617,8 +644,10 @@ Inset * readInset(Lexer & lex, Buffer * buf)
 			inset.reset(new InsetNewpage);
 		} else if (tmptok == "Newline") {
 			inset.reset(new InsetNewline);
+		} else if (tmptok == "Separator") {
+			inset.reset(new InsetSeparator);
 		} else if (tmptok == "Argument") {
-			inset.reset(new InsetArgument(buf));
+			inset.reset(new InsetArgument(buf, tmptok));
 		} else if (tmptok == "Float") {
 			inset.reset(new InsetFloat(buf, string()));
 		} else if (tmptok == "Wrap") {
@@ -626,7 +655,9 @@ Inset * readInset(Lexer & lex, Buffer * buf)
 			string tmptok = lex.getString();
 			inset.reset(new InsetWrap(buf, tmptok));
 		} else if (tmptok == "Caption") {
-			inset.reset(new InsetCaption(buf));
+			lex.eatLine();
+			string s = lex.getString();
+			inset.reset(new InsetCaption(buf, s));
 		} else if (tmptok == "Index") {
 			inset.reset(new InsetIndex(buf, InsetIndexParams()));
 		} else if (tmptok == "FloatList") {