#include "insets/insethfill.h"
#include "insets/insetinclude.h"
#include "insets/insetindex.h"
+#include "insets/insetnomencl.h"
#include "insets/insetlabel.h"
#include "insets/insetline.h"
#include "insets/insetmarginal.h"
#include "insets/insetvspace.h"
#include "insets/insetwrap.h"
-#include "mathed/math_macrotemplate.h"
-#include "mathed/math_hullinset.h"
+#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathHull.h"
#include "support/lstrings.h"
#include <sstream>
-using lyx::support::compare_ascii_no_case;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
using std::auto_ptr;
using std::endl;
case LFUN_PAGEBREAK_INSERT:
return new InsetPagebreak;
+ case LFUN_CLEARPAGE_INSERT:
+ return new InsetClearPage;
+
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
+ return new InsetClearDoublePage;
+
case LFUN_CHARSTYLE_INSERT: {
string s = cmd.getArg(0);
LyXTextClass tclass = params.getLyXTextClass();
}
case LFUN_BRANCH_INSERT: {
- string arg = cmd.getArg(0);
+ docstring arg = cmd.argument();
if (arg.empty())
- arg = "none";
+ arg = from_ascii("none");
return new InsetBranch(params, InsetBranchParams(arg));
}
case LFUN_BIBITEM_INSERT:
return new InsetBibitem(InsetCommandParams("bibitem"));
- case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_INSERT: {
// check if the float type exists
- if (params.getLyXTextClass().floats().typeExist(cmd.argument))
- return new InsetFloat(params, cmd.argument);
- lyxerr << "Non-existent float type: " << cmd.argument << endl;
+ string const argument = to_utf8(cmd.argument());
+ if (params.getLyXTextClass().floats().typeExist(argument))
+ return new InsetFloat(params, argument);
+ lyxerr << "Non-existent float type: " << argument << endl;
return 0;
+ }
- case LFUN_FLOAT_WIDE_INSERT:
+ case LFUN_FLOAT_WIDE_INSERT: {
// check if the float type exists
- if (params.getLyXTextClass().floats().typeExist(cmd.argument)) {
- auto_ptr<InsetFloat> p(new InsetFloat(params, cmd.argument));
+ string const argument = to_utf8(cmd.argument());
+ if (params.getLyXTextClass().floats().typeExist(argument)) {
+ auto_ptr<InsetFloat> p(new InsetFloat(params, argument));
p->wide(true, params);
return p.release();
}
- lyxerr << "Non-existent float type: " << cmd.argument << endl;
+ lyxerr << "Non-existent float type: " << argument << endl;
return 0;
+ }
- case LFUN_WRAP_INSERT:
- if (cmd.argument == "figure")
- return new InsetWrap(params, cmd.argument);
- lyxerr << "Non-existent floatflt type: " << cmd.argument << endl;
+ case LFUN_WRAP_INSERT: {
+ string const argument = to_utf8(cmd.argument());
+ if (argument == "figure")
+ return new InsetWrap(params, argument);
+ lyxerr << "Non-existent floatflt type: " << argument << endl;
return 0;
+ }
case LFUN_INDEX_INSERT: {
// Try and generate a valid index entry.
InsetCommandParams icp("index");
- string const contents = cmd.argument.empty() ?
- bv->getLyXText()->getStringToIndex(bv->cursor()) :
- cmd.argument;
- icp.setContents(contents);
+ icp["name"] = cmd.argument().empty() ?
+ bv->cursor().innerText()->getStringToIndex(bv->cursor()) :
+ cmd.argument();
return new InsetIndex(icp);
}
+ case LFUN_NOMENCL_INSERT: {
+ InsetCommandParams icp("nomenclature");
+ icp["symbol"] = cmd.argument().empty() ?
+ bv->cursor().innerText()->getStringToIndex(bv->cursor()) :
+ cmd.argument();
+ return new InsetNomencl(icp);
+ }
+
case LFUN_TABULAR_INSERT: {
- if (cmd.argument.empty())
+ if (cmd.argument().empty())
return 0;
- std::istringstream ss(cmd.argument);
+ std::istringstream ss(to_utf8(cmd.argument()));
int r = 0, c = 0;
ss >> r >> c;
if (r <= 0)
case LFUN_INDEX_PRINT:
return new InsetPrintIndex(InsetCommandParams("printindex"));
+ case LFUN_NOMENCL_PRINT:
+ return new InsetPrintNomencl(InsetCommandParams("printnomenclature"));
+
case LFUN_TOC_INSERT:
return new InsetTOC(InsetCommandParams("tableofcontents"));
case LFUN_ENVIRONMENT_INSERT:
- return new InsetEnvironment(params, cmd.argument);
+ return new InsetEnvironment(params, to_utf8(cmd.argument()));
#if 0
case LFUN_LIST_INSERT:
string const name = cmd.getArg(0);
if (name == "bibitem") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetBibitem(icp);
} else if (name == "bibtex") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetBibtex(icp);
} else if (name == "citation") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp("cite");
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetCitation(icp);
} else if (name == "ert") {
InsetCollapsable::CollapseStatus st;
- InsetERTMailer::string2params(cmd.argument, st);
+ InsetERTMailer::string2params(to_utf8(cmd.argument()), st);
return new InsetERT(params, st);
} else if (name == "external") {
Buffer const & buffer = *bv->buffer();
InsetExternalParams iep;
- InsetExternalMailer::string2params(cmd.argument,
+ InsetExternalMailer::string2params(to_utf8(cmd.argument()),
buffer, iep);
auto_ptr<InsetExternal> inset(new InsetExternal);
inset->setParams(iep, buffer);
} else if (name == "graphics") {
Buffer const & buffer = *bv->buffer();
InsetGraphicsParams igp;
- InsetGraphicsMailer::string2params(cmd.argument,
+ InsetGraphicsMailer::string2params(to_utf8(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);
+ InsetCommandParams iip(name);
+ InsetIncludeMailer::string2params(to_utf8(cmd.argument()), iip);
return new InsetInclude(iip);
} else if (name == "index") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetIndex(icp);
+ } else if (name == "nomenclature") {
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, lyx::to_utf8(cmd.argument()),
+ icp);
+ return new InsetNomencl(icp);
+
} else if (name == "label") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetLabel(icp);
} else if (name == "ref") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetRef(icp, *bv->buffer());
} else if (name == "toc") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp("tableofcontents");
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetTOC(icp);
} else if (name == "url") {
- InsetCommandParams icp;
- InsetCommandMailer::string2params(name, cmd.argument,
+ InsetCommandParams icp(name);
+ InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
icp);
return new InsetUrl(icp);
} else if (name == "vspace") {
VSpace vspace;
- InsetVSpaceMailer::string2params(cmd.argument, vspace);
+ InsetVSpaceMailer::string2params(to_utf8(cmd.argument()), vspace);
return new InsetVSpace(vspace);
}
}
case LFUN_SPACE_INSERT: {
- string const name = cmd.argument;
+ string const name = to_utf8(cmd.argument());
if (name == "normal")
return new InsetSpace(InsetSpace::NORMAL);
else if (name == "protected")
// test the different insets
if (tmptok == "LatexCommand") {
- InsetCommandParams inscmd;
- inscmd.read(lex);
+ lex.next();
+ string const cmdName = lex.getString();
+ lex.pushToken(cmdName);
- string const cmdName = inscmd.getCmdName();
+ InsetCommandParams inscmd(cmdName);
+ 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/biblio.C to test for valid cite
+ // commands.
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 == "nomenclature") {
+ inset.reset(new InsetNomencl(inscmd));
} else if (cmdName == "include") {
inset.reset(new InsetInclude(inscmd));
} else if (cmdName == "label") {
|| cmdName == "vref"
|| cmdName == "vpageref"
|| cmdName == "prettyref") {
- if (!inscmd.getOptions().empty()
- || !inscmd.getContents().empty()) {
+ if (!inscmd["name"].empty()
+ || !inscmd["reference"].empty()) {
inset.reset(new InsetRef(inscmd, buf));
}
} else if (cmdName == "tableofcontents") {
inset.reset(new InsetFloatList("table"));
} else if (cmdName == "printindex") {
inset.reset(new InsetPrintIndex(inscmd));
+ } else if (cmdName == "printnomenclature") {
+ inset.reset(new InsetPrintNomencl(inscmd));
} else {
lyxerr << "unknown CommandInset '" << cmdName
<< "'" << std::endl;
} else if (tmptok == "FormulaMacro") {
inset.reset(new MathMacroTemplate);
} else if (tmptok == "Formula") {
- inset.reset(new MathHullInset);
+ inset.reset(new InsetMathHull);
} else if (tmptok == "Graphics") {
inset.reset(new InsetGraphics);
} else if (tmptok == "Note") {
inset.reset(new InsetBranch(buf.params(),
InsetBranchParams()));
} else if (tmptok == "Include") {
- InsetCommandParams p("Include");
+ InsetCommandParams p("include");
inset.reset(new InsetInclude(p));
} else if (tmptok == "Environment") {
lex.next();
(tmpl->name(), tmpl->asMacroData());
lyxerr[Debug::DEBUG]
<< BOOST_CURRENT_FUNCTION
- << ": creating local macro " << tmpl->name()
+ << ": creating local macro " << to_utf8(tmpl->name())
<< endl;
}
}
return inset.release();
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff