X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.cpp;h=4f6cb089a8518fec998e838c1e0dc6d55e5831d0;hb=24fe5b08c0e1dfb739738acb6fc995da7315d35f;hp=609abcf7937d12877ce4dd3a40fcad395292da7b;hpb=f9b81e51e943bcaac885d74edbce41a9d74ad3dd;p=lyx.git

diff --git a/src/factory.cpp b/src/factory.cpp
index 609abcf793..4f6cb089a8 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -25,7 +25,6 @@
 #include "insets/InsetCaption.h"
 #include "insets/InsetCitation.h"
 #include "insets/InsetFlex.h"
-#include "insets/InsetEnvironment.h"
 #include "insets/InsetERT.h"
 #include "insets/InsetListings.h"
 #include "insets/InsetExternal.h"
@@ -64,7 +63,7 @@
 #include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <sstream>
 
@@ -103,7 +102,7 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 
 		case LFUN_FLEX_INSERT: {
 			string s = cmd.getArg(0);
-			return new InsetFlex(buf, buf.params().documentClassPtr(), s);
+			return new InsetFlex(buf, s);
 		}
 
 		case LFUN_NOTE_INSERT: {
@@ -142,9 +141,6 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 		case LFUN_OPTIONAL_INSERT:
 			return new InsetOptArg(buf);
 
-		case LFUN_BIBITEM_INSERT:
-			return new InsetBibitem(InsetCommandParams(BIBITEM_CODE));
-
 		case LFUN_FLOAT_INSERT: {
 			// check if the float type exists
 			string const argument = to_utf8(cmd.argument());
@@ -207,11 +203,11 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 		case LFUN_TOC_INSERT:
 			return new InsetTOC(InsetCommandParams(TOC_CODE));
 
-		case LFUN_ENVIRONMENT_INSERT:
-			return new InsetEnvironment(buf, cmd.argument());
-
-		case LFUN_INFO_INSERT:
-			return new InsetInfo(buf, to_utf8(cmd.argument()));
+		case LFUN_INFO_INSERT: {
+			InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument()));
+			inset->updateInfo();
+			return inset;
+		}
 
 		case LFUN_INSET_INSERT: {
 			string const name = cmd.getArg(0);
@@ -224,13 +220,13 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 			case BIBITEM_CODE: {
 				InsetCommandParams icp(code);
 				InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
-				return new InsetBibitem(icp);
+				return new InsetBibitem(buf, icp);
 			}
 			
 			case BIBTEX_CODE: {
 				InsetCommandParams icp(code);
 				InsetCommand::string2params(name, to_utf8(cmd.argument()), icp);
-				return new InsetBibtex(icp);
+				return new InsetBibtex(buf, icp);
 			}
 			
 			case CITE_CODE: {
@@ -240,9 +236,8 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 			}
 			
 			case ERT_CODE: {
-				InsetCollapsable::CollapseStatus st;
-				InsetERT::string2params(to_utf8(cmd.argument()), st);
-				return new InsetERT(buf, st);
+				return new InsetERT(buf,
+					InsetERT::string2params(to_utf8(cmd.argument())));
 			}
 				
 			case LISTINGS_CODE: {
@@ -393,7 +388,7 @@ Inset * createInsetHelper(Buffer & buf, FuncRequest const & cmd)
 		if (message.type_ == ErrorException) {
 			// This should never happen!
 			Alert::error(message.title_, message.details_);
-			LyX::cref().exit(1);
+			lyx_exit(1);
 		} else if (message.type_ == WarningException) {
 			Alert::warning(message.title_, message.details_);
 			return 0;
@@ -421,8 +416,8 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 
 	auto_ptr<Inset> inset;
 
-	lex.next();
-	string tmptok = lex.getString();
+	string tmptok;
+	lex >> tmptok;
 
 	// test the different insets
 	
@@ -449,10 +444,10 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 
 		switch (code) {
 			case BIBITEM_CODE:
-				inset.reset(new InsetBibitem(inscmd));
+				inset.reset(new InsetBibitem(buf, inscmd));
 				break;
 			case BIBTEX_CODE:
-				inset.reset(new InsetBibtex(inscmd));
+				inset.reset(new InsetBibtex(buf, inscmd));
 				break;
 			case CITE_CODE: 
 				inset.reset(new InsetCitation(inscmd));
@@ -476,8 +471,9 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 				inset.reset(new InsetPrintNomencl(inscmd));
 				break;
 			case REF_CODE:
-				if (!inscmd["name"].empty() || !inscmd["reference"].empty())
-					inset.reset(new InsetRef(buf, inscmd));
+				if (inscmd["name"].empty() && inscmd["reference"].empty())
+					return 0;
+				inset.reset(new InsetRef(buf, inscmd));
 				break;
 			case TOC_CODE:
 				inset.reset(new InsetTOC(inscmd));
@@ -499,7 +495,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 		// can be translated to inset codes using insetCode(). And the insets'
 		// write() routines should use insetName() rather than hardcoding it.
 		if (tmptok == "Quotes") {
-			inset.reset(new InsetQuotes);
+			inset.reset(new InsetQuotes(buf));
 		} else if (tmptok == "External") {
 			inset.reset(new InsetExternal(const_cast<Buffer &>(buf)));
 		} else if (tmptok == "FormulaMacro") {
@@ -515,22 +511,17 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 		} else if (tmptok == "Flex") {
 			lex.next();
 			string s = lex.getString();
-			inset.reset(new InsetFlex(buf, 
-				buf.params().documentClassPtr(), s));
+			inset.reset(new InsetFlex(buf, s));
 		} else if (tmptok == "Branch") {
-			inset.reset(new InsetBranch(buf,
-						    InsetBranchParams()));
-		} else if (tmptok == "Environment") {
-			lex.next();
-			inset.reset(new InsetEnvironment(buf, lex.getDocString()));
+			inset.reset(new InsetBranch(buf, InsetBranchParams()));
 		} else if (tmptok == "ERT") {
 			inset.reset(new InsetERT(buf));
 		} else if (tmptok == "listings") {
 			inset.reset(new InsetListings(buf));
-		} else if (tmptok == "Space") {
+		} else if (tmptok == "space") {
 			inset.reset(new InsetSpace);
 		} else if (tmptok == "Tabular") {
-			inset.reset(new InsetTabular(buf));
+			inset.reset(new InsetTabular(const_cast<Buffer &>(buf)));
 		} else if (tmptok == "Text") {
 			inset.reset(new InsetText(buf));
 		} else if (tmptok == "VSpace") {
@@ -553,10 +544,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 			lex.next();
 			string tmptok = lex.getString();
 			inset.reset(new InsetWrap(buf, tmptok));
-#if 0
-		} else if (tmptok == "Theorem") {
-			inset.reset(new InsetList);
-#endif
 		} else if (tmptok == "Caption") {
 			inset.reset(new InsetCaption(buf));
 		} else if (tmptok == "Index") {