anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Inherit outer font in text-in-math environments"

Browse Source 
This reverts commit d72b9b0238.

Unfortunately, the font taken into account is the font at the
current cursor position rather than the font of the corresponding
math inset.
This commit is contained in:
Enrico Forestieri 2023-11-02 01:59:54 +01:00
parent d72b9b0238
commit e0e1350b7e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/MetricsInfo.cpp
View File

@ -11,8 +11,6 @@
#include <config.h>
#include "MetricsInfo.h"
#include "BufferView.h"
#include "Cursor.h"
#include "LyXRC.h"
@ -63,8 +61,7 @@ Changer MetricsBase::changeFontSet(string const & name)
string const oldname = fontname;
fontname = name;
if (isMathFont(name) || isMathFont(oldname))
font = isTextFont(name) ? bv->cursor().getFont().fontInfo()
: sane_font;
font = sane_font;
augmentFont(font, name);
font.setSize(rc->old.font.size());
font.setStyle(rc->old.font.style());

12
src/mathed/InsetMathBox.cpp
View File

@ -146,14 +146,14 @@ void InsetMathBox::htmlize(HtmlStream & ms) const
void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
{
Changer dummy = mi.base.changeFontSet("text");
Changer dummy = mi.base.changeFontSet("textnormal");
cell(0).metrics(mi, dim);
}
void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
{
Changer dummy = pi.base.changeFontSet("text");
Changer dummy = pi.base.changeFontSet("textnormal");
cell(0).draw(pi, x, y);
}
@ -196,7 +196,7 @@ InsetMathFBox::InsetMathFBox(Buffer * buf)
void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const
{
Changer dummy = mi.base.changeFontSet("text");
Changer dummy = mi.base.changeFontSet("textnormal");
cell(0).metrics(mi, dim);
// 1 pixel space, 1 frame, 1 space
dim.wid += 2 * 3;
@ -210,7 +210,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("text");
Changer dummy = pi.base.changeFontSet("textnormal");
cell(0).draw(pi, x + 3, y);
}
@ -281,7 +281,7 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
{
Changer dummy = mi.base.changeFontSet("text");
Changer dummy = mi.base.changeFontSet("textnormal");
Dimension wdim;
static docstring bracket = from_ascii("[");
@ -312,7 +312,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
{
Changer dummy = pi.base.changeFontSet("text");
Changer dummy = pi.base.changeFontSet("textnormal");
BufferView const & bv = *pi.base.bv;
int w = mathed_char_width(pi.base.font, '[');