#include "debug.h"
#include "BufferView.h"
#include "lyxtext.h"
+#include "lyxlex.h"
#include "insets/insetbibitem.h"
#include "insets/insetbibtex.h"
#include "insets/insetcaption.h"
#include "insets/insetcite.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/insetminipage.h"
#include "insets/insetnote.h"
#include "insets/insetoptarg.h"
-#include "insets/insetparent.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/insetwrap.h"
+#include "mathed/formulamacro.h"
+#include "mathed/formula.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
+#include "support/lstrings.h"
#include <cstdio>
+using namespace lyx::support;
+
using std::endl;
-Inset * createInset(FuncRequest const & cmd)
+InsetOld * createInset(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
BufferParams const & params = bv->buffer()->params;
switch (cmd.action) {
+ case LFUN_HFILL:
+ return new InsetHFill();
+
case LFUN_INSET_MINIPAGE:
return new InsetMinipage(params);
case LFUN_INSERT_NOTE:
- return new InsetNote(params);
+ return new InsetNote(params, "Note");
case LFUN_INSET_ERT:
return new InsetERT(params);
// Try and generate a valid index entry.
InsetCommandParams icp("index");
string const contents = cmd.argument.empty() ?
- bv->getLyXText()->getStringToIndex(bv) :
+ bv->getLyXText()->getStringToIndex() :
cmd.argument;
icp.setContents(contents);
case LFUN_TOC_INSERT:
return new InsetTOC(InsetCommandParams("tableofcontents"));
- case LFUN_PARENTINSERT:
- return new InsetParent(
- InsetCommandParams("lyxparent", cmd.argument), *bv->buffer());
+ case LFUN_ENVIRONMENT_INSERT:
+ return new InsetEnvironment(params, cmd.argument);
#if 0
case LFUN_INSET_LIST:
return new InsetTheorem;
#endif
- case LFUN_INSET_APPLY: {
+ case LFUN_INSET_INSERT: {
string const name = cmd.getArg(0);
if (name == "bibitem") {
return inset;
} else if (name == "external") {
- InsetExternal::Params iep;
- InsetExternalMailer::string2params(cmd.argument, iep);
+ Buffer const * buffer = cmd.view()->buffer();
+ InsetExternal::Params iep;
+ InsetExternalMailer::string2params(cmd.argument,
+ *buffer, iep);
InsetExternal * inset = new InsetExternal;
- inset->setFromParams(iep);
+ inset->setParams(iep, buffer);
return inset;
} else if (name == "graphics") {
- InsetGraphicsParams igp;
- InsetGraphicsMailer::string2params(cmd.argument, igp);
+ Buffer const & buffer = *cmd.view()->buffer();
+ InsetGraphicsParams igp;
+ InsetGraphicsMailer::string2params(cmd.argument,
+ buffer, igp);
InsetGraphics * inset = new InsetGraphics;
- string const fpath = cmd.view()->buffer()->filePath();
- inset->setParams(igp, fpath);
+ inset->setParams(igp);
return inset;
} else if (name == "include") {
return new InsetUrl(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;
+ }
+
break;
default:
return 0;
}
+
+
+InsetOld * readInset(LyXLex & lex, Buffer const & buf)
+{
+ // consistency check
+ if (lex.getString() != "\\begin_inset") {
+ lyxerr << "Buffer::readInset: Consistency check failed."
+ << endl;
+ }
+
+ InsetOld * inset = 0;
+
+ lex.next();
+ string const 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 = new InsetCitation(inscmd);
+ } else if (cmdName == "bibitem") {
+ lex.printError("Wrong place for bibitem");
+ inset = new InsetBibitem(inscmd);
+ } else if (cmdName == "bibtex") {
+ inset = new InsetBibtex(inscmd);
+ } else if (cmdName == "index") {
+ inset = new InsetIndex(inscmd);
+ } else if (cmdName == "include") {
+ inset = new InsetInclude(inscmd, buf);
+ } else if (cmdName == "label") {
+ inset = new InsetLabel(inscmd);
+ } else if (cmdName == "url"
+ || cmdName == "htmlurl") {
+ inset = 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 = new InsetRef(inscmd, buf);
+ }
+ } else if (cmdName == "tableofcontents") {
+ inset = new InsetTOC(inscmd);
+ } else if (cmdName == "listofalgorithms") {
+ inset = new InsetFloatList("algorithm");
+ } else if (cmdName == "listoffigures") {
+ inset = new InsetFloatList("figure");
+ } else if (cmdName == "listoftables") {
+ inset = new InsetFloatList("table");
+ } else if (cmdName == "printindex") {
+ inset = new InsetPrintIndex(inscmd);
+ }
+ } else {
+ if (tmptok == "Quotes") {
+ inset = new InsetQuotes;
+ } else if (tmptok == "External") {
+ inset = new InsetExternal;
+ } else if (tmptok == "FormulaMacro") {
+ inset = new InsetFormulaMacro;
+ } else if (tmptok == "Formula") {
+ inset = new InsetFormula;
+ } else if (tmptok == "Graphics") {
+ inset = new InsetGraphics;
+ } else if (tmptok == "Note" || tmptok == "Comment"
+ || tmptok == "Greyedout") {
+ inset = new InsetNote(buf.params, tmptok);
+ } else if (tmptok == "Include") {
+ InsetCommandParams p("Include");
+ inset = new InsetInclude(p, buf);
+ } else if (tmptok == "Environment") {
+ lex.next();
+ inset = new InsetEnvironment(buf.params, lex.getString());
+ } else if (tmptok == "ERT") {
+ 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);
+ } else if (tmptok == "Foot") {
+ inset = new InsetFoot(buf.params);
+ } else if (tmptok == "Marginal") {
+ inset = new InsetMarginal(buf.params);
+ } else if (tmptok == "OptArg") {
+ inset = new InsetOptArg(buf.params);
+ } else if (tmptok == "Minipage") {
+ inset = new InsetMinipage(buf.params);
+ } else if (tmptok == "Float") {
+ lex.next();
+ string tmptok = lex.getString();
+ inset = new InsetFloat(buf.params, tmptok);
+ } else if (tmptok == "Wrap") {
+ lex.next();
+ string tmptok = lex.getString();
+ inset = new InsetWrap(buf.params, tmptok);
+#if 0
+ } else if (tmptok == "List") {
+ inset = new InsetList;
+ } else if (tmptok == "Theorem") {
+ inset = new InsetList;
+#endif
+ } else if (tmptok == "Caption") {
+ inset = new InsetCaption(buf.params);
+ } else if (tmptok == "FloatList") {
+ inset = new InsetFloatList;
+ }
+
+ if (inset)
+ inset->read(&buf, lex);
+ }
+
+ return inset;
+}