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

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

diff --git a/src/mathed/xarray.C b/src/mathed/xarray.C
index e159e7294e518db40e0db87b8da1d7140dd888c4..0c19f1e8bc94c321f6ea44ef43c6753088680151 100644 (file)
--- a/src/mathed/xarray.C
+++ b/src/mathed/xarray.C
@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #ifdef __GNUG__
@@ -14,12 +13,13 @@
 using std::max;
 using std::min;
 
+
 MathXArray::MathXArray()
        : width_(0), ascent_(0), descent_(0), xo_(0), yo_(0), style_(LM_ST_TEXT)
 {}
 
 
-void MathXArray::Metrics(MathStyles st)
+void MathXArray::Metrics(MathStyles st, int, int)
 {
        if (data_.empty()) {
                mathed_char_dim(LM_TC_VAR, st, 'I', ascent_, descent_, width_); 
@@ -31,24 +31,28 @@ void MathXArray::Metrics(MathStyles st)
        width_   = 0;
        style_    = st;
 
+       // keep last values for scriptInset's need to look back
+       int asc = 0;
+       int des = 0;
+       int wid = 0;
+       mathed_char_height(LM_TC_VAR, st, 'I', asc, des);
+
        for (int pos = 0; pos < data_.size(); data_.next(pos)) {
-               MathInset * p = data_.GetInset(pos);
+               MathInset * p = data_.nextInset(pos);
                if (p) {
-                       p->Metrics(st);
-                       ascent_  = max(ascent_,  p->ascent());
-                       descent_ = max(descent_, p->descent());
-                       width_   += p->width();
+                       // only MathUpDownInsets will use the asc/des information...
+                       p->Metrics(st, asc, des);
+                       asc = p->ascent();
+                       des = p->descent();
+                       wid = p->width();
                } else {
                        char cx = data_.GetChar(pos); 
                        MathTextCodes fc = data_.GetCode(pos); 
-                       int asc;
-                       int des;
-                       int wid;
                        mathed_char_dim(fc, style_, cx, asc, des, wid);
-                       ascent_  = max(ascent_, asc);
-                       descent_ = max(descent_, des);
-                       width_   += wid;
                }
+               ascent_  = max(ascent_, asc);
+               descent_ = max(descent_, des);
+               width_   += wid;
        }
 }
 
@@ -64,7 +68,7 @@ void MathXArray::draw(Painter & pain, int x, int y)
        }
 
        for (int pos = 0; pos < data_.size(); data_.next(pos)) {
-               MathInset * p = data_.GetInset(pos);
+               MathInset * p = data_.nextInset(pos);
                if (p) {
                        p->draw(pain, x, y);
                        x += p->width();
@@ -104,7 +108,7 @@ int MathXArray::width(int pos) const
                return 0;
 
        if (data_.isInset(pos)) 
-               return data_.GetInset(pos)->width();
+               return data_.nextInset(pos)->width();
        else 
                return mathed_char_width(data_.GetCode(pos), style_, data_.GetChar(pos));
 }
@@ -112,5 +116,6 @@ int MathXArray::width(int pos) const
 std::ostream & operator<<(std::ostream & os, MathXArray const & ar)
 {
        os << ar.data_;
+       return os;
 }