X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=eea9e01464da853a18bb675671ccee5a0d6d7121;hb=a69e7a45780e94f4330a91facfe35126c678e34e;hp=f7e4bb63102a5e9e0a47dc14ca34c94d9cf73175;hpb=532141facfd18627e9972f7a4f3d2032d18e0d2c;p=lyx.git diff --git a/src/trans_mgr.C b/src/trans_mgr.C index f7e4bb6310..eea9e01464 100644 --- 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->cursor.pos).latex() == LyXFont::OFF - && text->GetFont(text->cursor.par, - text->cursor.pos).language()->lang != "hebrew") + && text->GetFont(current_view->buffer(),text->cursor.par(), + text->cursor.pos()).latex() == LyXFont::OFF + && 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); }