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 4126f3a9189be328289c491ac7dd9d18f97cc883..2cd1af5a9e9363db4eddd0aa1ee24b351169a0f5 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,5 +1,3 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -8,17 +6,14 @@
 #include "mathed/support.h"
 #include "math_parser.h"
 #include "support/LOstream.h"
-#include "support/lstrings.h"
 
 
 using std::ostream;
 
 
-MathDecorationInset::MathDecorationInset(string const & name, int d)
-       : MathInset(1, name), deco_(d)
-{
-       upper_ = deco_ != LM_underline && deco_ != LM_underbrace;
-}
+MathDecorationInset::MathDecorationInset(string const & name)
+       : MathNestInset(1), name_(name)
+{}
 
 
 MathInset * MathDecorationInset::clone() const
@@ -27,10 +22,47 @@ MathInset * MathDecorationInset::clone() const
 }
 
 
+bool MathDecorationInset::upper() const
+{
+       return name_ != "underline" && name_ != "underbrace";
+}
+
+
+bool MathDecorationInset::isScriptable() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow";
+}
+
+
+bool MathDecorationInset::protect() const
+{
+       return
+                       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";
+}
 
-void MathDecorationInset::Metrics(MathStyles st, int, int)
+
+void MathDecorationInset::metrics(MathStyles st) const
 {
-       xcell(0).Metrics(st);
+       xcell(0).metrics(st);
        size_    = st;
        width_   = xcell(0).width();
        ascent_  = xcell(0).ascent();
@@ -38,55 +70,43 @@ void MathDecorationInset::Metrics(MathStyles st, int, int)
 
        dh_ = 5; //mathed_char_height(LM_TC_VAR, size(), 'I', ascent_, descent_);  
 
-       if (upper_) {
+       if (upper()) {
                dy_ = -ascent_ - dh_;
                ascent_ += dh_ + 1;
        } else {
                dy_ = descent_ + 1;
                descent_ += dh_ + 2;
        }
-
-       if (deco_ == LM_not) {
-               ascent_  += dh_;
-               descent_ += dh_;
-               dh_ = height();
-               dy_ = - ascent_;
-       }
 }
 
-void MathDecorationInset::draw(Painter & pain, int x, int y)
+
+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_, deco_);
+       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
+void MathDecorationInset::write(ostream & os, bool fragile) const
 {
-       if (fragile &&
-                       (name_ == "overbrace" ||
-                        name_ == "underbrace" ||
-                        name_ == "overleftarrow" ||
-                        name_ == "overrightarrow"))
+       if (fragile && protect())
                os << "\\protect";
-       os << '\\' << name_;
-
-       if (deco_ == LM_not)
-               os << ' ';
-       else
-               os << '{';
-
-       cell(0).Write(os, fragile);  
-
-       if (deco_ != LM_not)
-               os << '}';
+       os << '\\' << name_ << '{';
+       cell(0).write(os, fragile);  
+       os << '}';
 }
 
-void MathDecorationInset::WriteNormal(ostream & os) const
+
+void MathDecorationInset::writeNormal(ostream & os) const
 {
        os << "[" << name_ << " ";
-       cell(0).WriteNormal(os);
+       cell(0).writeNormal(os);
        os << "] ";
 }