#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;
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;
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();
+ KmodException::iterator end = deadkey_info_.exception_list.end();
+
+ for (; it != end; ++it) {
+ if (it->c == c) {
+ res = it->data;
+ break;
+ }
+ }
+ if (it == end) {
+ res = DoAccent(c, deadkey_info_.accent);
+ }
+ 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) {
+ while (l) {
if (l->combined == true && l->accent == d.accent) {
deadkey2_ = c;
deadkey2_info_ = d;
}
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) {
+ if (cit->combined == true && cit->accent == d.accent) {
+ deadkey2_ = c;
+ deadkey2_info_ = d;
+ comb_info_ = (*cit);
+ currentState = combined_state_;
+ return string();
+ }
+ if (cit->c == c) {
+ res = cit->data;
+ deadkey_ = 0;
+ deadkey_info_.accent = TEX_NOACCENT;
+ currentState = init_state_;
+ 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);
}
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);
+ currentState = init_state_;
+ return res;
+}
+#endif
string const TransCombinedState::deadkey(char c, KmodInfo d)
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.
!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);
}
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 {