fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index db3c44bc1931783d67afc86568424637418ca941..fb3ae4009c10005c18a01c705ad6ec8fa38b4d34 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,77 +1,89 @@
-#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)
+MathDecorationInset::MathDecorationInset(string const & name, int d)
+       : MathInset(1, name), deco_(d)
 {
-       upper_ = (deco_ != LM_underline && deco_ != LM_underbrace);
+       upper_ = deco_ != LM_underline && deco_ != LM_underbrace;
 }
 
 
-bool MathDecorationInset::GetLimits() const
-{ 
-       return deco_ == LM_underbrace || deco_ == LM_overbrace;
-}    
-
-
-MathedInset * MathDecorationInset::Clone()
+MathInset * MathDecorationInset::clone() const
 {   
-   MathDecorationInset * p = new MathDecorationInset(deco_, GetStyle());
-   MathedIter it(array);
-   p->setData(it.Copy());
-   return p;
+       return new MathDecorationInset(*this);
 }
 
 
-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_);
-}
-
 
-void
-MathDecorationInset::Metrics()
+void MathDecorationInset::Metrics(MathStyles st, int, int)
 {
-       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;
-       
+       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_) {
-               ascent += dh_ + 2;
-               dy_ = -ascent;
+               dy_ = -ascent_ - dh_;
+               ascent_ += dh_ + 1;
        } else {
-               dy_ = descent + 2;
-               descent += dh_ + 4;
+               dy_ = descent_ + 1;
+               descent_ += dh_ + 2;
+       }
+
+       if (deco_ == LM_not) {
+               ascent_  += dh_;
+               descent_ += dh_;
+               dh_ = height();
+               dy_ = - ascent_;
        }
-       dw_ = width;
-       width = w;
 }
 
+void MathDecorationInset::draw(Painter & pain, int x, int y)
+{ 
+       xo(x);
+       yo(x);
+       xcell(0).draw(pain, x, y);
+       mathed_draw_deco(pain, x, y + dy_, width_, dh_, deco_);
+}
 
-void MathDecorationInset::Write(ostream & os, bool fragile)
+
+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))
+                       (name_ == "overbrace" ||
+                        name_ == "underbrace" ||
+                        name_ == "overleftarrow" ||
+                        name_ == "overrightarrow"))
                os << "\\protect";
-       os << '\\' << l->name << '{';
-       MathParInset::Write(os, fragile);  
-       os << '}';
+       os << '\\' << name_;
+
+       if (deco_ == LM_not)
+               os << ' ';
+       else
+               os << '{';
+
+       cell(0).Write(os, fragile);  
+
+       if (deco_ != LM_not)
+               os << '}';
+}
+
+void MathDecorationInset::WriteNormal(ostream & os) const
+{
+       os << "[" << name_ << " ";
+       cell(0).WriteNormal(os);
+       os << "] ";
 }