using std::endl;
-InsetCommand::InsetCommand()
+InsetCommandParams::InsetCommandParams()
+{}
+
+
+InsetCommandParams::InsetCommandParams( string const & n,
+ string const & c,
+ string const & o )
+ : cmdname(n), contents(c), options(o)
+{}
+
+
+string const InsetCommandParams::getAsString() const
{
+ return cmdname + "|++|" + contents + "|++|" + options;
}
-InsetCommand::InsetCommand(string const & cmd, string const & arg,
- string const & opt)
- : cmdname(cmd), options(opt), contents(arg)
+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);
+ }
}
-// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(Buffer const *, ostream & os) const
+bool InsetCommandParams::operator==(InsetCommandParams const & o) const
{
- os << "LatexCommand " << getCommand() << "\n";
+ if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true;
+ return false;
+}
+
+
+bool InsetCommandParams::operator!=(InsetCommandParams const & o) const
+{
+ return !(*this == o);
}
-void InsetCommand::scanCommand(string const & cmd)
+void InsetCommandParams::scanCommand(string const & cmd)
{
string tcmdname, toptions, tcontents;
}
// 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()) {
- string t = lex.GetString();
- scanCommand(t);
+ token = lex.GetString();
+ scanCommand(token);
} else
lex.printError("InsetCommand: Parse error: `$$Token'");
+ while (lex.IsOK()) {
+ lex.nextToken();
+ token = lex.GetString();
+ if (token == "\\end_inset")
+ break;
+ }
+ if (token != "\\end_inset") {
+ lex.printError("Missing \\end_inset at this point. "
+ "Read: `$$Token'");
+ }
}
-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
+{
+ string s;
+ if (!getCmdName().empty()) s += "\\"+getCmdName();
+ if (!getOptions().empty()) s += "["+getOptions()+']';
+ s += "{"+getContents()+'}';
+ return s;
+}
+
+
+InsetCommand::InsetCommand( InsetCommandParams const & p )
+ : p_( p.getCmdName(), p.getContents(), p.getOptions() )
+{}
+
+
+void InsetCommand::setParams(InsetCommandParams const & p )
{
- return 0;
+ 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;
}