remove symbol_def.h

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 6e1134f19a52be48cae9d4d12f219edb5309963c..d42bbf79d393d86fe7ff3cd1a197873fbba46039 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,33 +1,21 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "Painter.h"
 #include "mathed/support.h"
 #include "support/LOstream.h"
 
+using std::max;
 
 MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
        : MathNestInset(1), left_(l), right_(r)
 {}
 
 
-MathDelimInset::MathDelimInset(int l, int r)
-       : MathNestInset(1)
-{
-       string ls;
-       ls += l;
-       left_ = in_word_set(ls);
-
-       string rs;
-       rs += r;
-       right_ = in_word_set(rs);
-}
-
-
-
 MathInset * MathDelimInset::clone() const
 {   
        return new MathDelimInset(*this);
@@ -64,37 +52,13 @@ void MathDelimInset::write(std::ostream & os, bool fragile) const
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y) const
-{ 
-       xo(x);
-       yo(y); 
-
-       int w = dw();
-       xcell(0).draw(pain, x + w, y);
-       
-       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_, 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_, w, height(), right_);
-}
-
-
 int MathDelimInset::dw() const
 {
-       int w = height()/5;
+       int w = height() / 5;
        if (w > 15)
                w = 15;
-       if (w < 6)
-               w = 6;
+       if (w < 4)
+               w = 4;
        return w;
 }
 
@@ -103,7 +67,25 @@ void MathDelimInset::metrics(MathStyles st) const
 {
        xcell(0).metrics(st);
        size_    = st;
-       ascent_  = xcell(0).ascent() + 2;
-       descent_ = xcell(0).descent() + 2;
+       int a, d, w;
+       mathed_char_dim(LM_TC_VAR, st,'I', a, d, w);
+       int h0   = (a + d) / 2;
+       int a0   = std::max(xcell(0).ascent(), a)   - h0;
+       int d0   = std::max(xcell(0).descent(), d)  + h0;
+       ascent_  = max(a0, d0) + h0;
+       descent_ = max(a0, d0) - h0;
        width_   = xcell(0).width() + 2 * dw() + 4;
 }
+
+
+void MathDelimInset::draw(Painter & pain, int x, int y) const
+{ 
+       xo(x);
+       yo(y); 
+
+       int const w = dw();
+       int const b = y - ascent_ - 2;
+       xcell(0).draw(pain, x + w + 2, y);
+       mathed_draw_deco(pain, x + 1, b, w, height() + 4, left_->name);
+       mathed_draw_deco(pain, x + width() - w - 1, b, w, height() + 4, right_->name);
+}