* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
*
* ====================================================== */
#include "lyxlex.h"
#include "debug.h"
#include "lyxlex.h"
+#include "support/lstrings.h"
using std::endl;
add(LFUN_DEPTH);
add(SEPARATOR);
- add(LFUN_TEX);
add(LFUN_MATH_MODE);
add(SEPARATOR);
add(LFUN_FIGURE);
add(LFUN_DIALOG_TABULAR_INSERT);
-#if 0
- //add(LFUN_MELT);
-#endif
}
void ToolbarDefaults::read(LyXLex & lex)
{
//consistency check
- if (compare_no_case(lex.GetString(), "toolbar"))
+ if (compare_no_case(lex.getString(), "toolbar")) {
lyxerr << "Toolbar::read: ERROR wrong token:`"
- << lex.GetString() << '\'' << endl;
+ << lex.getString() << '\'' << endl;
+ }
defaults.clear();
- string func;
bool quit = false;
lex.pushTable(toolTags, TO_LAST - 1);
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
-
- while (lex.IsOK() && !quit) {
+ while (lex.isOK() && !quit) {
switch (lex.lex()) {
case TO_ADD:
- if (lex.next()) {
- func = lex.GetString();
- lyxerr[Debug::GUI]
+ if (lex.next(true)) {
+ string const func = lex.getString();
+ lyxerr[Debug::PARSER]
<< "Toolbar::read TO_ADD func: `"
<< func << "'" << endl;
add(func);
}
}
lex.popTable();
- lex.next();
}
int const tf = lyxaction.LookupFunc(func);
if (tf == -1) {
- lyxerr << "Toolbar::add: no LyX command called`"
- << func << "'exists!" << endl;
+ lyxerr << "Toolbar::add: no LyX command called `"
+ << func << "' exists!" << endl;
} else {
add(tf);
}