Trans::Trans()
{
- for(int i = 0; i < TEX_MAX_ACCENT + 1; ++i)
+ for (int i = 0; i < TEX_MAX_ACCENT + 1; ++i)
kmod_list_[i] = 0;
}
void Trans::FreeKeymap()
{
- for(int i = 0; i < 256; ++i)
+ for (int i = 0; i < 256; ++i)
if (!keymap_[i].empty()) {
keymap_[i].erase();
}
- for(int i = 0; i < TEX_MAX_ACCENT + 1; ++i)
+ for (int i = 0; i < TEX_MAX_ACCENT + 1; ++i)
if (kmod_list_[i]) {
FreeException(kmod_list_[i]->exception_list);
delete kmod_list_[i];
kmod_list_[accent] = new kmod_list_decl;
kmod_list_[accent]->data = keys;
kmod_list_[accent]->accent = accent;
+#if 0
if (allowed == "native") {
kmod_list_[accent]->allowed= lyx_accent_table[accent].native;
- } else {
+ } else {
+#endif
kmod_list_[accent]->allowed = allowed;
+#if 0
}
+#endif
- for(string::size_type i = 0; i < keys.length(); ++i) {
-#if 0
- string * temp =
- &keymap_[static_cast<unsigned char>(keys[i])];
-#warning this is not really clean we should find a cleaner way (Jug)
- *temp = "xx"; /* this is needed for the being sure that
- the below assignment is not assigned to
- a nullpointer (if size of string = 0)
- */
- (*temp)[0] = 0;
- (*temp)[1] = accent;
-#else
+ for (string::size_type i = 0; i < keys.length(); ++i) {
string & temp =
keymap_[static_cast<unsigned char>(keys[i])];
if (!temp.empty())
// Lgb
temp += char(0);
temp += char(accent);
-#endif
}
kmod_list_[accent]->exception_list = 0;
}
bool error = false;
while (lex.IsOK() && !error) {
- switch(lex.lex()) {
+ switch (lex.lex()) {
case KMOD:
{
if (lyxerr.debugging(Debug::KBMAP))
string keys = lex.GetString();
if (lex.next(true)) {
- if ( lyxerr.debugging(Debug::KBMAP))
+ if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "accent\t`" << lex.text()
<< "'" << endl;
} else
// Find what key accent_2 is on - should
// check about accent_1 also
int key = 0;
- for(; key < 256; ++key) {
+ for (; key < 256; ++key) {
if (!keymap_[key].empty()
&& keymap_[key][0] == 0
&& keymap_[key][1] == accent_2)
string const Trans::process(char c, TransManager & k)
{
- string dummy("?");
- string dt = dummy;
+ //string dummy("?");
+ //string dt = dummy;
+ string dt("?");
string const t = Match(static_cast<unsigned char>(c));
if (t.empty() && c != 0) {
dt[0] = c;
return k.normalkey(c, dt);
- } else if (!t.empty()) {
+ } else if (!t.empty() && t[0] != char(0)) {
dt = t;
return k.normalkey(c, dt);
} else {
int Trans::Load(string const & language)
{
- string filename = LibFileSearch("kbd", language, "kmap");
+ string const filename = LibFileSearch("kbd", language, "kmap");
if (filename.empty())
return -1;
LyXLex lex(kmapTags, K_LAST-1);
lex.setFile(filename);
- int res = Load(lex);
+ int const res = Load(lex);
if (res == 0) {
name_ = language;
<< "].name = `" << lyx_accent_table[i].name
<< "'" << endl;
- if ( lyx_accent_table[i].name
+ if (lyx_accent_table[i].name
&& contains(p, lyx_accent_table[i].name)) {
lyxerr[Debug::KBMAP] << "Found it!" << endl;
return static_cast<tex_accent>(i);