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.

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index bd22b278f3cb74855659cbe21e8164f2b0008b78..39e7907ec1fd158fa1c4b82d48d394e07c39b81c 100644 (file)
--- 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 3a9d18c5c20f39ec14bcad78facd72f44720d3d7..b623843d9ea3cc9a06a92c8956ac9ffdaa3aee38 100644 (file)
--- 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 26d508f12c46f596c6afc7b79114f7a04c25ee4f..dc0d90cb17aa7da23120bb18828f06a5a04f4816 100644 (file)
--- 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 286bafd97440069706d2ade9b44c4534eaef8ee6..4d7c7ef2defdedbe4bb60bd970da607cae4166c4 100644 (file)
--- 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