#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 "support/lstrings.h"
-using namespace lyx::support;
+
+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);
-
// TransFSMData
TransFSMData::TransFSMData()
// TransState
-char const TransState::TOKEN_SEP = 4;
+char_type const TransState::TOKEN_SEP = 4;
// TransInitState
}
-string const TransInitState::normalkey(char c)
+docstring const TransInitState::normalkey(char_type c)
{
- string res;
+ docstring res;
res = c;
return res;
}
-string const TransInitState::deadkey(char c, KmodInfo d)
+docstring const TransInitState::deadkey(char_type c, KmodInfo d)
{
deadkey_ = c;
deadkey_info_ = d;
currentState = deadkey_state_;
- return string();
+ return docstring();
}
}
-string const TransDeadkeyState::normalkey(char c)
+docstring const TransDeadkeyState::normalkey(char_type c)
{
- string res;
+ docstring res;
KmodException::iterator it = deadkey_info_.exception_list.begin();
KmodException::iterator end = deadkey_info_.exception_list.end();
}
-string const TransDeadkeyState::deadkey(char c, KmodInfo d)
+docstring const TransDeadkeyState::deadkey(char_type c, KmodInfo d)
{
- string res;
+ docstring res;
// Check if the same deadkey was typed twice
if (deadkey_ == c) {
deadkey2_info_ = d;
comb_info_ = (*cit);
currentState = combined_state_;
- return string();
+ return docstring();
}
if (cit->c == c) {
res = cit->data;
}
-string const TransCombinedState::normalkey(char c)
+docstring const TransCombinedState::normalkey(char_type c)
{
- string const temp = DoAccent(c, deadkey2_info_.accent);
- string const res = DoAccent(temp, deadkey_info_.accent);
+ docstring const temp = DoAccent(c, deadkey2_info_.accent);
+ docstring const res = DoAccent(temp, deadkey_info_.accent);
currentState = init_state_;
return res;
}
-string const TransCombinedState::deadkey(char c, KmodInfo d)
+docstring const TransCombinedState::deadkey(char_type c, KmodInfo d)
{
// Third key in a row. Output the first one and
// reenter with shifted deadkeys
- string res;
+ docstring res;
if (deadkey_ != 0)
res = deadkey_;
res += TOKEN_SEP;
{}
+// 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);
-}
-
-
-bool TransManager::setCharset(string const & str)
-{
- return chset_.loadFile(str);
+ 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;
+ LYXERR(Debug::KBMAP) << "Enabling primary keymap" << endl;
}
-void TransManager::EnableSecondary()
+void TransManager::enableSecondary()
{
- if (t2_->IsDefined())
- active_ = t2_;
- lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
+ 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;
+ LYXERR(Debug::KBMAP) << "Disabling keymap" << endl;
}
-void TransManager::TranslateAndInsert(char c, LyXText * text)
+void TransManager::translateAndInsert(char_type c, LyXText * text, LCursor & cur)
{
- string res = active_->process(c, *this);
+ docstring res = active_->process(c, *this);
// Process with tokens
- string temp;
+ docstring temp;
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::insert(docstring 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)
-{
- // 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 ||
- !enc.first) {
- // Could not find an encoding
- InsetLatexAccent ins(str);
- if (ins.canDisplay()) {
- text->insertInset(
- new InsetLatexAccent(ins));
- } else {
- insertVerbatim(str, text);
- }
- return;
- }
- string tmp;
- tmp += static_cast<char>(enc.second);
- insertVerbatim(tmp, text);
-}
-
-
-void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
+void TransManager::deadkey(char_type c, tex_accent accent, LyXText * t, LCursor & cur)
{
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 const res = trans_fsm_
+ docstring const res = trans_fsm_
.currentState->deadkey(c, i);
- insert(res, t);
+ insert(res, t, cur);
return;
}
}
KmodInfo i;
i.accent = accent;
i.data.erase();
- string res = trans_fsm_.currentState->deadkey(c, i);
- insert(res, t);
+ docstring res = trans_fsm_.currentState->deadkey(c, i);
+ insert(res, t, cur);
} else {
// Go through the translation
- TranslateAndInsert(c, t);
+ translateAndInsert(c, t, cur);
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff