#include "math_extern.h"
+using std::max;
+
+
MathDelimInset::MathDelimInset(string const & l, string const & r)
: MathNestInset(1), left_(l), right_(r)
{}
MathInset * MathDelimInset::clone() const
-{
+{
return new MathDelimInset(*this);
}
int MathDelimInset::dw() const
{
int w = height() / 5;
- if (w > 12)
- w = 12;
+ if (w > 8)
+ w = 8;
if (w < 4)
w = 4;
return w;
{
xcell(0).metrics(mi);
int a, d, w;
- mathed_char_dim(LM_TC_VAR, mi, 'I', a, d, w);
+ LyXFont font;
+ whichFont(font, LM_TC_VAR, mi);
+ mathed_char_dim(font, '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_ = std::max(a0, d0) + h0;
- descent_ = std::max(a0, d0) - h0;
- width_ = xcell(0).width() + 2 * dw() + 4;
+ int a0 = max(xcell(0).ascent(), a) - h0;
+ int d0 = max(xcell(0).descent(), d) + h0;
+ ascent_ = max(a0, d0) + h0;
+ descent_ = max(a0, d0) - h0;
+ width_ = xcell(0).width() + 2 * dw() + 8;
}
void MathDelimInset::draw(Painter & pain, int x, int y) const
-{
+{
int const w = dw();
int const b = y - ascent_;
- xcell(0).draw(pain, x + w + 2, y);
- mathed_draw_deco(pain, x + 1, b, w, height(), left_);
- mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
+ xcell(0).draw(pain, x + w + 4, y);
+ mathed_draw_deco(pain, x + 4, b, w, height(), left_);
+ mathed_draw_deco(pain, x + width() - w - 4, b, w, height(), right_);
}
bool mat =
cell(0).size() == 1 && cell(0).begin()->nucleus()
&& cell(0).begin()->nucleus()->asMatrixInset();
- if (mat)
+ if (mat)
os << "linalg[det](" << cell(0) << ")";
else
os << "abs(" << cell(0) << ")";