diff --git a/src/Text2.cpp b/src/Text2.cpp index 62cff3ec03..b990703db8 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -162,15 +162,9 @@ Font Text::getFont(Buffer const & buffer, Paragraph const & par, Font f = par.getFontSettings(params, pos); if (!isMainText(buffer)) applyOuterFont(buffer, f); - Font lf; - Font rlf; - if (layout->labeltype == LABEL_MANUAL && pos < body_pos) { - lf = layout->labelfont; - rlf = layout->reslabelfont; - } else { - lf = layout->font; - rlf = layout->resfont; - } + bool lab = layout->labeltype == LABEL_MANUAL && pos < body_pos; + Font const & lf = lab ? layout->labelfont : layout->font; + Font rlf = lab ? layout->reslabelfont : layout->resfont; // In case the default family has been customized if (lf.family() == Font::INHERIT_FAMILY) rlf.setFamily(params.getFont().family()); @@ -178,11 +172,8 @@ Font Text::getFont(Buffer const & buffer, Paragraph const & par, } // The uncommon case need not be optimized as much - Font layoutfont; - if (pos < body_pos) - layoutfont = layout->labelfont; - else - layoutfont = layout->font; + Font const & layoutfont = pos < body_pos ? + layout->labelfont : layout->font; Font font = par.getFontSettings(params, pos); font.realize(layoutfont);