]> git.lyx.org Git - features.git/commitdiff
Use proper font encoding in InsetQuotes
authorJuergen Spitzmueller <spitz@lyx.org>
Thu, 23 Feb 2017 09:39:31 +0000 (10:39 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Thu, 23 Feb 2017 09:39:31 +0000 (10:39 +0100)
src/insets/InsetQuotes.cpp

index 89da6a611dddc9175b26b99006aa1b0e4f292989..75420a46dcfa6deca7fb2b80c23294c06e5d9e55 100644 (file)
@@ -622,8 +622,7 @@ InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLeve
        bool dynamic = false;
        if (buf) {
                global_style_ = buf->masterBuffer()->params().quotes_style;
-               fontenc_ = (buf->masterBuffer()->params().fontenc == "global")
-                       ? lyxrc.fontenc : buf->params().fontenc;
+               fontenc_ = buf->masterBuffer()->params().font_encoding();
                dynamic = buf->masterBuffer()->params().dynamic_quotes;
                fontspec_ = buf->masterBuffer()->params().useNonTeXFonts;
        } else {
@@ -974,7 +973,7 @@ void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/)
        BufferParams const & bp = buffer().masterBuffer()->params();
        pass_thru_ = it.paragraph().isPassThru();
        context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code();
-       fontenc_ = (bp.fontenc == "global") ? lyxrc.fontenc : bp.fontenc;
+       fontenc_ = bp.font_encoding();
        global_style_ = bp.quotes_style;
        fontspec_ = bp.useNonTeXFonts;
 }