#include "Color.h"
#include "Lexer.h"
#include "LyX.h"
-#include "Paragraph.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetCaption.h"
#include "insets/InsetCitation.h"
-#include "insets/InsetCharStyle.h"
+#include "insets/InsetFlex.h"
#include "insets/InsetEnvironment.h"
#include "insets/InsetERT.h"
#include "insets/InsetListings.h"
#include <sstream>
+using std::auto_ptr;
+using std::endl;
+using std::string;
+
namespace lyx {
using support::compare_ascii_no_case;
-using std::auto_ptr;
-using std::endl;
-using std::string;
-
Inset * createInset(BufferView * bv, FuncRequest const & cmd)
{
- BufferParams const & params = bv->buffer()->params();
+ BufferParams const & params = bv->buffer().params();
try {
case LFUN_CLEARDOUBLEPAGE_INSERT:
return new InsetClearDoublePage;
- case LFUN_CHARSTYLE_INSERT: {
+ case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0);
TextClass tclass = params.getTextClass();
- CharStyles::iterator found_cs = tclass.charstyle(s);
- if (found_cs != tclass.charstyles().end())
- return new InsetCharStyle(params, found_cs);
- else
- return new InsetCharStyle(params, s);
+ InsetLayout il = tclass.insetlayout(from_utf8(s));
+ return new InsetFlex(params, il);
}
case LFUN_NOTE_INSERT: {
case LFUN_WRAP_INSERT: {
string const argument = to_utf8(cmd.argument());
- if (argument == "figure")
+ if (argument == "figure" || argument == "table")
return new InsetWrap(params, argument);
- lyxerr << "Non-existent floatflt type: " << argument << endl;
+ lyxerr << "Non-existent wrapfig type: " << argument << endl;
return 0;
}
- case LFUN_INDEX_INSERT: {
- // Try and generate a valid index entry.
- InsetCommandParams icp("index");
- icp["name"] = cmd.argument().empty() ?
- bv->cursor().innerText()->getStringToIndex(bv->cursor()) :
- cmd.argument();
- return new InsetIndex(icp);
- }
+ case LFUN_INDEX_INSERT:
+ return new InsetIndex(params);
case LFUN_NOMENCL_INSERT: {
InsetCommandParams icp("nomenclature");
r = 2;
if (c <= 0)
c = 2;
- return new InsetTabular(*bv->buffer(), r, c);
+ return new InsetTabular(bv->buffer(), r, c);
}
case LFUN_CAPTION_INSERT: {
}
case LFUN_INDEX_PRINT:
- return new InsetPrintIndex(InsetCommandParams("printindex"));
+ return new InsetPrintIndex(InsetCommandParams("index_print"));
case LFUN_NOMENCL_PRINT:
- return new InsetPrintNomencl(InsetCommandParams("printnomenclature"));
+ return new InsetPrintNomencl(InsetCommandParams("nomencl_print"));
case LFUN_TOC_INSERT:
- return new InsetTOC(InsetCommandParams("tableofcontents"));
+ return new InsetTOC(InsetCommandParams("toc"));
case LFUN_ENVIRONMENT_INSERT:
- return new InsetEnvironment(params, to_utf8(cmd.argument()));
+ return new InsetEnvironment(params, cmd.argument());
#if 0
case LFUN_LIST_INSERT:
return new InsetBibtex(icp);
} else if (name == "citation") {
- InsetCommandParams icp("cite");
+ InsetCommandParams icp("citation");
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetCitation(icp);
InsetCollapsable::CollapseStatus st;
InsetERTMailer::string2params(to_utf8(cmd.argument()), st);
return new InsetERT(params, st);
-
+
} else if (name == "listings") {
InsetListingsParams par;
InsetListingsMailer::string2params(to_utf8(cmd.argument()), par);
return new InsetListings(params, par);
} else if (name == "external") {
- Buffer const & buffer = *bv->buffer();
+ Buffer const & buffer = bv->buffer();
InsetExternalParams iep;
InsetExternalMailer::string2params(to_utf8(cmd.argument()),
buffer, iep);
return inset.release();
} else if (name == "graphics") {
- Buffer const & buffer = *bv->buffer();
+ Buffer const & buffer = bv->buffer();
InsetGraphicsParams igp;
InsetGraphicsMailer::string2params(to_utf8(cmd.argument()),
buffer, igp);
return new InsetInclude(iip);
} else if (name == "index") {
- InsetCommandParams icp(name);
- InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
- icp);
- return new InsetIndex(icp);
+ return new InsetIndex(params);
} else if (name == "nomenclature") {
InsetCommandParams icp(name);
InsetCommandParams icp(name);
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
- return new InsetRef(icp, *bv->buffer());
+ return new InsetRef(icp, bv->buffer());
} else if (name == "toc") {
- InsetCommandParams icp("tableofcontents");
+ InsetCommandParams icp("toc");
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetTOC(icp);
string tmptok = lex.getString();
// test the different insets
- if (tmptok == "LatexCommand") {
+ if (tmptok == "CommandInset") {
lex.next();
- string const cmdName = lex.getString();
- lex.pushToken(cmdName);
-
- InsetCommandParams inscmd(cmdName);
+ string const insetType = lex.getString();
+ lex.pushToken(insetType);
+
+ //FIXME
+ //Inset::Code const code = Inset::translate(insetType);
+ //if (code == Inset::NO_CODE) { choke as below; }
+ //InsetCommandParams inscmd();
+ InsetCommandParams inscmd(insetType);
inscmd.read(lex);
- // This strange command allows LyX to recognize "natbib" style
- // citations: citet, citep, Citet etc.
- // FIXME: We already have partial support for \\fullcite and
- // the various \\footcite commands. We should increase the
- // file format number and read these commands here, too.
- // Then we should use is_possible_cite_command() in
- // src/frontends/controllers/frontend_helpers.cpp to test for valid cite
- // commands.
- if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
+ if (insetType == "citation") {
inset.reset(new InsetCitation(inscmd));
- } else if (cmdName == "bibitem") {
+ } else if (insetType == "bibitem") {
inset.reset(new InsetBibitem(inscmd));
- } else if (cmdName == "bibtex") {
+ } else if (insetType == "bibtex") {
inset.reset(new InsetBibtex(inscmd));
- } else if (cmdName == "index") {
- inset.reset(new InsetIndex(inscmd));
- } else if (cmdName == "nomenclature") {
+ } else if (insetType == "index") {
+ inset.reset(new InsetIndex(buf.params()));
+ } else if (insetType == "nomenclature") {
inset.reset(new InsetNomencl(inscmd));
- } else if (cmdName == "include") {
+ } else if (insetType == "include") {
inset.reset(new InsetInclude(inscmd));
- } else if (cmdName == "label") {
+ } else if (insetType == "label") {
inset.reset(new InsetLabel(inscmd));
- } else if (cmdName == "url"
- || cmdName == "htmlurl") {
+ } else if (insetType == "url") {
inset.reset(new InsetUrl(inscmd));
- } else if (cmdName == "ref"
- || cmdName == "eqref"
- || cmdName == "pageref"
- || cmdName == "vref"
- || cmdName == "vpageref"
- || cmdName == "prettyref") {
+ } else if (insetType == "ref") {
if (!inscmd["name"].empty()
|| !inscmd["reference"].empty()) {
inset.reset(new InsetRef(inscmd, buf));
}
- } else if (cmdName == "tableofcontents") {
+ } else if (insetType == "toc") {
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") {
+ } else if (insetType == "index_print") {
inset.reset(new InsetPrintIndex(inscmd));
- } else if (cmdName == "printnomenclature") {
+ } else if (insetType == "nomencl_print") {
inset.reset(new InsetPrintNomencl(inscmd));
} else {
- lyxerr << "unknown CommandInset '" << cmdName
+ lyxerr << "unknown CommandInset '" << insetType
<< "'" << std::endl;
while (lex.isOK() && lex.getString() != "\\end_inset")
lex.next();
inset.reset(new InsetNote(buf.params(), tmptok));
} else if (tmptok == "Box") {
inset.reset(new InsetBox(buf.params(), tmptok));
- } else if (tmptok == "CharStyle") {
+ } else if (tmptok == "Flex") {
lex.next();
string s = lex.getString();
- CharStyles::iterator found_cs = tclass.charstyle(s);
- if (found_cs != tclass.charstyles().end())
- inset.reset(new InsetCharStyle(buf.params(), found_cs));
- else {
- // "Undefined" inset
- inset.reset(new InsetCharStyle(buf.params(), s));
- }
+ InsetLayout il = tclass.insetlayout(from_utf8(s));
+ inset.reset(new InsetFlex(buf.params(), il));
} else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf.params(),
InsetBranchParams()));
inset.reset(new InsetInclude(p));
} else if (tmptok == "Environment") {
lex.next();
- inset.reset(new InsetEnvironment(buf.params(), lex.getString()));
+ inset.reset(new InsetEnvironment(buf.params(), lex.getDocString()));
} else if (tmptok == "ERT") {
inset.reset(new InsetERT(buf.params()));
} else if (tmptok == "listings") {
#endif
} else if (tmptok == "Caption") {
inset.reset(new InsetCaption(buf.params()));
+ } else if (tmptok == "Index") {
+ inset.reset(new InsetIndex(buf.params()));
} else if (tmptok == "FloatList") {
inset.reset(new InsetFloatList);
} else {
inset->read(buf, lex);
-#ifdef WITH_WARNINGS
-#warning hack..
-#endif
+// FIXME: hack..
if (inset->lyxCode() == Inset::MATHMACRO_CODE) {
MathMacroTemplate const * tmpl =
static_cast<MathMacroTemplate*>(inset.get());