Add string << operators for the other streams as well, and removes

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index f158438e6d6536b463c341cf7491e92d6b9bf1f5..c6f5bd7ab6158f531710ab96d043d447f50736a4 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -15,7 +15,6 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
-#include "language.h"
 
 using std::endl;
 using std::pair;
@@ -30,7 +29,9 @@ TransFSMData::TransFSMData()
 {
        deadkey_ = deadkey2_ = 0;
        deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
+#if 0
        comb_info_ = 0;
+#endif
 }
 
 
@@ -87,7 +88,7 @@ string const TransDeadkeyState::normalkey(char c, string const & trans)
        
        // Check if it is an exception
        KmodException l = deadkey_info_.exception_list;
-       while(l != 0) {
+       while (l != 0) {
                if (l->c == c) {
                        res = l->data;
                        break;
@@ -112,11 +113,12 @@ string const TransDeadkeyState::normalkey(char c, string const & trans)
 #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) {
+       while (l != 0) {
                if (l->c == c) {
                        res = l->data;
                        break;
@@ -128,6 +130,24 @@ string const TransDeadkeyState::normalkey(char c)
        }
        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
 
@@ -146,6 +166,7 @@ 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;
        
@@ -166,7 +187,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
        
@@ -319,7 +359,7 @@ void  TransManager::TranslateAndInsert(char c, LyXText * text)
        // Process with tokens
        string temp;
        
-       while(res.length() > 0) {
+       while (res.length() > 0) {
                res = split(res, temp, TransState::TOKEN_SEP);
                insert(temp, text);
        }
@@ -331,16 +371,7 @@ 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]);
        }
 }
 
@@ -349,7 +380,7 @@ 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
+       // (lyrxc->font_norm)
        
        // Is false to speak about "only if" the current encoding will
        // almost always be equal to font_norm.
@@ -359,13 +390,15 @@ void TransManager::insert(string const & str, LyXText * text)
                // Could not find an encoding
                InsetLatexAccent ins(str);
                if (ins.canDisplay()) {
-                       text->insertInset(current_view, new InsetLatexAccent(ins));
+                       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);
 }
 
@@ -391,8 +424,9 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                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 {