anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 22:17:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly show in italic shape the uppercase greek letters inserted in

Browse Source 
a \mathit inset.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37060 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-01-01 19:24:16 +00:00
parent 36ee8cdd52
commit 9687f9beb6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mathed/InsetMathSymbol.cpp
View File

@ -60,8 +60,12 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
// << "' drawn as: '" << sym_->draw // << "' drawn as: '" << sym_->draw
// << "'" << endl; // << "'" << endl;
bool const italic_upcase_greek = sym_->inset == "cmr" &&
sym_->extra == "mathalpha" &&
mi.base.fontname == "mathit";
docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
int const em = mathed_char_width(mi.base.font, 'M'); int const em = mathed_char_width(mi.base.font, 'M');
FontSetChanger dummy(mi.base, sym_->inset); FontSetChanger dummy(mi.base, font);
mathed_string_dim(mi.base.font, sym_->draw, dim); mathed_string_dim(mi.base.font, sym_->draw, dim);
docstring::const_reverse_iterator rit = sym_->draw.rbegin(); docstring::const_reverse_iterator rit = sym_->draw.rbegin();
kerning_ = mathed_char_kerning(mi.base.font, *rit); kerning_ = mathed_char_kerning(mi.base.font, *rit);
@ -91,13 +95,18 @@ void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
// << "' in font: '" << sym_->inset // << "' in font: '" << sym_->inset
// << "' drawn as: '" << sym_->draw // << "' drawn as: '" << sym_->draw
// << "'" << endl; // << "'" << endl;
bool const italic_upcase_greek = sym_->inset == "cmr" &&
sym_->extra == "mathalpha" &&
pi.base.fontname == "mathit";
docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
int const em = mathed_char_width(pi.base.font, 'M'); int const em = mathed_char_width(pi.base.font, 'M');
if (isRelOp()) if (isRelOp())
x += static_cast<int>(0.25*em+0.5); x += static_cast<int>(0.25*em+0.5);
else else
x += static_cast<int>(0.0833*em+0.5); x += static_cast<int>(0.0833*em+0.5);
FontSetChanger dummy(pi.base, sym_->inset.c_str()); FontSetChanger dummy(pi.base, font);
pi.draw(x, y - h_, sym_->draw); pi.draw(x, y - h_, sym_->draw);
} }