#include "buffer.h"
#include "lyxrc.h"
#include "support/lstrings.h"
+#include "language.h"
using std::endl;
using std::pair;
l = l->next;
}
if (l == 0) {
+#if 0
// Not an exception. Check if it allowed
if (countChar(deadkey_info_.allowed, c) > 0) {
+#endif
res = DoAccent(c, deadkey_info_.accent);
+#if 0
} else {
// Not allowed
if (deadkey_!= 0)
res+= TOKEN_SEP;
res+= trans;
}
+#endif
}
currentState = init_state_;
return res;
string const TransCombinedState::normalkey(char c, string const & trans)
{
string res;
-
+
+#if 0
// Check if the key is allowed on the combination
if (countChar(comb_info_->data, c) > 0) {
- string temp;
- temp = DoAccent(c, deadkey2_info_.accent);
+#endif
+ string const temp = DoAccent(c, deadkey2_info_.accent);
res = DoAccent(temp, deadkey_info_.accent);
currentState = init_state_;
+#if 0
} else {
// Not allowed. Output deadkey1 and check deadkey2 + c
if (deadkey_ != 0)
// Call deadkey state and leave it to setup the FSM
res += deadkey_state_->normalkey(c, trans);
}
+#endif
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;
}
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(),
+ if (str[i] == '\"'
+#ifndef NO_LATEX
+ && text->getFont(current_view->buffer(),text->cursor.par(),
text->cursor.pos()).latex() == LyXFont::OFF
- && text->GetFont(current_view->buffer(),text->cursor.par(),
+#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]);
}
}
!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);
}
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;
+#if 0
i.allowed = lyx_accent_table[accent].native;
+#endif
i.data.erase();
i.exception_list = 0;