X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=90afbc1fba149a13cde689fb2439862a05b88bd0;hb=8283e978f8d621041c432b9b88a476bfd567385c;hp=7fe6879dff1b617e8b590c5e138577b0362416ad;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git diff --git a/src/trans_mgr.C b/src/trans_mgr.C index 7fe6879dff..90afbc1fba 100644 --- a/src/trans_mgr.C +++ b/src/trans_mgr.C @@ -19,8 +19,8 @@ using std::endl; using std::pair; -extern string DoAccent(string const &, tex_accent); -extern string DoAccent(char, tex_accent); +extern string const DoAccent(string const &, tex_accent); +extern string const DoAccent(char, tex_accent); extern BufferView * current_view; @@ -29,7 +29,6 @@ TransFSMData::TransFSMData() { deadkey_ = deadkey2_ = 0; deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT; - comb_info_ = 0; } @@ -44,17 +43,15 @@ TransInitState::TransInitState() } -string TransInitState::normalkey(char c, char * t) +string const TransInitState::normalkey(char c) { string res; - if (t) res = t; - else res = c; - + res = c; return res; } -string TransInitState::deadkey(char c, KmodInfo d) +string const TransInitState::deadkey(char c, KmodInfo d) { deadkey_ = c; deadkey_info_ = d; @@ -70,41 +67,31 @@ TransDeadkeyState::TransDeadkeyState() } -string TransDeadkeyState::normalkey(char c, char * trans) +string const TransDeadkeyState::normalkey(char c) { string res; - - // Check if it is an exception - KmodException l = deadkey_info_.exception_list; - while(l != 0) { - if (l->c == c) { - res = l->data; + + KmodException::iterator it = deadkey_info_.exception_list.begin(); + KmodException::iterator end = deadkey_info_.exception_list.end(); + + for (; it != end; ++it) { + if (it->c == c) { + res = it->data; break; } - l = l->next; } - if (l == 0) { - // Not an exception. Check if it allowed - if (current_view->buffer()->params.allowAccents == true || - countChar(deadkey_info_.allowed, c) > 0) { - res = DoAccent(c, deadkey_info_.accent); - } else { - // Not allowed - if (deadkey_!= 0) - res = deadkey_; - res+= TOKEN_SEP; - res+= trans; - } + if (it == end) { + res = DoAccent(c, deadkey_info_.accent); } currentState = init_state_; return res; } -string TransDeadkeyState::deadkey(char c, KmodInfo d) +string const TransDeadkeyState::deadkey(char c, KmodInfo d) { string res; - + // Check if the same deadkey was typed twice if (deadkey_ == c) { res = deadkey_; @@ -113,32 +100,30 @@ string TransDeadkeyState::deadkey(char c, KmodInfo d) currentState = init_state_; return res; } - + // Check if it is a combination or an exception - KmodException l; - l = deadkey_info_.exception_list; - - while(l) { - if (l->combined == true && l->accent == d.accent) { + KmodException::const_iterator cit = deadkey_info_.exception_list.begin(); + KmodException::const_iterator end = deadkey_info_.exception_list.end(); + for (; cit != end; ++cit) { + if (cit->combined == true && cit->accent == d.accent) { deadkey2_ = c; deadkey2_info_ = d; - comb_info_ = l; + comb_info_ = (*cit); currentState = combined_state_; return string(); } - if (l->c == c) { - res = l->data; + if (cit->c == c) { + res = cit->data; deadkey_ = 0; deadkey_info_.accent = TEX_NOACCENT; currentState = init_state_; return res; } - l = l->next; } - - // Not a combination or an exception. + + // Not a combination or an exception. // Output deadkey1 and keep deadkey2 - + if (deadkey_!= 0) res = deadkey_; deadkey_ = c; @@ -154,31 +139,16 @@ TransCombinedState::TransCombinedState() } -string TransCombinedState::normalkey(char c, char * trans) +string const TransCombinedState::normalkey(char c) { - string res; - - // Check if the key is allowed on the combination - if (countChar(comb_info_->data, c) > 0) { - string temp; - temp = DoAccent(c, deadkey2_info_.accent); - res = DoAccent(temp, deadkey_info_.accent); - currentState = init_state_; - } else { - // Not allowed. Output deadkey1 and check deadkey2 + c - if (deadkey_ != 0) - res += deadkey_; - res += TOKEN_SEP; - deadkey_ = deadkey2_; - deadkey_info_ = deadkey2_info_; - // Call deadkey state and leave it to setup the FSM - res += deadkey_state_->normalkey(c, trans); - } + string const temp = DoAccent(c, deadkey2_info_.accent); + string const res = DoAccent(temp, deadkey_info_.accent); + currentState = init_state_; return res; } -string TransCombinedState::deadkey(char c, KmodInfo d) +string const TransCombinedState::deadkey(char c, KmodInfo d) { // Third key in a row. Output the first one and // reenter with shifted deadkeys @@ -206,16 +176,17 @@ TransFSM::TransFSM(): // TransManager +// Initialize static member. +Trans TransManager::default_; + + TransManager::TransManager() : active_(0), t1_(new Trans), t2_(new Trans) {} -Trans * TransManager::default_ = new Trans; - - -TransManager::~TransManager() -{ +TransManager::~TransManager() +{ delete t1_; delete t2_; } @@ -223,9 +194,9 @@ TransManager::~TransManager() int TransManager::SetPrimary(string const & language) { - if (t1_->GetName() == language) + if (t1_->GetName() == language) return 0; - + return t1_->Load(language); } @@ -234,14 +205,14 @@ int TransManager::SetSecondary(string const & language) { if (t2_->GetName() == language) return 0; - + return t2_->Load(language); } -bool TransManager::setCharset(char const * set) +bool TransManager::setCharset(string const & str) { - return chset_.loadFile(set); + return chset_.loadFile(str); } @@ -249,7 +220,7 @@ void TransManager::EnablePrimary() { if (t1_->IsDefined()) active_ = t1_; - + lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl; } @@ -264,7 +235,7 @@ void TransManager::EnableSecondary() void TransManager::DisableKeymap() { - active_ = default_; + active_ = &default_; lyxerr[Debug::KBMAP] << "Disabling keymap" << endl; } @@ -272,11 +243,11 @@ void TransManager::DisableKeymap() void TransManager::TranslateAndInsert(char c, LyXText * text) { string res = active_->process(c, *this); - + // Process with tokens string temp; - - while(res.length() > 0) { + + while (res.length() > 0) { res = split(res, temp, TransState::TOKEN_SEP); insert(temp, text); } @@ -284,67 +255,60 @@ void TransManager::TranslateAndInsert(char c, LyXText * text) void TransManager::insertVerbatim(string const & str, LyXText * text) -{ - int l = str.length(); - - for (int i = 0; i < l; ++i){ - if (str[i] == '\"' - && text->GetFont(text->cursor.par(), - text->cursor.pos()).latex() == LyXFont::OFF - && text->GetFont(text->cursor.par(), - text->cursor.pos()).language()->lang() != "hebrew") - current_view->insertCorrectQuote(); - else - text->InsertChar(str[i]); +{ + string::size_type const l = str.length(); + + for (string::size_type i = 0; i < l; ++i) { + text->insertChar(current_view, str[i]); } } void TransManager::insert(string const & str, LyXText * text) { - // Go through the character encoding only if the current + // Go through the character encoding only if the current // encoding (chset_->name()) matches the current font_norm - // (lyrxc->font_norm - + // (lyrxc->font_norm) + // Is false to speak about "only if" the current encoding will // almost always be equal to font_norm. pair enc = chset_.encodeString(str); - if (chset_.getName() != lyxrc.font_norm || + if (chset_.getName() != lyxrc.font_norm || !enc.first) { // Could not find an encoding InsetLatexAccent ins(str); - if (ins.CanDisplay()) { - text->InsertInset(new InsetLatexAccent(ins)); + if (ins.canDisplay()) { + text->insertInset(current_view, + new InsetLatexAccent(ins)); } else { insertVerbatim(str, text); } return; } - string tmp; tmp += static_cast(enc.second); + string tmp; + tmp += static_cast(enc.second); insertVerbatim(tmp, text); } void TransManager::deadkey(char c, tex_accent accent, LyXText * t) { - if (c == 0 && active_ != default_) { + if (c == 0 && active_ != &default_) { // A deadkey was pressed that cannot be printed // or a accent command was typed in the minibuffer KmodInfo i; if (active_->isAccentDefined(accent, i) == true) { - string res = trans_fsm_.currentState->deadkey(c, i); + string const res = trans_fsm_ + .currentState->deadkey(c, i); insert(res, t); return; } } - - if (active_ == default_ || c == 0) { + + if (active_ == &default_ || c == 0) { KmodInfo i; i.accent = accent; - i.allowed = lyx_accent_table[accent].native; i.data.erase(); - i.exception_list = 0; - string res = trans_fsm_.currentState->deadkey(c, i); insert(res, t); } else {