]> git.lyx.org Git - lyx.git/blobdiff - src/trans_mgr.C
fix typo that put too many include paths for most people
[lyx.git] / src / trans_mgr.C
index 3c5a6904d93011bebd40a32042d3eb7a9009fafd..90afbc1fba149a13cde689fb2439862a05b88bd0 100644 (file)
@@ -15,7 +15,6 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
-#include "language.h"
 
 using std::endl;
 using std::pair;
@@ -30,9 +29,6 @@ TransFSMData::TransFSMData()
 {
        deadkey_ = deadkey2_ = 0;
        deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
-#if 0
-       comb_info_ = 0;
-#endif
 }
 
 
@@ -47,23 +43,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)
@@ -82,58 +67,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();
 
@@ -148,15 +85,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_;
@@ -165,30 +100,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) {
@@ -207,10 +120,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;
@@ -226,39 +139,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)
@@ -298,8 +185,8 @@ TransManager::TransManager()
 {}
 
 
-TransManager::~TransManager() 
-{ 
+TransManager::~TransManager()
+{
        delete t1_;
        delete t2_;
 }
@@ -307,9 +194,9 @@ TransManager::~TransManager()
 
 int TransManager::SetPrimary(string const & language)
 {
-       if (t1_->GetName() == language) 
+       if (t1_->GetName() == language)
                return 0;
-       
+
        return t1_->Load(language);
 }
 
@@ -318,7 +205,7 @@ int TransManager::SetSecondary(string const & language)
 {
        if (t2_->GetName() == language)
                return 0;
-       
+
        return t2_->Load(language);
 }
 
@@ -333,7 +220,7 @@ void TransManager::EnablePrimary()
 {
        if (t1_->IsDefined())
                active_ = t1_;
-       
+
        lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
 }
 
@@ -356,11 +243,11 @@ void TransManager::DisableKeymap()
 void  TransManager::TranslateAndInsert(char c, LyXText * text)
 {
        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);
        }
@@ -368,34 +255,25 @@ 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) {
-               if (str[i] == '\"'
-#ifndef NO_LATEX
-                   && text->getFont(current_view->buffer(),text->cursor.par(),
-                                    text->cursor.pos()).latex() == LyXFont::OFF
-#endif
-                   && text->getFont(current_view->buffer(),text->cursor.par(),
-                                    text->cursor.pos()).language()->lang() != "hebrew")
-                       current_view->insertCorrectQuote();
-               else
-                       text->insertChar(current_view, str[i]);
+               text->insertChar(current_view, 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
-       
+       // (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);
@@ -426,17 +304,11 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                        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);
        } else {