#include <config.h>
#include "trans_mgr.h"
-#include "trans.h"
-#include "lyxtext.h"
+
+#include "buffer.h"
+#include "BufferView.h"
+#include "CutAndPaste.h"
+#include "cursor.h"
#include "debug.h"
-#include "insets/insetlatexaccent.h"
#include "lyxrc.h"
+#include "lyxtext.h"
+#include "trans.h"
+
+#include "insets/insetlatexaccent.h"
+
#include "support/lstrings.h"
-using lyx::support::split;
+
+namespace lyx {
+
+using support::split;
using std::endl;
using std::string;
{}
+// For the sake of boost::scoped_ptr.
TransManager::~TransManager()
-{
- delete t1_;
- delete t2_;
-}
+{}
-int TransManager::SetPrimary(string const & language)
+int TransManager::setPrimary(string const & language)
{
- if (t1_->GetName() == language)
+ if (t1_->getName() == language)
return 0;
- return t1_->Load(language);
+ return t1_->load(language);
}
-int TransManager::SetSecondary(string const & language)
+int TransManager::setSecondary(string const & language)
{
- if (t2_->GetName() == language)
+ if (t2_->getName() == language)
return 0;
- return t2_->Load(language);
+ return t2_->load(language);
}
}
-void TransManager::EnablePrimary()
+void TransManager::enablePrimary()
{
- if (t1_->IsDefined())
- active_ = t1_;
+ if (t1_->isDefined())
+ active_ = t1_.get();
lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
}
-void TransManager::EnableSecondary()
+void TransManager::enableSecondary()
{
- if (t2_->IsDefined())
- active_ = t2_;
+ if (t2_->isDefined())
+ active_ = t2_.get();
lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
}
-void TransManager::DisableKeymap()
+void TransManager::disableKeymap()
{
active_ = &default_;
lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
}
-void TransManager::TranslateAndInsert(char c, LyXText * text)
+void TransManager::translateAndInsert(char c, LyXText * text, LCursor & cur)
{
string res = active_->process(c, *this);
while (res.length() > 0) {
res = split(res, temp, TransState::TOKEN_SEP);
- insert(temp, text);
+ insert(temp, text, cur);
}
}
-void TransManager::insertVerbatim(string const & str, LyXText * text)
+void TransManager::insertVerbatim(string const & str, LyXText * text, LCursor & cur)
{
- string::size_type const l = str.length();
-
- for (string::size_type i = 0; i < l; ++i) {
- text->insertChar(str[i]);
- }
+ for (string::size_type i = 0, n = str.size(); i < n; ++i)
+ text->insertChar(cur, str[i]);
}
-void TransManager::insert(string const & str, LyXText * text)
+void TransManager::insert(string const & str, LyXText * text, LCursor & cur)
{
// Go through the character encoding only if the current
// encoding (chset_->name()) matches the current font_norm
// Could not find an encoding
InsetLatexAccent ins(str);
if (ins.canDisplay()) {
- text->insertInset(
- new InsetLatexAccent(ins));
+ cap::replaceSelection(cur);
+ cur.insert(new InsetLatexAccent(ins));
+ cur.posRight();
} else {
- insertVerbatim(str, text);
+ insertVerbatim(str, text, cur);
}
return;
}
- string tmp;
- tmp += static_cast<char>(enc.second);
- insertVerbatim(tmp, text);
+ string const tmp(1, static_cast<char>(enc.second));
+ insertVerbatim(tmp, text, cur);
}
-void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
+void TransManager::deadkey(char c, tex_accent accent, LyXText * t, LCursor & cur)
{
if (c == 0 && active_ != &default_) {
// A deadkey was pressed that cannot be printed
if (active_->isAccentDefined(accent, i) == true) {
string const res = trans_fsm_
.currentState->deadkey(c, i);
- insert(res, t);
+ insert(res, t, cur);
return;
}
}
i.accent = accent;
i.data.erase();
string res = trans_fsm_.currentState->deadkey(c, i);
- insert(res, t);
+ insert(res, t, cur);
} else {
// Go through the translation
- TranslateAndInsert(c, t);
+ translateAndInsert(c, t, cur);
}
}
+
+
+} // namespace lyx