#include "buffer.h"
#include "lyxrc.h"
#include "support/lstrings.h"
-#include "language.h"
using std::endl;
using std::pair;
{
deadkey_ = deadkey2_ = 0;
deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
-#if 0
- comb_info_ = 0;
-#endif
}
}
-#if 0
-string const TransInitState::normalkey(char c, string const & t)
-{
- string res;
- if (!t.empty()) res = t;
- else res = c;
-
- return res;
-}
-#else
string const TransInitState::normalkey(char c)
{
string res;
res = c;
return res;
}
-#endif
string const TransInitState::deadkey(char c, KmodInfo d)
}
-#if 0
-string const TransDeadkeyState::normalkey(char c, string const & trans)
-{
- string res;
-
- // Check if it is an exception
- KmodException l = deadkey_info_.exception_list;
- while(l != 0) {
- if (l->c == c) {
- res = l->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;
- }
- }
- currentState = init_state_;
- return res;
-}
-#else
string const TransDeadkeyState::normalkey(char c)
{
-#if 0
- string res;
-
- // Check if it is an exception
- KmodException l = deadkey_info_.exception_list;
- while(l != 0) {
- if (l->c == c) {
- res = l->data;
- break;
- }
- l = l->next;
- }
- if (l == 0) {
- res = DoAccent(c, deadkey_info_.accent);
- }
- currentState = init_state_;
- return res;
-#else
string res;
KmodException::iterator it = deadkey_info_.exception_list.begin();
}
currentState = init_state_;
return res;
-#endif
}
-#endif
string const TransDeadkeyState::deadkey(char c, KmodInfo d)
}
// Check if it is a combination or an exception
-#if 0
- KmodException l;
- l = deadkey_info_.exception_list;
-
- while (l) {
- if (l->combined == true && l->accent == d.accent) {
- deadkey2_ = c;
- deadkey2_info_ = d;
- comb_info_ = l;
- currentState = combined_state_;
- return string();
- }
- if (l->c == c) {
- res = l->data;
- deadkey_ = 0;
- deadkey_info_.accent = TEX_NOACCENT;
- currentState = init_state_;
- return res;
- }
- l = l->next;
- }
-#else
KmodException::const_iterator cit = deadkey_info_.exception_list.begin();
KmodException::const_iterator end = deadkey_info_.exception_list.end();
for (; cit != end; ++cit) {
return res;
}
}
-#endif
+
// Not a combination or an exception.
// Output deadkey1 and keep deadkey2
}
-#if 0
-string const TransCombinedState::normalkey(char c, string const & trans)
-{
- string res;
-
- // Check if the key is allowed on the combination
- if (countChar(comb_info_->data, c) > 0) {
- string const 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);
- }
- return res;
-}
-#else
string const TransCombinedState::normalkey(char c)
{
- string res;
-
string const temp = DoAccent(c, deadkey2_info_.accent);
- res = DoAccent(temp, deadkey_info_.accent);
+ string const res = DoAccent(temp, deadkey_info_.accent);
currentState = init_state_;
return res;
}
-#endif
string const TransCombinedState::deadkey(char c, KmodInfo d)
// 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] == '\"'
-#ifndef NO_LATEX
- && text->getFont(current_view->buffer(),text->cursor.par(),
- text->cursor.pos()).latex() == LyXFont::OFF
-#endif
- && 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.
if (active_ == &default_ || c == 0) {
KmodInfo i;
i.accent = accent;
-#if 0
- i.allowed = lyx_accent_table[accent].native;
-#endif
i.data.erase();
-#if 0
- i.exception_list = 0;
-#endif
string res = trans_fsm_.currentState->deadkey(c, i);
insert(res, t);
} else {