X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=afa2e9b7e73308e3fed69b900c52c895ba0e4034;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=87caa575a478bc0be7b236d35127559757a23e21;hpb=7ea7dabed1b72cc25dcbdc482ac006f2b61dacfd;p=lyx.git diff --git a/src/trans.C b/src/trans.C index 87caa575a4..afa2e9b7e7 100644 --- a/src/trans.C +++ b/src/trans.C @@ -4,7 +4,6 @@ #pragma implementation #endif -#include "LyXView.h" #include "trans.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -111,7 +110,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys) } -int Trans::Load(LyXLex & lex) +int Trans::Load(LyXLex & lex) { bool error = false; @@ -127,7 +126,7 @@ int Trans::Load(LyXLex & lex) << "'" << endl; } else return -1; - + string const keys = lex.getString(); if (lex.next(true)) { @@ -159,7 +158,7 @@ int Trans::Load(LyXLex & lex) AddDeadkey(accent, keys); #endif break; - } + } case KCOMB: { string str; @@ -169,7 +168,7 @@ int Trans::Load(LyXLex & lex) lyxerr[Debug::KBMAP] << str << endl; } else return -1; - + tex_accent accent_1 = getkeymod(str); if (accent_1 == TEX_NOACCENT) return -1; @@ -209,7 +208,7 @@ int Trans::Load(LyXLex & lex) } else { return -1; } - + InsertException(kmod_list_[accent_1].exception_list, static_cast(it->first), allowed, true, accent_2); @@ -321,9 +320,9 @@ int Trans::Load(string const & language) return -1; FreeKeymap(); - LyXLex lex(kmapTags, K_LAST-1); + LyXLex lex(kmapTags, K_LAST - 1); lex.setFile(filename); - + int const res = Load(lex); if (res == 0) { @@ -344,7 +343,7 @@ tex_accent getkeymod(string const & p) << ", 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;