X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=b02a9eba4f0c5cc04421472b4b56fa26b4494927;hb=ce7c45bb437c44dae15f96148cb9b793ab0b895c;hp=547452a0780a8afbbc2fd7ee971754cd5e275b45;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 547452a078..b02a9eba4f 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -1,27 +1,43 @@
-#include <config.h>
+/**
+ * \file trans_mgr.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation "trans_mgr.h"
-#endif
+#include <config.h>
 
 #include "trans_mgr.h"
-#include "trans.h"
-#include "lyxtext.h"
-#include "LString.h"
-#include "debug.h"
-#include "chset.h"
-#include "insets/insetlatexaccent.h"
-#include "BufferView.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"
 
+
+namespace lyx {
+
+using support::split;
+
 using std::endl;
+using std::string;
 using std::pair;
 
+
 extern string const DoAccent(string const &, tex_accent);
 extern string const DoAccent(char, tex_accent);
-extern BufferView * current_view;
 
 
 // TransFSMData
@@ -29,9 +45,6 @@ TransFSMData::TransFSMData()
 {
 	deadkey_ = deadkey2_ = 0;
 	deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
-#if 0
-	comb_info_ = 0;
-#endif
 }
 
 
@@ -46,23 +59,12 @@ TransInitState::TransInitState()
 }
 
 
-#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)
@@ -81,58 +83,10 @@ TransDeadkeyState::TransDeadkeyState()
 }
 
 
-#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();
 	KmodException::iterator end = deadkey_info_.exception_list.end();
 
@@ -147,15 +101,13 @@ string const TransDeadkeyState::normalkey(char c)
 	}
 	currentState = init_state_;
 	return res;
-#endif
 }
-#endif
 
 
 string const TransDeadkeyState::deadkey(char c, KmodInfo d)
 {
 	string res;
-	
+
 	// Check if the same deadkey was typed twice
 	if (deadkey_ == c) {
 		res = deadkey_;
@@ -164,30 +116,8 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
 		currentState = init_state_;
 		return res;
 	}
-	
+
 	// 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) {
@@ -206,10 +136,10 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
 			return res;
 		}
 	}
-#endif
-	// Not a combination or an exception. 
+
+	// Not a combination or an exception.
 	// Output deadkey1 and keep deadkey2
-	
+
 	if (deadkey_!= 0)
 		res = deadkey_;
 	deadkey_ = c;
@@ -225,39 +155,13 @@ TransCombinedState::TransCombinedState()
 }
 
 
-#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)
@@ -297,28 +201,26 @@ TransManager::TransManager()
 {}
 
 
-TransManager::~TransManager() 
-{ 
-	delete t1_;
-	delete t2_;
-}
+// For the sake of boost::scoped_ptr.
+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);
 }
 
 
@@ -328,82 +230,79 @@ bool TransManager::setCharset(string const & str)
 }
 
 
-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);
-	
+
 	// Process with tokens
 	string temp;
-	
-	while(res.length() > 0) {
+
+	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)
-{	
-	string::size_type const l = str.length();
-	
-	for (string::size_type i = 0; i < l; ++i) {
-		text->insertChar(current_view, str[i]);
-	}
+void TransManager::insertVerbatim(string const & str, LyXText * text, LCursor & cur)
+{
+	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 
+	// Go through the character encoding only if the current
 	// encoding (chset_->name()) matches the current font_norm
 	// (lyrxc->font_norm)
-	
+
 	// Is false to speak about "only if" the current encoding will
 	// almost always be equal to font_norm.
 	pair<bool, int> enc = chset_.encodeString(str);
-	if (chset_.getName() != lyxrc.font_norm || 
+	if (chset_.getName() != lyxrc.font_norm ||
 	    !enc.first) {
 		// Could not find an encoding
 		InsetLatexAccent ins(str);
 		if (ins.canDisplay()) {
-			text->insertInset(current_view,
-					  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
@@ -412,25 +311,22 @@ 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;
 		}
 	}
-	
+
 	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);
+		insert(res, t, cur);
 	} else {
 		// Go through the translation
-		TranslateAndInsert(c, t);
+		translateAndInsert(c, t, cur);
 	}
 }
+
+
+} // namespace lyx