#include "ToolbarBackend.h"
#include "FuncRequest.h"
#include "Lexer.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "LyXAction.h"
#include "support/lstrings.h"
#include <boost/bind.hpp>
#include <algorithm>
-namespace lyx {
-
-using support::compare_ascii_no_case;
-using support::getVectorFromString;
-
-using std::endl;
-using std::make_pair;
-using std::string;
-using std::vector;
-using std::find_if;
+using namespace std;
+using namespace lyx::support;
+namespace lyx {
namespace {
-class ToolbarNamesEqual : public std::unary_function<ToolbarInfo, bool> {
+class ToolbarNamesEqual
+{
public:
- ToolbarNamesEqual(string const & name)
- : name_(name) {}
+ ToolbarNamesEqual(string const & name) : name_(name) {}
bool operator()(ToolbarInfo const & tbinfo) const
{
return tbinfo.name == name_;
//consistency check
if (compare_ascii_no_case(lex.getString(), "toolbar")) {
- lyxerr << "ToolbarInfo::read: ERROR wrong token:`"
- << lex.getString() << '\'' << endl;
+ LYXERR0("ToolbarInfo::read: ERROR wrong token:`"
+ << lex.getString() << '\'');
}
lex.next(true);
// FIXME what to do here?
if (!lex) {
- lyxerr << "ToolbarInfo::read: Malformed toolbar "
- "description " << lex.getString() << endl;
+ LYXERR0("ToolbarInfo::read: Malformed toolbar "
+ "description " << lex.getString());
return *this;
}
//consistency check
if (compare_ascii_no_case(lex.getString(), "toolbarset")) {
- lyxerr << "ToolbarBackend::readToolbars: ERROR wrong token:`"
- << lex.getString() << '\'' << endl;
+ LYXERR0("ToolbarBackend::readToolbars: ERROR wrong token:`"
+ << lex.getString() << '\'');
}
lex.pushTable(toolTags, TO_LAST - 1);
{
//consistency check
if (compare_ascii_no_case(lex.getString(), "toolbars")) {
- lyxerr << "ToolbarBackend::readToolbarSettings: ERROR wrong token:`"
- << lex.getString() << '\'' << endl;
+ LYXERR0("ToolbarBackend::readToolbarSettings: ERROR wrong token:`"
+ << lex.getString() << '\'');
}
lex.next(true);
}
if (tcit == tend) {
- lyxerr << "ToolbarBackend: undefined toolbar "
- << name << endl;
+ LYXERR0("ToolbarBackend: undefined toolbar " << name);
return;
}
flag = ToolbarInfo::MATH;
else if (!compare_ascii_no_case(*cit, "table"))
flag = ToolbarInfo::TABLE;
+ else if (!compare_ascii_no_case(*cit, "mathmacrotemplate"))
+ flag = ToolbarInfo::MATHMACROTEMPLATE;
else if (!compare_ascii_no_case(*cit, "review"))
flag = ToolbarInfo::REVIEW;
else if (!compare_ascii_no_case(*cit, "top"))
flag = ToolbarInfo::LEFT;
else if (!compare_ascii_no_case(*cit, "right"))
flag = ToolbarInfo::RIGHT;
+ else if (!compare_ascii_no_case(*cit, "auto"))
+ flag = ToolbarInfo::AUTO;
else {
- lyxerr << "ToolbarBackend::readToolbarSettings: unrecognised token:`"
- << *cit << '\'' << endl;
+ LYXERR(Debug::ANY,
+ "ToolbarBackend::readToolbarSettings: unrecognised token:`"
+ << *cit << '\'');
}
tcit->flags = static_cast<ToolbarInfo::Flags>(tcit->flags | flag);
}