X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=d3fb833abcc1bdc759295aa38af82749fa92329a;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=ba9bb1e35fca87a347d251bfef5a8a79436537e3;hpb=4bcfc43c2958ef6dd083210ed25db4eb5a290a87;p=lyx.git

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index ba9bb1e35f..d3fb833abc 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -13,18 +13,21 @@
 
 #include "trans_mgr.h"
 
+#include "buffer.h"
 #include "BufferView.h"
+#include "CutAndPaste.h"
 #include "cursor.h"
 #include "debug.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;
@@ -201,21 +204,21 @@ TransManager::~TransManager()
 {}
 
 
-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);
 }
 
 
@@ -225,31 +228,31 @@ bool TransManager::setCharset(string const & str)
 }
 
 
-void TransManager::EnablePrimary()
+void TransManager::enablePrimary()
 {
-	if (t1_->IsDefined())
+	if (t1_->isDefined())
 		active_ = t1_.get();
 
 	lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
 }
 
 
-void TransManager::EnableSecondary()
+void TransManager::enableSecondary()
 {
-	if (t2_->IsDefined())
+	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);
 
@@ -258,19 +261,19 @@ void  TransManager::TranslateAndInsert(char c, LyXText * text)
 
 	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)
 {
 	for (string::size_type i = 0, n = str.size(); i < n; ++i)
-		text->insertChar(text->bv()->cursor(), str[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
@@ -282,20 +285,15 @@ void TransManager::insert(string const & str, LyXText * text)
 	if (chset_.getName() != lyxrc.font_norm ||
 	    !enc.first) {
 		// Could not find an encoding
-		InsetLatexAccent ins(str);
-		if (ins.canDisplay()) {
-			text->bv()->cursor().insert(new InsetLatexAccent(ins));
-		} else {
-			insertVerbatim(str, text);
-		}
+		insertVerbatim(str, text, cur);
 		return;
 	}
 	string const tmp(1, static_cast<char>(enc.second));
-	insertVerbatim(tmp, text);
+	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
@@ -304,7 +302,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
 		if (active_->isAccentDefined(accent, i) == true) {
 			string const res = trans_fsm_
 				.currentState->deadkey(c, i);
-			insert(res, t);
+			insert(res, t, cur);
 			return;
 		}
 	}
@@ -314,9 +312,12 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
 		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