anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use proper font encoding in InsetQuotes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2017-02-23 10:39:31 +01:00
parent 7d54edbf94
commit cf82bcadfb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetQuotes.cpp
View File

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