Minor code shuffle.

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 656e57c6dfdc0485fb2555565edfe8d2afaad9d7..3c5a6904d93011bebd40a32042d3eb7a9009fafd 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -30,7 +30,9 @@ TransFSMData::TransFSMData()
 {
        deadkey_ = deadkey2_ = 0;
        deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
+#if 0
        comb_info_ = 0;
+#endif
 }
 
 
@@ -45,6 +47,7 @@ TransInitState::TransInitState()
 }
 
 
+#if 0
 string const TransInitState::normalkey(char c, string const & t)
 {
        string res;
@@ -53,6 +56,14 @@ string const TransInitState::normalkey(char c, string const & t)
        
        return res;
 }
+#else
+string const TransInitState::normalkey(char c)
+{
+       string res;
+       res = c;
+       return res;
+}
+#endif
 
 
 string const TransInitState::deadkey(char c, KmodInfo d)
@@ -71,6 +82,7 @@ TransDeadkeyState::TransDeadkeyState()
 }
 
 
+#if 0
 string const TransDeadkeyState::normalkey(char c, string const & trans)
 {
        string res;
@@ -99,6 +111,46 @@ string const TransDeadkeyState::normalkey(char c, string const & 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();
+
+       for (; it != end; ++it) {
+               if (it->c == c) {
+                       res = it->data;
+                       break;
+               }
+       }
+       if (it == end) {
+               res = DoAccent(c, deadkey_info_.accent);
+       }
+       currentState = init_state_;
+       return res;
+#endif
+}
+#endif
 
 
 string const TransDeadkeyState::deadkey(char c, KmodInfo d)
@@ -115,10 +167,11 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
        }
        
        // Check if it is a combination or an exception
+#if 0
        KmodException l;
        l = deadkey_info_.exception_list;
        
-       while(l) {
+       while (l) {
                if (l->combined == true && l->accent == d.accent) {
                        deadkey2_ = c;
                        deadkey2_info_ = d;
@@ -135,7 +188,26 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
                }
                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) {
+               if (cit->combined == true && cit->accent == d.accent) {
+                       deadkey2_ = c;
+                       deadkey2_info_ = d;
+                       comb_info_ = (*cit);
+                       currentState = combined_state_;
+                       return string();
+               }
+               if (cit->c == c) {
+                       res = cit->data;
+                       deadkey_ = 0;
+                       deadkey_info_.accent = TEX_NOACCENT;
+                       currentState = init_state_;
+                       return res;
+               }
+       }
+#endif
        // Not a combination or an exception. 
        // Output deadkey1 and keep deadkey2
        
@@ -154,14 +226,14 @@ 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 temp;
-               temp = DoAccent(c, deadkey2_info_.accent);
+               string const temp = DoAccent(c, deadkey2_info_.accent);
                res = DoAccent(temp, deadkey_info_.accent);
                currentState = init_state_;
        } else {
@@ -176,6 +248,17 @@ string const TransCombinedState::normalkey(char c, string const & 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);
+       currentState = init_state_;
+       return res;
+}
+#endif
 
 
 string const TransCombinedState::deadkey(char c, KmodInfo d)
@@ -289,14 +372,16 @@ 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] == '\"' 
-                   && text->GetFont(current_view->buffer(),text->cursor.par(),
+               if (str[i] == '\"'
+#ifndef NO_LATEX
+                   && text->getFont(current_view->buffer(),text->cursor.par(),
                                     text->cursor.pos()).latex() == LyXFont::OFF
-                   && text->GetFont(current_view->buffer(),text->cursor.par(),
+#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]);
        }
 }
 
@@ -314,14 +399,16 @@ void TransManager::insert(string const & str, LyXText * text)
            !enc.first) {
                // Could not find an encoding
                InsetLatexAccent ins(str);
-               if (ins.CanDisplay()) {
-                       text->InsertInset(current_view, new InsetLatexAccent(ins));
+               if (ins.canDisplay()) {
+                       text->insertInset(current_view,
+                                         new InsetLatexAccent(ins));
                } else {
                        insertVerbatim(str, text);
                }
                return;
        }
-       string tmp; tmp += static_cast<char>(enc.second);
+       string tmp;
+       tmp += static_cast<char>(enc.second);
        insertVerbatim(tmp, text);
 }
 
@@ -333,7 +420,8 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                // or a accent command was typed in the minibuffer
                KmodInfo i;
                if (active_->isAccentDefined(accent, i) == true) {
-                       string res = trans_fsm_.currentState->deadkey(c, i);
+                       string const res = trans_fsm_
+                               .currentState->deadkey(c, i);
                        insert(res, t);
                        return;
                }
@@ -342,10 +430,13 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
        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 {