more keyboard/keysym changes

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 7fe6879dff1b617e8b590c5e138577b0362416ad..eea9e01464da853a18bb675671ccee5a0d6d7121 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -85,8 +85,7 @@ string TransDeadkeyState::normalkey(char c, char * trans)
        }
        if (l == 0) {
                // Not an exception. Check if it allowed
-               if (current_view->buffer()->params.allowAccents == true ||
-                   countChar(deadkey_info_.allowed, c) > 0) {
+               if (countChar(deadkey_info_.allowed, c) > 0) {
                        res = DoAccent(c, deadkey_info_.accent);
                } else {
                        // Not allowed
@@ -289,13 +288,13 @@ void TransManager::insertVerbatim(string const & str, LyXText * text)
        
        for (int i = 0; i < l; ++i){
                if (str[i] == '\"' 
-                   && text->GetFont(text->cursor.par(),
+                   && text->GetFont(current_view->buffer(),text->cursor.par(),
                                     text->cursor.pos()).latex() == LyXFont::OFF
-                   && text->GetFont(text->cursor.par(),
+                   && text->GetFont(current_view->buffer(),text->cursor.par(),
                                     text->cursor.pos()).language()->lang() != "hebrew")
                        current_view->insertCorrectQuote();
                else
-                       text->InsertChar(str[i]);
+                       text->InsertChar(current_view, str[i]);
        }
 }
 
@@ -314,7 +313,7 @@ void TransManager::insert(string const & str, LyXText * text)
                // Could not find an encoding
                InsetLatexAccent ins(str);
                if (ins.CanDisplay()) {
-                       text->InsertInset(new InsetLatexAccent(ins));
+                       text->InsertInset(current_view, new InsetLatexAccent(ins));
                } else {
                        insertVerbatim(str, text);
                }