X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=8641876c23feea51bef3844813dba0b9f0693f8f;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=fa077ce907cd9284c88f69a83542b812ea8f0fec;hpb=c80187fbfcefa7972bd9602a2205521aca236349;p=lyx.git diff --git a/src/trans_mgr.C b/src/trans_mgr.C index fa077ce907..8641876c23 100644 --- a/src/trans_mgr.C +++ b/src/trans_mgr.C @@ -1,27 +1,39 @@ -#include +/** + * \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 #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 "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; + 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 @@ -70,7 +82,7 @@ TransDeadkeyState::TransDeadkeyState() string const TransDeadkeyState::normalkey(char c) { string res; - + KmodException::iterator it = deadkey_info_.exception_list.begin(); KmodException::iterator end = deadkey_info_.exception_list.end(); @@ -91,7 +103,7 @@ string const TransDeadkeyState::normalkey(char c) string const TransDeadkeyState::deadkey(char c, KmodInfo d) { string res; - + // Check if the same deadkey was typed twice if (deadkey_ == c) { res = deadkey_; @@ -100,7 +112,7 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d) currentState = init_state_; return res; } - + // Check if it is a combination or an exception KmodException::const_iterator cit = deadkey_info_.exception_list.begin(); KmodException::const_iterator end = deadkey_info_.exception_list.end(); @@ -121,9 +133,9 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d) } } - // Not a combination or an exception. + // Not a combination or an exception. // Output deadkey1 and keep deadkey2 - + if (deadkey_!= 0) res = deadkey_; deadkey_ = c; @@ -185,28 +197,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); } @@ -216,37 +226,37 @@ 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) { string res = active_->process(c, *this); - + // Process with tokens string temp; - + while (res.length() > 0) { res = split(res, temp, TransState::TOKEN_SEP); insert(temp, text); @@ -255,38 +265,36 @@ void TransManager::TranslateAndInsert(char c, LyXText * text) 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]); - } +{ + for (string::size_type i = 0, n = str.size(); i < n; ++i) + text->insertChar(text->bv()->cursor(), str[i]); } void TransManager::insert(string const & str, LyXText * text) { - // 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 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)); + LCursor & cur = text->bv()->cursor(); + lyx::cap::replaceSelection(cur); + cur.insert(new InsetLatexAccent(ins)); + cur.posRight(); } else { insertVerbatim(str, text); } return; } - string tmp; - tmp += static_cast(enc.second); + string const tmp(1, static_cast(enc.second)); insertVerbatim(tmp, text); } @@ -304,7 +312,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t) return; } } - + if (active_ == &default_ || c == 0) { KmodInfo i; i.accent = accent; @@ -313,6 +321,6 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t) insert(res, t); } else { // Go through the translation - TranslateAndInsert(c, t); + translateAndInsert(c, t); } }