#include "LyXView.h"
#include "trans.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include "tex-strings.h"
#include "lyxlex.h"
#include "debug.h"
{
bool error = false;
- while (lex.IsOK() && !error) {
+ while (lex.isOK() && !error) {
switch (lex.lex()) {
case KMOD:
{
} else
return -1;
- string const keys = lex.GetString();
+ string const keys = lex.getString();
if (lex.next(true)) {
if (lyxerr.debugging(Debug::KBMAP))
} else
return -1;
- tex_accent accent = getkeymod(lex.GetString());
+ tex_accent accent = getkeymod(lex.getString());
if (accent == TEX_NOACCENT)
return -1;
} else
return -1;
- string const allowed = lex.GetString();
+ string const allowed = lex.getString();
AddDeadkey(accent, keys /*, allowed*/);
#else
AddDeadkey(accent, keys);
}
string allowed;
if (lex.next()) {
- allowed = lex.GetString();
+ allowed = lex.getString();
lyxerr[Debug::KBMAP] << "allowed: "
<< allowed << endl;
} else {
if (lex.next(true)) {
string string_to = lex.text();
-#if 0
keymap_[key_from] = string_to;
-#else
- keymap_[key_from] = string_to;
-#endif
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "\t`" << string_to << "'"
<< endl;
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "\t`" << lex.text() << "'"
<< endl;
- accent = getkeymod(lex.GetString());
+ accent = getkeymod(lex.getString());
} else
return -1;