X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.C;h=42a61848c4bfdfc1eae7c422c0342784c4edf7b1;hb=de3c8e5b80effa940c92980032389c868f377d6b;hp=0c737dcb96cc2d12e980de3ffb28cdbf62cb2491;hpb=86e2d69f18bedbdd11a01e6aa3886cdc7d259060;p=lyx.git

diff --git a/src/factory.C b/src/factory.C
index 0c737dcb96..42a61848c4 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -5,64 +5,116 @@
  *
  * \author André Pönitz
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "funcrequest.h"
-#include "bufferparams.h"
+#include "factory.h"
+
 #include "buffer.h"
-#include "FloatList.h"
-#include "debug.h"
 #include "BufferView.h"
-#include "lyxtext.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "FloatList.h"
+#include "funcrequest.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "paragraph.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetbibtex.h"
 #include "insets/insetcaption.h"
 #include "insets/insetcite.h"
+#include "insets/insetcharstyle.h"
+#include "insets/insetenv.h"
 #include "insets/insetert.h"
 #include "insets/insetexternal.h"
 #include "insets/insetfloat.h"
+#include "insets/insetfloatlist.h"
 #include "insets/insetfoot.h"
+#include "insets/insetgraphics.h"
+#include "insets/insethfill.h"
+#include "insets/insetinclude.h"
 #include "insets/insetindex.h"
+#include "insets/insetlabel.h"
+#include "insets/insetline.h"
 #include "insets/insetmarginal.h"
-#include "insets/insetminipage.h"
 #include "insets/insetnote.h"
+#include "insets/insetbox.h"
+#include "insets/insetbranch.h"
 #include "insets/insetoptarg.h"
-#include "insets/insetparent.h"
+#include "insets/insetpagebreak.h"
 #include "insets/insetref.h"
+#include "insets/insetspace.h"
 #include "insets/insettabular.h"
-#include "insets/insettext.h"
 #include "insets/insettoc.h"
 #include "insets/inseturl.h"
+#include "insets/insetvspace.h"
 #include "insets/insetwrap.h"
+
+#include "mathed/math_macrotemplate.h"
+#include "mathed/math_hullinset.h"
+
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
-#include <cstdio>
+#include "support/lstrings.h"
+#include "support/std_sstream.h"
+
+#include <boost/assert.hpp>
 
+using lyx::support::compare_ascii_no_case;
+
+using std::auto_ptr;
 using std::endl;
+using std::string;
+
 
-Inset * createInset(FuncRequest const & cmd)
+InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
 {
-	BufferView * bv = cmd.view();
-	BufferParams const & params = bv->buffer()->params;
+	BufferParams const & params = bv->buffer()->params();
 
 	switch (cmd.action) {
-	case LFUN_INSET_MINIPAGE:
-		return new InsetMinipage(params);
+	case LFUN_HFILL:
+		return new InsetHFill;
+
+	case LFUN_INSERT_LINE:
+		return new InsetLine;
+
+	case LFUN_INSERT_PAGEBREAK:
+		return new InsetPagebreak;
+
+	case LFUN_INSERT_CHARSTYLE: {
+		string s = cmd.getArg(0);
+		CharStyles::iterator found_cs = params.getLyXTextClass().charstyle(s);
+		return new InsetCharStyle(params, found_cs);
+	}
 
-	case LFUN_INSERT_NOTE:
-		return new InsetNote(params);
+	case LFUN_INSERT_NOTE: {
+		string arg = cmd.getArg(0);
+		if (arg.empty())
+			arg = "Note";
+		return new InsetNote(params, arg);
+	}
+
+	case LFUN_INSERT_BOX: {
+		string arg = cmd.getArg(0);
+		if (arg.empty())
+			arg = "Boxed";
+		return new InsetBox(params, arg);
+	}
+
+	case LFUN_INSERT_BRANCH: {
+		string arg = cmd.getArg(0);
+		if (arg.empty())
+			arg = "none";
+		return new InsetBranch(params, InsetBranchParams(arg));
+	}
 
 	case LFUN_INSET_ERT:
 		return new InsetERT(params);
 
-	case LFUN_INSET_EXTERNAL:
-		return new InsetExternal;
-
 	case LFUN_INSET_FOOTNOTE:
 		return new InsetFoot(params);
 
@@ -85,8 +137,9 @@ Inset * createInset(FuncRequest const & cmd)
 	case LFUN_INSET_WIDE_FLOAT:
 		// check if the float type exists
 		if (params.getLyXTextClass().floats().typeExist(cmd.argument)) {
-			InsetFloat * p = new InsetFloat(params, cmd.argument);
+			auto_ptr<InsetFloat> p(new InsetFloat(params, cmd.argument));
 			p->wide(true, params);
+			return p.release();
 		}
 		lyxerr << "Non-existent float type: " << cmd.argument << endl;
 		return 0;
@@ -101,44 +154,44 @@ Inset * createInset(FuncRequest const & cmd)
 		// Try and generate a valid index entry.
 		InsetCommandParams icp("index");
 		string const contents = cmd.argument.empty() ?
-			bv->getLyXText()->getStringToIndex(bv) :
+			bv->getLyXText()->getStringToIndex(bv->cursor()) :
 			cmd.argument;
 		icp.setContents(contents);
 
-		string data = InsetCommandMailer::params2string(icp);
+		string data = InsetCommandMailer::params2string("index", icp);
 		LyXView * lv = bv->owner();
 
 		if (icp.getContents().empty()) {
 			lv->getDialogs().show("index", data, 0);
 		} else {
-			FuncRequest fr(bv, LFUN_INDEX_APPLY, data);
-			lv->dispatch(fr);
+			lv->dispatch(FuncRequest(LFUN_INSET_APPLY, data));
 		}
 		return 0;
 	}
 
 	case LFUN_TABULAR_INSERT:
 		if (!cmd.argument.empty()) {
-			int r = 2;
-			int c = 2;
-			::sscanf(cmd.argument.c_str(),"%d%d", &r, &c);
+			std::istringstream ss(cmd.argument);
+			int r = 0, c = 0;
+			ss >> r >> c;
+			if (r <= 0) r = 2;
+			if (c <= 0) c = 2;
 			return new InsetTabular(*bv->buffer(), r, c);
 		}
-		bv->owner()->getDialogs().showTabularCreate();
+		bv->owner()->getDialogs().show("tabularcreate");
 		return 0;
 
-	case LFUN_INSET_CAPTION:
-		if (bv->theLockingInset()) {
-			lyxerr << "Locking inset code: "
-			       << static_cast<int>(bv->theLockingInset()->lyxCode());
-			InsetCaption * inset = new InsetCaption(params);
-			inset->setOwner(bv->theLockingInset());
+	case LFUN_INSET_CAPTION: {
+		UpdatableInset * up = bv->cursor().inset().asUpdatableInset();
+		if (!up) {
+			auto_ptr<InsetCaption> inset(new InsetCaption(params));
 			inset->setAutoBreakRows(true);
-			inset->setDrawFrame(0, InsetText::LOCKED);
-			inset->setFrameColor(0, LColor::captionframe);
-			return inset;
+			inset->setDrawFrame(InsetText::LOCKED);
+			inset->setFrameColor(LColor::captionframe);
+			return inset.release();
 		}
 		return 0;
+	}
 
 	case LFUN_INDEX_PRINT:
 		return new InsetPrintIndex(InsetCommandParams("printindex"));
@@ -146,16 +199,8 @@ Inset * createInset(FuncRequest const & cmd)
 	case LFUN_TOC_INSERT:
 		return new InsetTOC(InsetCommandParams("tableofcontents"));
 
-	case LFUN_PARENTINSERT:
-		return new InsetParent(
-			InsetCommandParams("lyxparent", cmd.argument), *bv->buffer());
-
-	case LFUN_INSERT_URL:
-	{
-		InsetCommandParams p;
-		p.setFromString(cmd.argument);
-		return new InsetUrl(p);
-	}
+	case LFUN_ENVIRONMENT_INSERT:
+		return new InsetEnvironment(params, cmd.argument);
 
 #if 0
 	case LFUN_INSET_LIST:
@@ -165,61 +210,275 @@ Inset * createInset(FuncRequest const & cmd)
 		return new InsetTheorem;
 #endif
 
-	case LFUN_BIBITEM_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetBibitem(icp);
+	case LFUN_INSET_INSERT: {
+		string const name = cmd.getArg(0);
+
+		if (name == "bibitem") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetBibitem(icp);
+
+		} else if (name == "bibtex") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetBibtex(icp);
+
+		} else if (name == "citation") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetCitation(icp);
+
+		} else if (name == "ert") {
+			InsetCollapsable::CollapseStatus st;
+			InsetERTMailer::string2params(cmd.argument, st);
+			return new InsetERT(params, st);
+
+		} else if (name == "external") {
+			Buffer const & buffer = *bv->buffer();
+			InsetExternalParams iep;
+			InsetExternalMailer::string2params(cmd.argument,
+							   buffer, iep);
+			auto_ptr<InsetExternal> inset(new InsetExternal);
+			inset->setParams(iep, buffer);
+			return inset.release();
+
+		} else if (name == "graphics") {
+			Buffer const & buffer = *bv->buffer();
+			InsetGraphicsParams igp;
+			InsetGraphicsMailer::string2params(cmd.argument,
+							   buffer, igp);
+			auto_ptr<InsetGraphics> inset(new InsetGraphics);
+			inset->setParams(igp);
+			return inset.release();
+
+		} else if (name == "include") {
+			InsetCommandParams iip;
+			InsetIncludeMailer::string2params(cmd.argument, iip);
+			return new InsetInclude(iip);
+
+		} else if (name == "index") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetIndex(icp);
+
+		} else if (name == "label") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetLabel(icp);
+
+		} else if (name == "ref") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetRef(icp, *bv->buffer());
+
+		} else if (name == "toc") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetTOC(icp);
+
+		} else if (name == "url") {
+			InsetCommandParams icp;
+			InsetCommandMailer::string2params(name, cmd.argument,
+							  icp);
+			return new InsetUrl(icp);
+
+		} else if (name == "vspace") {
+			VSpace vspace;
+			InsetVSpaceMailer::string2params(cmd.argument, vspace);
+			return new InsetVSpace(vspace);
+		}
 	}
 
-	case LFUN_BIBTEX_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetBibtex(icp);
+	case LFUN_SPACE_INSERT: {
+		string const name = cmd.argument;
+		if (name == "normal")
+			return new InsetSpace(InsetSpace::NORMAL);
+		else if (name == "protected")
+			return new InsetSpace(InsetSpace::PROTECTED);
+		else if (name == "thin")
+			return new InsetSpace(InsetSpace::THIN);
+		else if (name == "quad")
+			return new InsetSpace(InsetSpace::QUAD);
+		else if (name == "qquad")
+			return new InsetSpace(InsetSpace::QQUAD);
+		else if (name == "enspace")
+			return new InsetSpace(InsetSpace::ENSPACE);
+		else if (name == "enskip")
+			return new InsetSpace(InsetSpace::ENSKIP);
+		else if (name == "negthinspace")
+			return new InsetSpace(InsetSpace::NEGTHIN);
+		else if (name.empty())
+			lyxerr << "LyX function 'space' needs an argument." << endl;
+		else
+			lyxerr << "Wrong argument for LyX function 'space'." << endl;
 	}
 
-	case LFUN_CITATION_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		InsetCitation * inset = new InsetCitation(icp);
-		inset->setLoadingBuffer(bv->buffer(), false);
-		return inset;
-	}
+	break;
 
-	case LFUN_ERT_APPLY: {
-		InsetERT * inset = new InsetERT(params);
-		InsetERT::ERTStatus s;
-		InsetERTMailer::string2params(cmd.argument, s);
-		inset->status(bv, s);
-		return inset;
+	default:
+		break;
 	}
 
-	case LFUN_INDEX_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetIndex(icp);
-	}
+	return 0;
+}
 
-	case LFUN_REF_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetRef(icp, *bv->buffer());
-	}
 
-	case LFUN_TOC_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetTOC(icp);
+InsetBase * readInset(LyXLex & lex, Buffer const & buf)
+{
+	// consistency check
+	if (lex.getString() != "\\begin_inset") {
+		lyxerr << "Buffer::readInset: Consistency check failed."
+		       << endl;
 	}
 
-	case LFUN_URL_APPLY: {
-		InsetCommandParams icp;
-		InsetCommandMailer::string2params(cmd.argument, icp);
-		return new InsetUrl(icp);
-	}
+	auto_ptr<InsetBase> inset;
+
+	LyXTextClass tclass = buf.params().getLyXTextClass();
+
+	lex.next();
+	string tmptok = lex.getString();
+
+	// test the different insets
+	if (tmptok == "LatexCommand") {
+		InsetCommandParams inscmd;
+		inscmd.read(lex);
+
+		string const cmdName = inscmd.getCmdName();
+
+		// This strange command allows LyX to recognize "natbib" style
+		// citations: citet, citep, Citet etc.
+		if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
+			inset.reset(new InsetCitation(inscmd));
+		} else if (cmdName == "bibitem") {
+			lex.printError("Wrong place for bibitem");
+			inset.reset(new InsetBibitem(inscmd));
+		} else if (cmdName == "bibtex") {
+			inset.reset(new InsetBibtex(inscmd));
+		} else if (cmdName == "index") {
+			inset.reset(new InsetIndex(inscmd));
+		} else if (cmdName == "include") {
+			inset.reset(new InsetInclude(inscmd));
+		} else if (cmdName == "label") {
+			inset.reset(new InsetLabel(inscmd));
+		} else if (cmdName == "url"
+			   || cmdName == "htmlurl") {
+			inset.reset(new InsetUrl(inscmd));
+		} else if (cmdName == "ref"
+			   || cmdName == "eqref"
+			   || cmdName == "pageref"
+			   || cmdName == "vref"
+			   || cmdName == "vpageref"
+			   || cmdName == "prettyref") {
+			if (!inscmd.getOptions().empty()
+			    || !inscmd.getContents().empty()) {
+				inset.reset(new InsetRef(inscmd, buf));
+			}
+		} else if (cmdName == "tableofcontents") {
+			inset.reset(new InsetTOC(inscmd));
+		} else if (cmdName == "listofalgorithms") {
+			inset.reset(new InsetFloatList("algorithm"));
+		} else if (cmdName == "listoffigures") {
+			inset.reset(new InsetFloatList("figure"));
+		} else if (cmdName == "listoftables") {
+			inset.reset(new InsetFloatList("table"));
+		} else if (cmdName == "printindex") {
+			inset.reset(new InsetPrintIndex(inscmd));
+		} else {
+			lyxerr << "unknown CommandInset '" << cmdName
+			       << "'" << std::endl;
+			while (lex.isOK() && lex.getString() != "\\end_inset")
+				lex.next();
+			return 0;
+		}
+	} else {
+		if (tmptok == "Quotes") {
+			inset.reset(new InsetQuotes);
+		} else if (tmptok == "External") {
+			inset.reset(new InsetExternal);
+		} else if (tmptok == "FormulaMacro") {
+			inset.reset(new MathMacroTemplate);
+		} else if (tmptok == "Formula") {
+			inset.reset(new MathHullInset);
+		} else if (tmptok == "Graphics") {
+			inset.reset(new InsetGraphics);
+		} else if (tmptok == "Note") {
+			inset.reset(new InsetNote(buf.params(), tmptok));
+		} else if (tmptok == "Box") {
+			inset.reset(new InsetBox(buf.params(), tmptok));
+		} else if (tmptok == "CharStyle") {
+			lex.next();
+			string s = lex.getString();
+			CharStyles::iterator found_cs = tclass.charstyle(s);
+			inset.reset(new InsetCharStyle(buf.params(), found_cs));
+		} else if (tmptok == "Branch") {
+			inset.reset(new InsetBranch(buf.params(),
+						    InsetBranchParams()));
+		} else if (tmptok == "Include") {
+			InsetCommandParams p("Include");
+			inset.reset(new InsetInclude(p));
+		} else if (tmptok == "Environment") {
+			lex.next();
+			inset.reset(new InsetEnvironment(buf.params(), lex.getString()));
+		} else if (tmptok == "ERT") {
+			inset.reset(new InsetERT(buf.params()));
+		} else if (tmptok == "InsetSpace") {
+			inset.reset(new InsetSpace);
+		} else if (tmptok == "Tabular") {
+			inset.reset(new InsetTabular(buf));
+		} else if (tmptok == "Text") {
+			inset.reset(new InsetText(buf.params()));
+		} else if (tmptok == "VSpace") {
+			inset.reset(new InsetVSpace);
+		} else if (tmptok == "Foot") {
+			inset.reset(new InsetFoot(buf.params()));
+		} else if (tmptok == "Marginal") {
+			inset.reset(new InsetMarginal(buf.params()));
+		} else if (tmptok == "OptArg") {
+			inset.reset(new InsetOptArg(buf.params()));
+		} else if (tmptok == "Float") {
+			lex.next();
+			string tmptok = lex.getString();
+			inset.reset(new InsetFloat(buf.params(), tmptok));
+		} else if (tmptok == "Wrap") {
+			lex.next();
+			string tmptok = lex.getString();
+			inset.reset(new InsetWrap(buf.params(), tmptok));
+#if 0
+		} else if (tmptok == "List") {
+			inset.reset(new InsetList);
+		} else if (tmptok == "Theorem") {
+			inset.reset(new InsetList);
+#endif
+		} else if (tmptok == "Caption") {
+			inset.reset(new InsetCaption(buf.params()));
+		} else if (tmptok == "FloatList") {
+			inset.reset(new InsetFloatList);
+		} else {
+			lyxerr << "unknown Inset type '" << tmptok
+			       << "'" << std::endl;
+			while (lex.isOK() && lex.getString() != "\\end_inset")
+				lex.next();
+			return 0;
+		}
 
-	default:
-		break;
+		inset->read(buf, lex);
+
+#warning hack..
+		if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+			MathMacroTemplate const * tmpl =
+				static_cast<MathMacroTemplate*>(inset.get());
+			MacroTable::globalMacros().insert
+				(tmpl->name(), tmpl->asMacroData());
+			lyxerr << "creating local macro " << tmpl->name() << endl;
+		}
 	}
 
-	return 0;
+	return inset.release();
 }