#pragma implementation
#endif
-#include "LyXView.h"
#include "trans.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "debug.h"
#include "trans_mgr.h"
+using std::map;
using std::endl;
}
-int Trans::Load(LyXLex & lex)
+int Trans::Load(LyXLex & lex)
{
bool error = false;
<< "'" << endl;
} else
return -1;
-
+
string const keys = lex.getString();
if (lex.next(true)) {
} else
return -1;
- string const allowed = lex.getString();
+ /* string const allowed = lex.getString(); */
AddDeadkey(accent, keys /*, allowed*/);
#else
AddDeadkey(accent, keys);
#endif
break;
- }
+ }
case KCOMB: {
string str;
lyxerr[Debug::KBMAP] << str << endl;
} else
return -1;
-
+
tex_accent accent_1 = getkeymod(str);
if (accent_1 == TEX_NOACCENT) return -1;
tex_accent accent_2= getkeymod(str);
if (accent_2 == TEX_NOACCENT) return -1;
- std::map<int, KmodInfo>::iterator it1 =
+ map<int, KmodInfo>::iterator it1 =
kmod_list_.find(accent_1);
- std::map<int, KmodInfo>::iterator it2 =
+ map<int, KmodInfo>::iterator it2 =
kmod_list_.find(accent_2);
if (it1 == kmod_list_.end()
|| it2 == kmod_list_.end()) {
// Find what key accent_2 is on - should
// check about accent_1 also
- std::map<int, string>::iterator it = keymap_.begin();
- std::map<int, string>::iterator end = keymap_.end();
+ map<int, string>::iterator it = keymap_.begin();
+ map<int, string>::iterator end = keymap_.end();
for (; it != end; ++it) {
if (!it->second.empty()
&& it->second[0] == 0
} else {
return -1;
}
-
+
InsertException(kmod_list_[accent_1].exception_list,
static_cast<char>(it->first), allowed,
true, accent_2);
bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const
{
- std::map<int, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
+ map<int, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
if (cit != kmod_list_.end()) {
i = cit->second;
return true;
FreeKeymap();
LyXLex lex(kmapTags, K_LAST-1);
lex.setFile(filename);
-
+
int const res = Load(lex);
if (res == 0) {
<< ", lyx_accent_table[" << i
<< "].name = `" << lyx_accent_table[i].name
<< "'" << endl;
-
+
if (lyx_accent_table[i].name
&& contains(p, lyx_accent_table[i].name)) {
lyxerr[Debug::KBMAP] << "Found it!" << endl;