/* 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;
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 (!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()) {
} else {
lex.printError("InsetCommand: Parse error: `$$Token'");
}
-
+
while (lex.isOK()) {
lex.nextToken();
token = lex.getString();
string const InsetCommandParams::getCommand() const
-{
+{
string s;
if (!getCmdName().empty()) s += "\\"+getCmdName();
if (!getOptions().empty()) s += "["+getOptions()+']';