/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "insetcommand.h"
#include "debug.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
+#include "lyxlex.h"
using std::ostream;
using std::endl;
-InsetCommand::InsetCommand()
+InsetCommandParams::InsetCommandParams()
{}
-InsetCommand::InsetCommand(string const & cmd, string const & arg,
- string const & opt)
- : cmdname(cmd), options(opt), contents(arg)
+InsetCommandParams::InsetCommandParams(string const & n,
+ string const & c,
+ string const & o)
+ : cmdname(n), contents(c), options(o)
{}
-// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(Buffer const *, ostream & os) const
+string const InsetCommandParams::getAsString() const
{
- os << "LatexCommand " << getCommand() << "\n";
+ return cmdname + "|++|" + contents + "|++|" + options;
+}
+
+
+void InsetCommandParams::setFromString(string const & b)
+{
+ string::size_type idx = b.find("|++|");
+ if (idx == string::npos) {
+ cmdname = b;
+ contents = "";
+ options = "";
+ return;
+ }
+
+ cmdname = b.substr(0, idx);
+ string tmp = b.substr(idx+4);
+
+ idx = tmp.find("|++|");
+ if (idx == string::npos) {
+ contents = tmp;
+ options = "";
+ } else {
+ contents = tmp.substr(0, idx);
+ options = tmp.substr(idx+4);
+ }
}
-void InsetCommand::scanCommand(string const & cmd)
+bool InsetCommandParams::operator==(InsetCommandParams const & o) const
+{
+ return cmdname == o.cmdname && contents == o.contents
+ && options == o.options;
+}
+
+
+bool InsetCommandParams::operator!=(InsetCommandParams const & o) const
+{
+ return !(*this == o);
+}
+
+
+void InsetCommandParams::scanCommand(string const & cmd)
{
string tcmdname, toptions, tcontents;
if (cmd.empty()) return;
enum { WS, CMDNAME, OPTION, CONTENT } state = WS;
-
+
// Used to handle things like \command[foo[bar]]{foo{bar}}
int nestdepth = 0;
}
if ((state == OPTION && c == '[') ||
(state == CONTENT && c == '{')) {
- ++nestdepth;
+ ++nestdepth;
}
switch (state) {
case CMDNAME: tcmdname += c; break;
- case OPTION: toptions += c; break;
+ case OPTION: toptions += c; break;
case CONTENT: tcontents += c; break;
case WS:
if (c == '\\') {
}
// Don't mess with this.
- if (!tcmdname.empty()) cmdname = tcmdname;
- if (!toptions.empty()) options = toptions;
- if (!tcontents.empty()) setContents(tcontents);
- // setContents is overloaded in InsetInclude
+ if (!tcmdname.empty()) setCmdName(tcmdname);
+ if (!toptions.empty()) setOptions(toptions);
+ if (!tcontents.empty()) setContents(tcontents);
if (lyxerr.debugging(Debug::PARSER))
lyxerr << "Command <" << cmd
// This function will not be necessary when lyx3
-void InsetCommand::Read(Buffer const *, LyXLex & lex)
-{
+void InsetCommandParams::read(LyXLex & lex)
+{
string token;
- if (lex.EatLine()) {
- token = lex.GetString();
+ if (lex.eatLine()) {
+ token = lex.getString();
scanCommand(token);
- } else
+ } else {
lex.printError("InsetCommand: Parse error: `$$Token'");
- while (lex.IsOK()) {
+ }
+
+ while (lex.isOK()) {
lex.nextToken();
- token = lex.GetString();
+ token = lex.getString();
if (token == "\\end_inset")
break;
}
}
-int InsetCommand::Latex(Buffer const *, ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+void InsetCommandParams::write(ostream & os) const
{
- os << getCommand();
- return 0;
+ os << "LatexCommand " << getCommand() << "\n";
}
-int InsetCommand::Ascii(Buffer const *, ostream &) const
+string const InsetCommandParams::getCommand() const
{
- return 0;
+ string s;
+ if (!getCmdName().empty()) s += "\\"+getCmdName();
+ if (!getOptions().empty()) s += "["+getOptions()+']';
+ s += "{"+getContents()+'}';
+ return s;
+}
+
+
+InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
+ : p_(p.getCmdName(), p.getContents(), p.getOptions())
+{}
+
+
+void InsetCommand::setParams(InsetCommandParams const & p)
+{
+ p_.setCmdName(p.getCmdName());
+ p_.setContents(p.getContents());
+ p_.setOptions(p.getOptions());
}
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::latex(Buffer const *, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
+ os << getCommand();
return 0;
}
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::ascii(Buffer const *, ostream &, int) const
{
return 0;
}
-Inset * InsetCommand::Clone() const
+int InsetCommand::linuxdoc(Buffer const *, ostream &) const
{
- return new InsetCommand(cmdname, contents, options);
+ return 0;
}
-string InsetCommand::getCommand() const
-{
- string s;
- if (!cmdname.empty()) s += "\\"+cmdname;
- if (!options.empty()) s += "["+options+']';
- s += "{"+contents+'}';
- return s;
+int InsetCommand::docbook(Buffer const *, ostream &) const
+{
+ return 0;
}