/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* 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;
{}
-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)
{}
}
-void InsetCommandParams::setFromString( string const & b )
+void InsetCommandParams::setFromString(string const & b)
{
string::size_type idx = b.find("|++|");
if (idx == string::npos) {
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)
-{
+{
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;
}
string const InsetCommandParams::getCommand() const
-{
+{
string s;
if (!getCmdName().empty()) s += "\\"+getCmdName();
if (!getOptions().empty()) s += "["+getOptions()+']';
InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
- : p_( p.getCmdName(), p.getContents(), p.getOptions() )
-{
-}
+ : 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::docBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &) const
{
return 0;
}