X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=fa077ce907cd9284c88f69a83542b812ea8f0fec;hb=5702f22ef0ea3d167fc5f327002d7006eef657b4;hp=88b4190e48ee0d3922946376850910e04c3e089b;hpb=3eea90dbbc24f9dafc6c0a42d5b14fe213dbcd6a;p=lyx.git diff --git a/src/trans_mgr.C b/src/trans_mgr.C index 88b4190e48..fa077ce907 100644 --- a/src/trans_mgr.C +++ b/src/trans_mgr.C @@ -29,7 +29,6 @@ TransFSMData::TransFSMData() { deadkey_ = deadkey2_ = 0; deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT; - comb_info_ = 0; } @@ -44,12 +43,10 @@ TransInitState::TransInitState() } -string const TransInitState::normalkey(char c, string const & t) +string const TransInitState::normalkey(char c) { string res; - if (!t.empty()) res = t; - else res = c; - + res = c; return res; } @@ -70,30 +67,21 @@ TransDeadkeyState::TransDeadkeyState() } -string const TransDeadkeyState::normalkey(char c, string const & 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 (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; @@ -114,27 +102,25 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d) } // 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. // Output deadkey1 and keep deadkey2 @@ -153,26 +139,11 @@ TransCombinedState::TransCombinedState() } -string const TransCombinedState::normalkey(char c, string const & 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; } @@ -276,7 +247,7 @@ void TransManager::TranslateAndInsert(char c, LyXText * text) // Process with tokens string temp; - while(res.length() > 0) { + while (res.length() > 0) { res = split(res, temp, TransState::TOKEN_SEP); insert(temp, text); } @@ -288,14 +259,7 @@ void TransManager::insertVerbatim(string const & str, LyXText * text) string::size_type const l = str.length(); for (string::size_type i = 0; i < l; ++i) { - if (str[i] == '\"' - && text->GetFont(current_view->buffer(),text->cursor.par(), - text->cursor.pos()).latex() == LyXFont::OFF - && text->GetFont(current_view->buffer(),text->cursor.par(), - text->cursor.pos()).language()->lang() != "hebrew") - current_view->insertCorrectQuote(); - else - text->InsertChar(current_view, str[i]); + text->insertChar(current_view, str[i]); } } @@ -304,7 +268,7 @@ void TransManager::insert(string const & str, LyXText * text) { // 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. @@ -313,14 +277,16 @@ void TransManager::insert(string const & str, LyXText * text) !enc.first) { // Could not find an encoding InsetLatexAccent ins(str); - if (ins.CanDisplay()) { - text->InsertInset(current_view, 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); } @@ -332,7 +298,8 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t) // 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; } @@ -341,10 +308,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t) 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 {