[LyX/2.3.x] Inherit outer font in text-in-math environments

[Richard Kimberly Heck]

commit f0dccbf3fbbf589e2c0a45c286a6581c1949cb28
Author: Enrico Forestieri <for...@lyx.org>
Date:   Wed Nov 1 22:21:49 2023 +0100

    Inherit outer font in text-in-math environments
    
    The text-in-math environments such as \text, \mbox, \fbox, \makebox
    and so on, inherit the outer text font. This commit reflects this
    in the on-screen representation.
    
    Fixes #12950.
---
 src/MetricsInfo.cpp         |    7 +++++--
 src/mathed/InsetMathBox.cpp |   12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 1124ed8..106c4c1 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -10,8 +10,10 @@
 
 #include <config.h>
 
+#include "MetricsInfo.h"
 #include "BufferView.h"
-#include "ColorSet.h"
+#include "Cursor.h"
+
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 
@@ -65,7 +67,8 @@ Changer MetricsBase::changeFontSet(string const & name)
        string const oldname = fontname;
        fontname = name;
        if (isMathFont(name) || isMathFont(oldname))
-               font = sane_font;
+               font = isTextFont(name) ? bv->cursor().getFont().fontInfo()
+                                       : sane_font;
        augmentFont(font, name);
        font.setSize(rc->old.font.size());
        font.setStyle(rc->old.font.style());
diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index c0df607..e6ed811 100644
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -81,14 +81,14 @@ void InsetMathBox::htmlize(HtmlStream & ms) const
 
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy = mi.base.changeFontSet("textnormal");
+       Changer dummy = mi.base.changeFontSet("text");
        cell(0).metrics(mi, dim);
 }
 
 
 void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 {
-       Changer dummy = pi.base.changeFontSet("textnormal");
+       Changer dummy = pi.base.changeFontSet("text");
        cell(0).draw(pi, x, y);
 }
 
@@ -131,7 +131,7 @@ InsetMathFBox::InsetMathFBox(Buffer * buf)
 
 void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy = mi.base.changeFontSet("textnormal");
+       Changer dummy = mi.base.changeFontSet("text");
        cell(0).metrics(mi, dim);
        // 1 pixel space, 1 frame, 1 space
        dim.wid += 2 * 3;
@@ -145,7 +145,7 @@ void InsetMathFBox::draw(PainterInfo & pi, int x, int y) 
const
        Dimension const dim = dimension(*pi.base.bv);
        pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
                dim.width() - 2, dim.height() - 2, Color_foreground);
-       Changer dummy = pi.base.changeFontSet("textnormal");
+       Changer dummy = pi.base.changeFontSet("text");
        cell(0).draw(pi, x + 3, y);
 }
 
@@ -219,7 +219,7 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool 
framebox)
 
 void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy = mi.base.changeFontSet("textnormal");
+       Changer dummy = mi.base.changeFontSet("text");
 
        Dimension wdim;
        static docstring bracket = from_ascii("[");
@@ -250,7 +250,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension 
& dim) const
 
 void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 {
-       Changer dummy = pi.base.changeFontSet("textnormal");
+       Changer dummy = pi.base.changeFontSet("text");
        BufferView const & bv = *pi.base.bv;
        int w = mathed_char_width(pi.base.font, '[');
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs