Inherit outer font in text-in-math environments

Some text-in-math environments such as \text, \mbox, \fbox, and
\makebox, inherit the outer text font. This commit reflects this
in the on-screen representation.

Fixes #12950.

src/MetricsInfo.cpp

@@ -65,7 +65,7 @@ Changer MetricsBase::changeFontSet(string const & name)
 	string const oldname = fontname;
 	fontname = name;
 	if (isMathFont(name) || isMathFont(oldname))
-		font = sane_font;
+		font = isTextFont(name) ? outer_font : sane_font;
 	augmentFont(font, name);
 	font.setSize(rc->old.font.size());
 	font.setStyle(rc->old.font.style());

src/MetricsInfo.h

@@ -46,6 +46,8 @@ public:
 	BufferView * bv;
 	/// current font
 	FontInfo font;
+	/// font of the containing inset
+	FontInfo outer_font;
 	/// name of current font - mathed specific
 	std::string fontname;
 	/// This is the width available in pixels

src/RowPainter.cpp

@@ -106,6 +106,7 @@ void RowPainter::paintInset(Row::Element const & e) const
 
 	pi_.base.font = e.inset->inheritFont() ? e.font.fontInfo() :
 		pi_.base.bv->buffer().params().getFont().fontInfo();
+	pi_.base.outer_font = e.font.fontInfo();
 	pi_.ltr_pos = !e.font.isVisibleRightToLeft();
 	pi_.change_ = change_.changed() ? change_ : e.change;
 	pi_.do_spellcheck &= e.inset->allowSpellCheck();

src/TextMetrics.cpp

@@ -450,6 +450,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 			displayFont(pit, ii->pos) : bufferfont;
 		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
+		mi.base.outer_font = displayFont(pit, ii->pos).fontInfo();
 		ii->inset->metrics(mi, dim);
 		if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
 			insetCache.add(ii->inset, dim);

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, '[');
 

status.23x

@@ -32,6 +32,10 @@ What's new
 - Add a few missing autocorrect combinations and allow cycling through arrows
   (bug 12711).
 
+- Reflect in the on-screen representation of math insets the fact that some
+  insets, such as \text, \mbox, \fbox and \makebox, inherit the text font
+  of the containing inset (bug 12950).
+
 
 * DOCUMENTATION AND LOCALIZATION