#include <config.h>
#include "factory.h"
-#include "funcrequest.h"
+
#include "buffer.h"
-#include "FloatList.h"
-#include "debug.h"
#include "BufferView.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "FloatList.h"
+#include "funcrequest.h"
+#include "LColor.h"
#include "lyxlex.h"
#include "insets/insetbibitem.h"
#include "support/lstrings.h"
#include "support/std_sstream.h"
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
using std::endl;
InsetOld * createInset(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- BufferParams const & params = bv->buffer()->params;
+ BufferParams const & params = bv->buffer()->params();
switch (cmd.action) {
case LFUN_HFILL:
- return new InsetHFill();
+ return new InsetHFill;
case LFUN_INSET_MINIPAGE:
return new InsetMinipage(params);
return inset;
} else if (name == "include") {
- InsetInclude::Params iip;
+ InsetCommandParams iip;
InsetIncludeMailer::string2params(cmd.argument, iip);
return new InsetInclude(iip);
} else if (cmdName == "index") {
inset = new InsetIndex(inscmd);
} else if (cmdName == "include") {
- inset = new InsetInclude(inscmd, buf);
+ inset = new InsetInclude(inscmd);
} else if (cmdName == "label") {
inset = new InsetLabel(inscmd);
} else if (cmdName == "url"
inset = new InsetGraphics;
} else if (tmptok == "Note" || tmptok == "Comment"
|| tmptok == "Greyedout") {
- inset = new InsetNote(buf.params, tmptok);
+ inset = new InsetNote(buf.params(), tmptok);
} else if (tmptok == "Branch") {
- inset = new InsetBranch(buf.params, tmptok);
+ inset = new InsetBranch(buf.params(), string());
} else if (tmptok == "Include") {
InsetCommandParams p("Include");
- inset = new InsetInclude(p, buf);
+ inset = new InsetInclude(p);
} else if (tmptok == "Environment") {
lex.next();
- inset = new InsetEnvironment(buf.params, lex.getString());
+ inset = new InsetEnvironment(buf.params(), lex.getString());
} else if (tmptok == "ERT") {
- inset = new InsetERT(buf.params);
+ inset = new InsetERT(buf.params());
} else if (tmptok == "InsetSpace") {
inset = new InsetSpace;
} else if (tmptok == "Tabular") {
inset = new InsetTabular(buf);
} else if (tmptok == "Text") {
- inset = new InsetText(buf.params);
+ inset = new InsetText(buf.params());
} else if (tmptok == "Foot") {
- inset = new InsetFoot(buf.params);
+ inset = new InsetFoot(buf.params());
} else if (tmptok == "Marginal") {
- inset = new InsetMarginal(buf.params);
+ inset = new InsetMarginal(buf.params());
} else if (tmptok == "OptArg") {
- inset = new InsetOptArg(buf.params);
+ inset = new InsetOptArg(buf.params());
} else if (tmptok == "Minipage") {
- inset = new InsetMinipage(buf.params);
+ inset = new InsetMinipage(buf.params());
} else if (tmptok == "Float") {
lex.next();
string tmptok = lex.getString();
- inset = new InsetFloat(buf.params, tmptok);
+ inset = new InsetFloat(buf.params(), tmptok);
} else if (tmptok == "Wrap") {
lex.next();
string tmptok = lex.getString();
- inset = new InsetWrap(buf.params, tmptok);
+ inset = new InsetWrap(buf.params(), tmptok);
#if 0
} else if (tmptok == "List") {
inset = new InsetList;
inset = new InsetList;
#endif
} else if (tmptok == "Caption") {
- inset = new InsetCaption(buf.params);
+ inset = new InsetCaption(buf.params());
} else if (tmptok == "FloatList") {
inset = new InsetFloatList;
}