rework of MathDelimInset almost finished... did that break anything?

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index bd5eda375d5f6ff7f69e25b1e7d7af2d847980e8..f5cbc7b2f495c03a3b46f33d70b70e00d6dbb681 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,93 +1,95 @@
-#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, short st)
-       : MathParInset(st, "", LM_OT_DELIM), left_(l), right_(r) {}
+MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
+       : MathNestInset(1), left_(l), right_(r)
+{}
 
 
-MathedInset * MathDelimInset::Clone()
+MathInset * MathDelimInset::clone() const
 {   
        return new MathDelimInset(*this);
 }
 
 
-void MathDelimInset::Write(ostream & os, bool fragile)
+string MathDelimInset::latexName(latexkeys const * l)
 {
-       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) {
-               os << '\\' << l->name << ' ';
-       } else {
-               if (left_ == '{' || left_ == '}') {
-                       os << '\\' << char(left_) << ' ';
-               } else {
-                       os << char(left_) << ' ';
-               }
-       }
-       MathParInset::Write(os, fragile);
-       os << "\\right";
-       if (r) {
-               os << '\\' << r->name << ' ';
-       } else {
-               if (right_ == '{' || right_ == '}') {
-                       os << '\\' << char(right_) << ' ';
-               } else {
-                       os << char(right_) << ' ';
-               }
-       }
+       //static const string vdelim("(){}[]./|");
+       string name = l->name;
+       if (name == "(")
+               return name;
+       if (name == "[")
+               return name;
+       if (name == ".")
+               return name;
+       if (name == ")")
+               return name;
+       if (name == "]")
+               return name;
+       if (name == "/")
+               return name;
+       if (name == "|")
+               return name;
+       return "\\" + name + " ";
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y)
+void MathDelimInset::write(std::ostream & os, bool fragile) const
+{
+       os << "\\left" << latexName(left_);
+       cell(0).write(os, fragile);
+       os << "\\right" << latexName(right_);
+}
+
+
+void MathDelimInset::draw(Painter & pain, int x, int y) const
 { 
        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 (latexName(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 (latexName(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_);
+}
+
+
+int MathDelimInset::dw() const
+{
+       int w = height()/5;
+       if (w > 15)
+               w = 15;
+       if (w < 6)
+               w = 6;
+       return w;
 }
 
 
-void MathDelimInset::Metrics()
+void MathDelimInset::metrics(MathStyles st) 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;
+       xcell(0).metrics(st);
+       size_    = st;
+       ascent_  = xcell(0).ascent() + 2;
+       descent_ = xcell(0).descent() + 2;
+       width_   = xcell(0).width() + 2 * dw() + 4;
 }