From 21b81bfd1e620e0df38c3fabcba2413736df7c07 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Fri, 30 Oct 2020 15:53:35 +0100 Subject: [PATCH] Fix on-screen display of special math fonts Make sure that the on-screen representation of the special math fonts mathbb, mathds, mathfrak, mathcal, and mathscr matches the latex output. --- src/frontends/qt4/GuiFontLoader.cpp | 1 + src/mathed/InsetMathChar.cpp | 14 ++++++++++++++ src/mathed/MathSupport.cpp | 17 ++++++++++++++--- status.23x | 2 ++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp index bd22b278f3..39e7907ec1 100644 --- a/src/frontends/qt4/GuiFontLoader.cpp +++ b/src/frontends/qt4/GuiFontLoader.cpp @@ -197,6 +197,7 @@ QFont symbolFont(QString const & family, bool * ok) #else font.setFamily(family); #endif + font.setStyleStrategy(QFont::NoFontMerging); #if QT_VERSION >= 0x040800 font.setStyleName("LyX"); diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp index 3a9d18c5c2..b623843d9e 100644 --- a/src/mathed/InsetMathChar.cpp +++ b/src/mathed/InsetMathChar.cpp @@ -118,6 +118,13 @@ void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const Changer dummy = mi.base.font.changeShape(UP_SHAPE); dim = theFontMetrics(mi.base.font).dimension(char_); kerning_ = 0; + } else if (!isASCII(char_) && Encodings::unicodeCharInfo(char_).isUnicodeSymbol()) { + Changer dummy1 = mi.base.changeFontSet("mathnormal"); + Changer dummy2 = Encodings::isMathAlpha(char_) + ? Changer() + : mi.base.font.changeShape(UP_SHAPE); + dim = theFontMetrics(mi.base.font).dimension(char_); + kerning_ = -mathed_char_kerning(mi.base.font, char_); } else { frontend::FontMetrics const & fm = theFontMetrics(mi.base.font); dim = fm.dimension(char_); @@ -156,6 +163,13 @@ void InsetMathChar::draw(PainterInfo & pi, int x, int y) const Changer dummy = pi.base.font.changeShape(UP_SHAPE); pi.draw(x, y, char_); return; + } else if (!isASCII(char_) && Encodings::unicodeCharInfo(char_).isUnicodeSymbol()) { + Changer dummy1 = pi.base.changeFontSet("mathnormal"); + Changer dummy2 = Encodings::isMathAlpha(char_) + ? Changer() + : pi.base.font.changeShape(UP_SHAPE); + pi.draw(x, y, char_); + return; } } // cmmi has almost no left bearing: simulate this diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp index 26d508f12c..dc0d90cb17 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -685,7 +685,13 @@ int mathedSymbolDim(MetricsBase & mb, Dimension & dim, latexkeys const * sym) sym->extra == "mathalpha" && mb.fontname == "mathit"; std::string const font = italic_upcase_greek ? "cmm" : sym->inset; - Changer dummy = mb.changeFontSet(font); + bool const change_font = font != "cmr" || + (mb.fontname != "mathbb" && + mb.fontname != "mathds" && + mb.fontname != "mathfrak" && + mb.fontname != "mathcal" && + mb.fontname != "mathscr"); + Changer dummy = change_font ? mb.changeFontSet(font) : Changer(); mathed_string_dim(mb.font, sym->draw, dim); return mathed_char_kerning(mb.font, sym->draw.back()); } @@ -703,8 +709,13 @@ void mathedSymbolDraw(PainterInfo & pi, int x, int y, latexkeys const * sym) sym->extra == "mathalpha" && pi.base.fontname == "mathit"; std::string const font = italic_upcase_greek ? "cmm" : sym->inset; - - Changer dummy = pi.base.changeFontSet(font); + bool const change_font = font != "cmr" || + (pi.base.fontname != "mathbb" && + pi.base.fontname != "mathds" && + pi.base.fontname != "mathfrak" && + pi.base.fontname != "mathcal" && + pi.base.fontname != "mathscr"); + Changer dummy = change_font ? pi.base.changeFontSet(font) : Changer(); pi.draw(x, y, sym->draw); } diff --git a/status.23x b/status.23x index 286bafd974..4d7c7ef2de 100644 --- a/status.23x +++ b/status.23x @@ -122,6 +122,8 @@ What's new - Fix PrettyFormat for Part (bug 11986). +- Fix on-screen display of special math fonts (bug 11802). + * INTERNALS -- 2.39.5