further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index f6c733352547a20212544183228d051c6099aa19..2cd1af5a9e9363db4eddd0aa1ee24b351169a0f5 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -11,10 +11,9 @@
 using std::ostream;
 
 
-MathDecorationInset::MathDecorationInset(latexkeys const * key)
-       : MathNestInset(1), key_(key)
-{
-}
+MathDecorationInset::MathDecorationInset(string const & name)
+       : MathNestInset(1), name_(name)
+{}
 
 
 MathInset * MathDecorationInset::clone() const
@@ -25,17 +24,39 @@ MathInset * MathDecorationInset::clone() const
 
 bool MathDecorationInset::upper() const
 {
-       return key_->id != LM_underline && key_->id != LM_underbrace;
+       return name_ != "underline" && name_ != "underbrace";
+}
+
+
+bool MathDecorationInset::isScriptable() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow";
 }
 
 
 bool MathDecorationInset::protect() const
 {
        return
-                       key_->name == "overbrace" ||
-                       key_->name == "underbrace" ||
-                       key_->name == "overleftarrow" ||
-                       key_->name == "overrightarrow";
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow";
+}
+
+
+bool MathDecorationInset::wide() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow" ||
+                       name_ == "widehat" ||
+                       name_ == "widetilde";
 }
 
 
@@ -56,46 +77,36 @@ void MathDecorationInset::metrics(MathStyles st) const
                dy_ = descent_ + 1;
                descent_ += dh_ + 2;
        }
-
-       if (key_->id == LM_not) {
-               ascent_  += dh_;
-               descent_ += dh_;
-               dh_ = height();
-               dy_ = - ascent_;
-       }
 }
 
+
 void MathDecorationInset::draw(Painter & pain, int x, int y) const
 { 
        xo(x);
        yo(x);
        xcell(0).draw(pain, x, y);
-       mathed_draw_deco(pain, x, y + dy_, width_, dh_, key_);
+       if (wide()) 
+               mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
+       else {
+               int w = 2 + mathed_char_width(LM_TC_VAR, size(), 'x'); 
+               mathed_draw_deco(pain, x + (width_ - w) / 2, y + dy_, w, dh_, name_);
+       }
 }
 
 
 void MathDecorationInset::write(ostream & os, bool fragile) const
 {
-       string name = key_->name;
        if (fragile && protect())
                os << "\\protect";
-       os << '\\' << name;
-
-       if (key_->id == LM_not)
-               os << ' ';
-       else
-               os << '{';
-
+       os << '\\' << name_ << '{';
        cell(0).write(os, fragile);  
-
-       if (key_->id != LM_not)
-               os << '}';
+       os << '}';
 }
 
 
 void MathDecorationInset::writeNormal(ostream & os) const
 {
-       os << "[" << key_->name << " ";
+       os << "[" << name_ << " ";
        cell(0).writeNormal(os);
        os << "] ";
 }