remove symbol_def.h

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index db3c44bc1931783d67afc86568424637418ca941..8d3d3501e8b70a631a0a9157d855174771f0e2d4 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,77 +1,85 @@
-#include <config.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
 
 #include "math_decorationinset.h"
-#include "math_iter.h"
 #include "mathed/support.h"
 #include "math_parser.h"
 #include "support/LOstream.h"
 
+
 using std::ostream;
 
 
-MathDecorationInset::MathDecorationInset(int d, short st)
-       : MathParInset(st, "", LM_OT_DECO), deco_(d)
-{
-       upper_ = (deco_ != LM_underline && deco_ != LM_underbrace);
-}
+MathDecorationInset::MathDecorationInset(string const & name)
+       : MathNestInset(1), name_(name)
+{}
 
 
-bool MathDecorationInset::GetLimits() const
-{ 
-       return deco_ == LM_underbrace || deco_ == LM_overbrace;
-}    
+MathInset * MathDecorationInset::clone() const
+{   
+       return new MathDecorationInset(*this);
+}
 
 
-MathedInset * MathDecorationInset::Clone()
-{   
-   MathDecorationInset * p = new MathDecorationInset(deco_, GetStyle());
-   MathedIter it(array);
-   p->setData(it.Copy());
-   return p;
+bool MathDecorationInset::upper() const
+{
+       return name_ != "underline" && name_ != "underbrace";
 }
 
 
-void
-MathDecorationInset::draw(Painter & pain, int x, int y)
-{ 
-       MathParInset::draw(pain, x + (width - dw_) / 2, y);
-       mathed_draw_deco(pain, x, y + dy_, width, dh_, deco_);
+bool MathDecorationInset::protect() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow";
 }
 
 
-void
-MathDecorationInset::Metrics()
+void MathDecorationInset::metrics(MathStyles st) const
 {
-       int h = 2 * mathed_char_height(LM_TC_VAR, size(), 'I',
-                                      ascent, descent);  
-       MathParInset::Metrics();
-       int w = Width() + 4;
-       if (w < 16) w = 16;
-       dh_ = w / 5;
-       if (dh_ > h) dh_ = h;
-       
-       if (upper_) {
-               ascent += dh_ + 2;
-               dy_ = -ascent;
+       xcell(0).metrics(st);
+       size_    = st;
+       width_   = xcell(0).width();
+       ascent_  = xcell(0).ascent();
+       descent_ = xcell(0).descent();
+
+       dh_ = 5; //mathed_char_height(LM_TC_VAR, size(), 'I', ascent_, descent_);  
+
+       if (upper()) {
+               dy_ = -ascent_ - dh_;
+               ascent_ += dh_ + 1;
        } else {
-               dy_ = descent + 2;
-               descent += dh_ + 4;
+               dy_ = descent_ + 1;
+               descent_ += dh_ + 2;
        }
-       dw_ = width;
-       width = w;
 }
 
 
-void MathDecorationInset::Write(ostream & os, bool fragile)
+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_, name_);
+}
+
+
+void MathDecorationInset::write(ostream & os, bool fragile) const
 {
-       latexkeys const * l = lm_get_key_by_id(deco_, LM_TK_WIDE);
-       if (fragile &&
-           (strcmp(l->name, "overbrace") == 0 ||
-            strcmp(l->name, "underbrace") == 0 ||
-            strcmp(l->name, "overleftarrow") == 0 ||
-            strcmp(l->name, "overrightarrow") == 0))
+       if (fragile && protect())
                os << "\\protect";
-       os << '\\' << l->name << '{';
-       MathParInset::Write(os, fragile);  
+       os << '\\' << name_ << '{';
+       cell(0).write(os, fragile);  
        os << '}';
 }
+
+
+void MathDecorationInset::writeNormal(ostream & os) const
+{
+       os << "[" << name_ << " ";
+       cell(0).writeNormal(os);
+       os << "] ";
+}