/* 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;
{}
-InsetCommandParams::InsetCommandParams( string const & n,
+InsetCommandParams::InsetCommandParams(string const & n,
string const & c,
- string const & o )
+ string const & o)
: cmdname(n), contents(c), options(o)
{}
-string InsetCommandParams::getAsString() const
+string const InsetCommandParams::getAsString() const
{
- string b(cmdname);
- b += "|++|" + options + "|++|" + contents;
- return b;
+ return cmdname + "|++|" + contents + "|++|" + options;
}
-void InsetCommandParams::setFromString( string const & b )
+void InsetCommandParams::setFromString(string const & b)
{
string::size_type idx = b.find("|++|");
- if( idx == string::npos ) return;
+ 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 ) {
- options = tmp;
+ if (idx == string::npos) {
+ contents = tmp;
+ options = "";
} else {
- options = tmp.substr(0, idx);
- contents = tmp.substr(idx+4);
+ contents = tmp.substr(0, idx);
+ options = tmp.substr(idx+4);
}
}
bool InsetCommandParams::operator==(InsetCommandParams const & o) const
{
- if( cmdname != o.cmdname ) return false;
- if( contents != o.contents ) return false;
- if( options != o.options ) return false;
- return true;
+ return cmdname == o.cmdname && contents == o.contents
+ && options == o.options;
}
bool InsetCommandParams::operator!=(InsetCommandParams const & o) const
{
- if( cmdname != o.cmdname ) return true;
- if( contents != o.contents ) return true;
- if( options != o.options ) return true;
- return false;
+ return !(*this == o);
}
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()) setCmdName( tcmdname );
- if (!toptions.empty()) setOptions( toptions );
- if (!tcontents.empty()) setContents( tcontents );
+ 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 InsetCommandParams::Read(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;
}
}
-void InsetCommandParams::Write(ostream & os) const
+void InsetCommandParams::write(ostream & os) const
{
os << "LatexCommand " << getCommand() << "\n";
}
-string InsetCommandParams::getCommand() const
-{
+string const InsetCommandParams::getCommand() const
+{
string s;
if (!getCmdName().empty()) s += "\\"+getCmdName();
if (!getOptions().empty()) s += "["+getOptions()+']';
}
-InsetCommand::InsetCommand( InsetCommandParams const & p )
- : p_( p.getCmdName(), p.getContents(), p.getOptions() )
+InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
+ : p_(p.getCmdName(), p.getContents(), p.getOptions())
{}
-void InsetCommand::setParams(InsetCommandParams const & p )
+void InsetCommand::setParams(InsetCommandParams const & p)
{
- p_.setCmdName( p.getCmdName() );
- p_.setContents( p.getContents() );
- p_.setOptions( p.getOptions() );
+ p_.setCmdName(p.getCmdName());
+ p_.setContents(p.getContents());
+ p_.setOptions(p.getOptions());
}
-int InsetCommand::Latex(Buffer const *, ostream & os,
+int InsetCommand::latex(Buffer const *, ostream & os,
bool /*fragile*/, bool/*fs*/) const
{
os << getCommand();
}
-int InsetCommand::Ascii(Buffer const *, ostream &) const
+int InsetCommand::ascii(Buffer const *, ostream &, int) const
{
return 0;
}
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const *, ostream &) const
{
return 0;
}
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &) const
{
return 0;
}