Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_biginset.C

diff --git a/src/mathed/math_biginset.C b/src/mathed/math_biginset.C
index cff9a7d2393b4f9f7d6817301abd47ba8744337b..07f91c8ccc0dfcaae00112259aa4bfde3b7ad3bc 100644 (file)
--- a/src/mathed/math_biginset.C
+++ b/src/mathed/math_biginset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_biginset.h"
 #include "math_support.h"
@@ -40,21 +37,19 @@ double MathBigInset::increase() const
 }
 
 
-void MathBigInset::metrics(MathMetricsInfo const & mi) const
+void MathBigInset::metrics(MathMetricsInfo & mi) const
 {
-       LyXFont font;
-       whichFont(font, LM_TC_VAR, mi);
-       double h = mathed_char_ascent(font, 'I');
-       double f = increase();
-       width_   = 6;
-       ascent_  = int(h + f * h);
-       descent_ = int(f * h);
+       double const h = mathed_char_ascent(mi.base.font, 'I');
+       double const f = increase();
+       dim_.w = 6;
+       dim_.a = int(h + f * h);
+       dim_.d = int(f * h);
 }
 
 
-void MathBigInset::draw(Painter & pain, int x, int y) const
+void MathBigInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       mathed_draw_deco(pain, x + 1, y - ascent_, 4, height(), delim_);
+       mathed_draw_deco(pi, x + 1, y - ascent(), 4, height(), delim_);
 }
 
 
@@ -66,5 +61,5 @@ void MathBigInset::write(WriteStream & os) const
 
 void MathBigInset::normalize(NormalStream & os) const
 {
-       os << "[" << name_ << ' ' <<  delim_ << ']';
+       os << '[' << name_ << ' ' <<  delim_ << ']';
 }