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

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 0baf32eb78ffd3b19342a92f287683dcd7a6f103..1ee6475ddbffc05cd5f6ca88834eb6b6f92d218c 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,94 +1,96 @@
-#include <config.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
 
 #include "math_deliminset.h"
-#include "math_iter.h"
 #include "math_parser.h"
-#include "LColor.h"
 #include "Painter.h"
 #include "mathed/support.h"
 #include "support/LOstream.h"
 
-using std::ostream;
 
+MathDelimInset::MathDelimInset(int l, int r)
+       : MathInset(1), left_(l), right_(r)
+{}
 
-MathDelimInset::MathDelimInset(int l, int r, short st)
-       : MathParInset(st, "", LM_OT_DELIM), left(l), right(r) {}
 
-
-MathedInset * MathDelimInset::Clone()
+MathInset * MathDelimInset::clone() const
 {   
-       MathDelimInset * p = new MathDelimInset(left, right, GetStyle());
-       MathedIter it(array);
-       p->SetData(it.Copy());
-       return p;
+       return new MathDelimInset(*this);
 }
 
 
-
-void MathDelimInset::Write(ostream & os, bool fragile)
+void MathDelimInset::Write(std::ostream & os, bool fragile) const
 {
-       latexkeys * l = (left != '|') ? lm_get_key_by_id(left, LM_TK_SYM): 0;
-       latexkeys * r = (right != '|') ? lm_get_key_by_id(right, LM_TK_SYM): 0;
+       latexkeys const * l = (left_ != '|') ?
+               lm_get_key_by_id(left_, LM_TK_SYM) : 0;
+       latexkeys const * r = (right_ != '|') ?
+               lm_get_key_by_id(right_, LM_TK_SYM) : 0;
+
        os << "\\left";
-       if (l) {
+       if (l)
                os << '\\' << l->name << ' ';
-       } else {
-               if (left == '{' || left == '}') {
-                       os << '\\' << char(left) << ' ';
-               } else {
-                       os << char(left) << ' ';
-               }
+       else {
+               if (left_ == '{' || left_ == '}')
+                       os << '\\' << char(left_) << ' ';
+               else
+                       os << char(left_) << ' ';
        }
-       MathParInset::Write(os, fragile);
+
+       cell(0).Write(os, fragile);
+
        os << "\\right";
-       if (r) {
+       if (r)
                os << '\\' << r->name << ' ';
-       } else {
-               if (right == '{' || right == '}') {
-                       os << '\\' << char(right) << ' ';
-               } else {
-                       os << char(right) << ' ';
-               }
+       else {
+               if (right_ == '{' || right_ == '}')
+                       os << '\\' << char(right_) << ' ';
+               else
+                       os << char(right_) << ' ';
        }
 }
 
 
-
-void
-MathDelimInset::draw(Painter & pain, int x, int y)
+void MathDelimInset::draw(Painter & pain, int x, int y)
 { 
        xo(x);
        yo(y); 
-       MathParInset::draw(pain, x + dw + 2, y - dh); 
+
+       int w = dw();
+       xcell(0).draw(pain, x + w, y);
        
-       if (left == '.') {
-               pain.line(x + 4, yo() - ascent,
-                         x + 4, yo() + descent,
+       if (left_ == '.') {
+               pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
-               mathed_draw_deco(pain, x, y - ascent, dw, Height(), left);
-       x += Width() - dw - 2;
-       if (right == '.') {
-               pain.line(x + 4, yo() - ascent,
-                         x + 4, yo() + descent,
+               mathed_draw_deco(pain, x, y - ascent_, w, height(), left_);
+
+       x += width() - w - 2;
+
+       if (right_ == '.') {
+               pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
-               mathed_draw_deco(pain, x, y - ascent, dw, Height(), right);
+               mathed_draw_deco(pain, x, y - ascent_, w, height(), right_);
 }
 
 
-void
-MathDelimInset::Metrics()
+int MathDelimInset::dw() const
 {
-       MathParInset::Metrics();
-       int d;
-       
-       mathed_char_height(LM_TC_CONST, size(), 'I', d, dh);
-       dh /= 2;
-       ascent += 2 + dh;
-       descent += 2 - dh;
-       dw = Height()/5;
-       if (dw > 15) dw = 15;
-       if (dw < 6) dw = 6;
-       width += 2 * dw + 4;
+       int w = height()/5;
+       if (w > 15)
+               w = 15;
+       if (w < 6)
+               w = 6;
+       return w;
+}
+
+
+void MathDelimInset::Metrics(MathStyles st, int, int)
+{
+       xcell(0).Metrics(st);
+       size_    = st;
+       ascent_  = xcell(0).ascent() + 2;
+       descent_ = xcell(0).descent() + 2;
+       width_   = xcell(0).width() + 2 * dw() + 4;
 }