#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"
#include "support/lstrings.h"
#include "support/ExceptionMessage.h"
-#include "support/assert.h"
+#include "support/lassert.h"
#include <sstream>
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());
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);
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: {
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;
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));
// 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") {
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()));
} 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") {
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") {