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 5db82838bf17dec9a2708ce28021e222f66d00b0..d42bbf79d393d86fe7ff3cd1a197873fbba46039 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -5,91 +5,87 @@
 #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;
+using std::max;
 
+MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
+       : MathNestInset(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
 {   
        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)
-{ 
-       xo(x);
-       yo(y); 
-       MathParInset::draw(pain, x + dw_ + 2, y - dh_); 
-       
-       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,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent, dw_, Height(), right_);
+void MathDelimInset::write(std::ostream & os, bool fragile) const
+{
+       os << "\\left" << latexName(left_);
+       cell(0).write(os, fragile);
+       os << "\\right" << latexName(right_);
+}
+
+
+int MathDelimInset::dw() const
+{
+       int w = height() / 5;
+       if (w > 15)
+               w = 15;
+       if (w < 4)
+               w = 4;
+       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;
+       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);
 }