rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index d0b8e3f948be05b8d39d031fc3b136e000c0f998..9a288afd7364f98b85e091426d242cbb0e2f802c 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -1,18 +1,14 @@
 #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"
 
 
 
@@ -40,31 +36,28 @@ MathInset::mode_type MathFontInset::currentMode() const
 void MathFontInset::metrics(MathMetricsInfo & mi) const
 {
        MathFontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = xcell(0).metrics(mi);
+       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, key_->name.c_str());
-       xcell(0).draw(pi, x + 1, y);
+       cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
 }
 
 
 void MathFontInset::metricsT(TextMetricsInfo const & mi) const
 {
-       dim_ = xcell(0).metricsT(mi);
+       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);
+       cell(0).drawT(pain, x, y);
 }
 
 
@@ -76,6 +69,7 @@ string MathFontInset::name() const
 
 void MathFontInset::validate(LaTeXFeatures & features) const
 {
+       MathNestInset::validate(features);
        // Make sure amssymb is put in preamble if Blackboard Bold or
        // Fraktur used:
        if (key_->name == "mathfrak" || key_->name == "mathbb")