code cosmetics to the iterator fix

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 834905b7263a6c474e6fdef20c45ce336c19906b..523d0727704172dfe3649de535538f584373325e 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -20,6 +20,8 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 
+
+using std::string;
 using std::auto_ptr;
 
 
@@ -38,7 +40,7 @@ MathSymbolInset::MathSymbolInset(string const & name)
 {}
 
 
-auto_ptr<InsetBase> MathSymbolInset::clone() const
+auto_ptr<InsetBase> MathSymbolInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathSymbolInset(*this));
 }
@@ -55,17 +57,30 @@ void MathSymbolInset::metrics(MetricsInfo & mi, Dimension & dim) const
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'\n";
+       //      << "'" << std::endl;
 
        int const em = mathed_char_width(mi.base.font, 'M');
        FontSetChanger dummy(mi.base, sym_->inset.c_str());
        mathed_string_dim(mi.base.font, sym_->draw, dim);
        // correct height for broken cmex and wasy font
+#if defined(__APPLE__) && defined(__GNUC__)
+       if (sym_->inset == "cmex") {
+               h_ = 4 * dim.des / 5;
+               dim.asc += 0*h_;
+               dim.des -= h_;
+               h_ = dim.asc;
+       } else if (sym_->inset == "wasy") {
+               h_ = 4 * dim.des / 5;
+               dim.asc += h_;
+               dim.des -= h_;
+       }
+#else
        if (sym_->inset == "cmex" || sym_->inset == "wasy") {
                h_ = 4 * dim.des / 5;
                dim.asc += h_;
                dim.des -= h_;
        }
+#endif
        // seperate things a bit
        if (isRelOp())
                dim.wid += static_cast<int>(0.5 * em + 0.5);
@@ -76,6 +91,8 @@ void MathSymbolInset::metrics(MetricsInfo & mi, Dimension & dim) const
        if (mi.base.style == LM_ST_DISPLAY)
                if (sym_->inset == "cmex" || sym_->extra == "funclim")
                        scriptable_ = true;
+
+       width_ = dim.wid;
 }
 
 
@@ -84,7 +101,7 @@ void MathSymbolInset::draw(PainterInfo & pi, int x, int y) const
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'\n";
+       //      << "'" << std::endl;
        int const em = mathed_char_width(pi.base.font, 'M');
        if (isRelOp())
                x += static_cast<int>(0.25*em+0.5);
@@ -92,7 +109,7 @@ void MathSymbolInset::draw(PainterInfo & pi, int x, int y) const
                x += static_cast<int>(0.0833*em+0.5);
 
        FontSetChanger dummy(pi.base, sym_->inset.c_str());
-       drawStr(pi, pi.base.font, x, y - h_, sym_->draw);
+       pi.draw(x, y - h_, sym_->draw);
 }
 
 
@@ -119,8 +136,8 @@ bool MathSymbolInset::takesLimits() const
 
 void MathSymbolInset::validate(LaTeXFeatures & features) const
 {
-       if (sym_->inset == "msa" || sym_->inset == "msb")
-               features.require("amssymb");
+       if (!sym_->requires.empty())
+               features.require(sym_->requires);
 }
 
 
@@ -167,13 +184,6 @@ char const * MathMLtype(string const & s)
 }
 
 
-bool MathSymbolInset::match(MathAtom const & at) const
-{
-       MathSymbolInset const * q = at->asSymbolInset();
-       return q && name() == q->name();
-}
-
-
 void MathSymbolInset::mathmlize(MathMLStream & os) const
 {
        char const * type = MathMLtype(sym_->extra);