+#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)
+MathDelimInset::MathDelimInset(string const & l, string const & r)
: MathNestInset(1), left_(l), right_(r)
{}
}
-string MathDelimInset::latexName(latexkeys const * l)
+string MathDelimInset::latexName(string const & name)
{
- //static const string vdelim("(){}[]./|");
- string name = l->name;
if (name == "(")
return name;
if (name == "[")
}
-void MathDelimInset::write(std::ostream & os, bool fragile) const
+void MathDelimInset::write(MathWriteInfo & os) const
{
- os << "\\left" << latexName(left_);
- cell(0).write(os, fragile);
- os << "\\right" << latexName(right_);
+ os << "\\left" << latexName(left_) << cell(0)
+ << "\\right" << latexName(right_);
}
}
-void MathDelimInset::metrics(MathStyles st) const
+void MathDelimInset::metrics(MathMetricsInfo const & 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, size_.size,'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;
}
yo(y);
int const w = dw();
- int const b = y - ascent_ - 2;
+ int const b = y - ascent_;
xcell(0).draw(pain, x + w + 2, y);
- mathed_draw_deco(pain, x, b, w, height() + 4, left_);
- mathed_draw_deco(pain, x + width() - w, b, w, height() + 4, right_);
+ mathed_draw_deco(pain, x + 1, b, w, height(), left_);
+ mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
}