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 1f46ecf5b5bad39dc3cbe4cfac9c15079b6a95bf..d42bbf79d393d86fe7ff3cd1a197873fbba46039 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,13 +1,15 @@
+#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)
@@ -65,8 +67,13 @@ void MathDelimInset::metrics(MathStyles st) const
 {
        xcell(0).metrics(st);
        size_    = st;
-       ascent_  = std::max(xcell(0).ascent(), mathed_char_ascent(LM_TC_VAR, st,'I'));
-       descent_ = xcell(0).descent();
+       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;
 }
 
@@ -76,20 +83,9 @@ void MathDelimInset::draw(Painter & pain, int x, int y) const
        xo(x);
        yo(y); 
 
-       int w = dw();
+       int const w = dw();
+       int const b = y - ascent_ - 2;
        xcell(0).draw(pain, x + w + 2, y);
-       
-       if (latexName(left_) == ".") {
-               pain.line(x + 2, yo() - ascent_, x + 2, yo() + descent_,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent_ - 2, w, height() + 4, left_);
-
-       x += width();
-
-       if (latexName(right_) == ".") {
-               pain.line(x + 2, yo() - ascent_, x + 2, yo() + descent_,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x - dw(), y - ascent_ - 2, w, height() + 4, right_);
+       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);
 }