X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=afa2e9b7e73308e3fed69b900c52c895ba0e4034;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=52d7a26cd4c3ee456d7712eceae252f4238d6130;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git diff --git a/src/trans.C b/src/trans.C index 52d7a26cd4..afa2e9b7e7 100644 --- a/src/trans.C +++ b/src/trans.C @@ -1,46 +1,24 @@ #include #ifdef __GNUG__ -#pragma implementation "trans.h" +#pragma implementation #endif -#include "LyXView.h" #include "trans.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "tex-strings.h" #include "lyxlex.h" #include "debug.h" #include "trans_mgr.h" +using std::map; using std::endl; // KmodInfo KmodInfo::KmodInfo() { - exception_list = 0; -} - - -// Default Trans -bool DefaultTrans::init_ = false; - - -DefaultTrans::DefaultTrans() -{ - if (init_ == false) { - // Do initialization - init_ = true; - } -} - - -string const DefaultTrans::process(char c, TransManager & k) -{ - char dummy[2] = "?"; - dummy[0] = c; - - return k.normalkey(c, dummy); } @@ -48,9 +26,6 @@ string const DefaultTrans::process(char c, TransManager & k) Trans::Trans() { - int i = 0; - for(i = 0; i < TEX_MAX_ACCENT + 1; ++i) - kmod_list_[i] = 0; } @@ -60,45 +35,30 @@ Trans::~Trans() } -void Trans::InsertException(Trans::keyexc & exclist, char c, +void Trans::InsertException(KmodException & exclist, char c, string const & data, bool flag, tex_accent accent) { - keyexc p = new Keyexc; - p->next = exclist; - p->c = c; - - p->data = data; - p->combined = flag; - p->accent = accent; - - exclist = p; + Keyexc p; + p.c = c; + p.data = data; + p.combined = flag; + p.accent = accent; + exclist.insert(exclist.begin(), p); + // or just + // exclist.push_back(p); } -void Trans::FreeException(Trans::keyexc & exclist) +void Trans::FreeException(KmodException & exclist) { - Trans::keyexc p = exclist; - while (p) { - p = exclist->next; - delete exclist; - exclist = p; - } + exclist.clear(); } void Trans::FreeKeymap() { - for(int i = 0; i < 256; ++i) - if (!keymap_[i].empty()) { - //delete keymap_[i]; - keymap_[i].erase(); - } - 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_[i] = 0; - } + kmod_list_.clear(); + keymap_.clear(); } @@ -114,7 +74,7 @@ string const & Trans::GetName() const } -enum _kmaptags { +enum kmaptags_ { KCOMB = 1, KMOD, KMAP, @@ -134,30 +94,19 @@ struct keyword_item kmapTags[K_LAST - 1] = { tex_accent getkeymod(string const &); -void Trans::AddDeadkey(tex_accent accent, string const & keys, - string const & allowed) +void Trans::AddDeadkey(tex_accent accent, string const & keys) { - if (kmod_list_[accent]) { - FreeException(kmod_list_[accent]->exception_list); - - delete kmod_list_[accent]; - } - - kmod_list_[accent] = new kmod_list_decl; - kmod_list_[accent]->data = keys; - kmod_list_[accent]->accent = accent; - if (allowed == "native") { - kmod_list_[accent]->allowed= lyx_accent_table[accent].native; - } else { - kmod_list_[accent]->allowed = allowed; + KmodInfo tmp; + tmp.data = keys; + tmp.accent = accent; + kmod_list_[accent] = tmp; + + for (string::size_type i = 0; i < keys.length(); ++i) { + string tmp; + tmp += char(0); + tmp += char(accent); + keymap_[keys[i]] = tmp; } - - for(string::size_type i = 0; i < keys.length(); ++i) { - string * temp = - &keymap_[static_cast(keys[i])]; - (*temp)[0] = 0; (*temp)[1] = accent; - } - kmod_list_[accent]->exception_list = 0; } @@ -165,8 +114,8 @@ int Trans::Load(LyXLex & lex) { bool error = false; - while (lex.IsOK() && !error) { - switch(lex.lex()) { + while (lex.isOK() && !error) { + switch (lex.lex()) { case KMOD: { if (lyxerr.debugging(Debug::KBMAP)) @@ -177,21 +126,25 @@ int Trans::Load(LyXLex & lex) << "'" << endl; } else return -1; - - string keys = lex.GetString(); + + string const keys = lex.getString(); if (lex.next(true)) { - if ( lyxerr.debugging(Debug::KBMAP)) + if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "accent\t`" << lex.text() << "'" << endl; } else return -1; - tex_accent accent = getkeymod(lex.GetString()); + tex_accent accent = getkeymod(lex.getString()); if (accent == TEX_NOACCENT) return -1; +#if 1 +//#warning This code should be removed... + // But we need to fix up all the kmap files first + // so that this field is not present anymore. if (lex.next(true)) { if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "allowed\t`" << lex.text() @@ -199,11 +152,13 @@ int Trans::Load(LyXLex & lex) } else return -1; - string allowed = lex.GetString(); - - AddDeadkey(accent, keys, allowed); + /* string const allowed = lex.getString(); */ + AddDeadkey(accent, keys /*, allowed*/); +#else + AddDeadkey(accent, keys); +#endif break; - } + } case KCOMB: { string str; @@ -213,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; @@ -226,30 +181,36 @@ int Trans::Load(LyXLex & lex) tex_accent accent_2= getkeymod(str); if (accent_2 == TEX_NOACCENT) return -1; - if (kmod_list_[accent_1] == 0 - || kmod_list_[accent_2] == 0) + map::iterator it1 = + kmod_list_.find(accent_1); + map::iterator it2 = + kmod_list_.find(accent_2); + if (it1 == kmod_list_.end() + || it2 == kmod_list_.end()) { return -1; + } // Find what key accent_2 is on - should // check about accent_1 also - int key = 0; - for(; key < 256; ++key) { - if (!keymap_[key].empty() - && keymap_[key][0] == 0 - && keymap_[key][1] == accent_2) + map::iterator it = keymap_.begin(); + map::iterator end = keymap_.end(); + for (; it != end; ++it) { + if (!it->second.empty() + && it->second[0] == 0 + && it->second[1] == accent_2) break; } string allowed; - if (lex.next()) { - allowed = lex.GetString(); + allowed = lex.getString(); lyxerr[Debug::KBMAP] << "allowed: " << allowed << endl; - } else + } else { return -1; + } - InsertException(kmod_list_[accent_1]->exception_list, - static_cast(key), allowed, + InsertException(kmod_list_[accent_1].exception_list, + static_cast(it->first), allowed, true, accent_2); } break; @@ -268,8 +229,6 @@ int Trans::Load(LyXLex & lex) if (lex.next(true)) { string string_to = lex.text(); - //char * string_to = - // strcpy(new char[strlen(t)+1], t); keymap_[key_from] = string_to; if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "\t`" << string_to << "'" @@ -290,7 +249,7 @@ int Trans::Load(LyXLex & lex) if (lyxerr.debugging(Debug::KBMAP)) lyxerr << "\t`" << lex.text() << "'" << endl; - accent = getkeymod(lex.GetString()); + accent = getkeymod(lex.getString()); } else return -1; @@ -310,7 +269,7 @@ int Trans::Load(LyXLex & lex) } else return -1; - InsertException(kmod_list_[accent]->exception_list, + InsertException(kmod_list_[accent].exception_list, key, str); break; } @@ -329,8 +288,9 @@ int Trans::Load(LyXLex & lex) bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const { - if (kmod_list_[accent] != 0) { - i = *kmod_list_[accent]; + map::const_iterator cit = kmod_list_.find(accent); + if (cit != kmod_list_.end()) { + i = cit->second; return true; } return false; @@ -339,34 +299,31 @@ bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const string const Trans::process(char c, TransManager & k) { - string dummy("?"); - string dt = dummy; string const t = Match(static_cast(c)); if (t.empty() && c != 0) { - dt[0] = c; - return k.normalkey(c, dt); - } else if (!t.empty()) { - dt = t; - return k.normalkey(c, dt); + return k.normalkey(c); + } else if (!t.empty() && t[0] != char(0)) { + //return k.normalkey(c); + return t; } else { return k.deadkey(c, - *kmod_list_[static_cast(t[1])]); + kmod_list_[static_cast(t[1])]); } } int Trans::Load(string const & language) { - string filename = LibFileSearch("kbd", language, "kmap"); + string const filename = LibFileSearch("kbd", language, "kmap"); if (filename.empty()) return -1; FreeKeymap(); - LyXLex lex(kmapTags, K_LAST-1); + LyXLex lex(kmapTags, K_LAST - 1); lex.setFile(filename); - - int res = Load(lex); + + int const res = Load(lex); if (res == 0) { name_ = language; @@ -386,8 +343,8 @@ tex_accent getkeymod(string const & p) << ", lyx_accent_table[" << i << "].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(i);