{
deadkey_ = deadkey2_ = 0;
deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
- comb_info_ = 0;
}
}
-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;
}
}
-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;
}
// 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
}
-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;
}
// TransManager
+// Initialize static member.
+Trans TransManager::default_;
+
+
TransManager::TransManager()
: active_(0), t1_(new Trans), t2_(new Trans)
{}
-Trans * TransManager::default_ = new Trans;
-
-
TransManager::~TransManager()
{
delete t1_;
void TransManager::DisableKeymap()
{
- active_ = default_;
+ active_ = &default_;
lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
}
// Process with tokens
string temp;
- while(res.length() > 0) {
+ while (res.length() > 0) {
res = split(res, temp, TransState::TOKEN_SEP);
insert(temp, 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]);
}
}
{
// 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.
!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<char>(enc.second);
+ string tmp;
+ tmp += static_cast<char>(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 {
projects / lyx.git / blobdiff