Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index a1e3bea0025b0a4198876a2fb2a725ce554535b3..9a288afd7364f98b85e091426d242cbb0e2f802c 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -1,92 +1,83 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_fontinset.h"
-#include "debug.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
+#include "math_parser.h"
 #include "LaTeXFeatures.h"
+#include "support/LOstream.h"
 #include "textpainter.h"
-#include "frontends/Painter.h"
 
 
 
+MathFontInset::MathFontInset(latexkeys const * key)
+       : MathNestInset(1), key_(key)
+{}
 
-MathFontInset::MathFontInset(string const & name)
-       : MathNestInset(1), name_(name)
+
+MathInset * MathFontInset::clone() const
 {
-       //lock(true);
+       return new MathFontInset(*this);
 }
 
 
-MathInset * MathFontInset::clone() const
+MathInset::mode_type MathFontInset::currentMode() const
 {
-       return new MathFontInset(*this);
+       if (key_->extra == "mathmode")
+               return MATH_MODE;
+       if (key_->extra == "textmode")
+               return TEXT_MODE;
+       return UNDECIDED_MODE;
 }
 
 
 void MathFontInset::metrics(MathMetricsInfo & mi) const
 {
-       MathFontSetChanger dummy(mi.base, name_.c_str());
-       xcell(0).metrics(mi);
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent() + 2;
-       width_   = xcell(0).width()   + 2;
+       MathFontSetChanger dummy(mi.base, key_->name.c_str());
+       dim_ = cell(0).metrics(mi);
+       metricsMarkers();
 }
 
 
 void MathFontInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       //lyxerr << "MathFontInset::draw\n";
-       //MathNestInset::draw(pi, x, y);
-       MathFontSetChanger dummy(pi.base, name_.c_str());
-       xcell(0).draw(pi, x + 1, y);
+       MathFontSetChanger dummy(pi.base, key_->name.c_str());
+       cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
 }
 
 
 void MathFontInset::metricsT(TextMetricsInfo const & mi) const
 {
-       xcell(0).metricsT(mi);
-       width_   = xcell(0).width();
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent();
+       dim_ = cell(0).metricsT(mi);
 }
 
 
 void MathFontInset::drawT(TextPainter & pain, int x, int y) const
 {
-       //lyxerr << "drawing font code: " << code_ << '\n';
-       xcell(0).drawT(pain, x, y);
-}
-
-
-void MathFontInset::write(WriteStream & os) const
-{
-       os << '\\' << name_ << '{' << cell(0) << '}';
+       cell(0).drawT(pain, x, y);
 }
 
 
-void MathFontInset::normalize(NormalStream & os) const
+string MathFontInset::name() const
 {
-       os << "[font_ " << name_ << " " << cell(0) << "]";
+       return key_->name;
 }
 
 
 void MathFontInset::validate(LaTeXFeatures & features) const
 {
+       MathNestInset::validate(features);
        // Make sure amssymb is put in preamble if Blackboard Bold or
        // Fraktur used:
-       if (name_ == "mathfrak" || name_ == "mathbb")
+       if (key_->name == "mathfrak" || key_->name == "mathbb")
                features.require("amssymb");
 }
 
 
 void MathFontInset::infoize(std::ostream & os) const
 {
-       os << "Font: " << name_;
+       os << "Font: " << key_->name;
 }