#include "frontends/FontMetrics.h"
-namespace lyx {
-
-
-using std::string;
-using std::max;
-using std::auto_ptr;
+namespace lyx {
static docstring convertDelimToLatexName(docstring const & name)
{
if (name.size() == 1) {
char_type const c = name[0];
- if (c == '<' || c == '(' || c == '[' || c == '.'
+ if (c == '<' || c == '(' || c == '[' || c == '.'
|| c == '>' || c == ')' || c == ']' || c == '/' || c == '|')
return name;
}
InsetMathDelim::InsetMathDelim
- (docstring const & l, docstring const & r, MathArray const & ar)
+ (docstring const & l, docstring const & r, MathData const & ar)
: InsetMathNest(1), left_(l), right_(r)
{
cell(0) = ar;
}
-auto_ptr<InsetBase> InsetMathDelim::doClone() const
+Inset * InsetMathDelim::clone() const
{
- return auto_ptr<InsetBase>(new InsetMathDelim(*this));
+ return new InsetMathDelim(*this);
}
}
-bool InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
{
- cell(0).metrics(mi);
+ using std::max;
+ Dimension dim0;
+ cell(0).metrics(mi, dim0);
Dimension t = theFontMetrics(mi.base.font).dimension('I');
int h0 = (t.asc + t.des) / 2;
- int a0 = max(cell(0).ascent(), t.asc) - h0;
- int d0 = max(cell(0).descent(), t.des) + h0;
- dw_ = cell(0).height() / 5;
+ int a0 = max(dim0.asc, t.asc) - h0;
+ int d0 = max(dim0.des, t.des) + h0;
+ dw_ = dim0.height() / 5;
if (dw_ > 8)
dw_ = 8;
if (dw_ < 4)
dw_ = 4;
- dim.wid = cell(0).width() + 2 * dw_ + 8;
+ dim.wid = dim0.width() + 2 * dw_ + 8;
dim.asc = max(a0, d0) + h0;
dim.des = max(a0, d0) - h0;
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
+ // Cache the inset dimension.
+ setDimCache(mi, dim);
}
void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
{
- int const b = y - dim_.asc;
+ Dimension const dim = dimension(*pi.base.bv);
+ int const b = y - dim.asc;
cell(0).draw(pi, x + dw_ + 4, y);
- mathed_draw_deco(pi, x + 4, b, dw_, dim_.height(), left_);
- mathed_draw_deco(pi, x + dim_.width() - dw_ - 4,
- b, dw_, dim_.height(), right_);
+ mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_);
+ mathed_draw_deco(pi, x + dim.width() - dw_ - 4,
+ b, dw_, dim.height(), right_);
setPosCache(pi, x, y);
}