static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER),
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NONUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
// alignment is not implemented in the LyXHTML output.
char InsetMathHull::defaultColAlign(col_type col)
{
- return colAlign(type_, col);
+ return colAlign(type_, col, buffer().params());
}
case hullXAlignAt:
case hullXXAlignAt:
case hullFlAlign:
- return colAlign(type_, col(idx));
+ return colAlign(type_, col(idx), buffer().params());
default:
break;
}
// insert a gap in front of the formula
// value was hardcoded to 1 pixel
dim.wid += mi.base.bv->zoomedPixels(1) ;
- if (display() != Inline) {
+ if (display()) {
dim.asc += display_margin;
dim.des += display_margin;
}
}
Changer dummy1 = mi.base.changeFontSet(standardFont());
- Changer dummy2 = mi.base.font.changeStyle(display() != Inline ? LM_ST_DISPLAY
- : LM_ST_TEXT);
+ Changer dummy2 = mi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
// let the cells adjust themselves
InsetMathGrid::metrics(mi, dim);
- if (display() != Inline) {
+ if (display()) {
dim.asc += display_margin;
dim.des += display_margin;
}
Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
: Changer();
Changer dummy1 = pi.base.changeFontSet(standardFont());
- Changer dummy2 = pi.base.font.changeStyle(display() != Inline ? LM_ST_DISPLAY
- : LM_ST_TEXT);
+ Changer dummy2 = pi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
int xmath = x;
BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
void InsetMathHull::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
{
- if (display() != Inline) {
+ if (display()) {
InsetMathGrid::metricsT(mi, dim);
} else {
odocstringstream os;
void InsetMathHull::drawT(TextPainter & pain, int x, int y) const
{
- if (display() != Inline) {
+ if (display()) {
InsetMathGrid::drawT(pain, x, y);
} else {
odocstringstream os;
case hullMultline:
case hullGather:
if (buffer().params().is_math_indent)
- return Display | AlignLeft;
+ return AlignLeft;
else
- return Display;
+ return AlignCenter;
}
// avoid warning
- return Display;
+ return AlignCenter;
}
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
numbered_[row] = NONUMBER;
- std::swap(label, label_[row]);
- std::swap(number, numbers_[row]);
+ swap(label, label_[row]);
+ swap(number, numbers_[row]);
} else
numbered = false;
}
return;
if (row + 1 == nrows())
--row;
- std::swap(numbered_[row], numbered_[row + 1]);
- std::swap(numbers_[row], numbers_[row + 1]);
- std::swap(label_[row], label_[row + 1]);
+ swap(numbered_[row], numbered_[row + 1]);
+ swap(numbers_[row], numbers_[row + 1]);
+ swap(label_[row], label_[row + 1]);
InsetMathGrid::swapRow(row);
}
if (nrows() <= 1 || !rowChangeOK())
return;
if (row + 1 == nrows() && type_ == hullMultline) {
- std::swap(numbered_[row - 1], numbered_[row]);
- std::swap(numbers_[row - 1], numbers_[row]);
- std::swap(label_[row - 1], label_[row]);
+ swap(numbered_[row - 1], numbered_[row]);
+ swap(numbers_[row - 1], numbers_[row]);
+ swap(label_[row - 1], label_[row]);
InsetMathGrid::delRow(row);
return;
}
OutputParams const & op, size_t max_length) const
{
// Try enabling this now that there is a flag as requested at #2275.
- if (buffer().isExporting() && display() != Inline) {
+ if (buffer().isExporting() && display()) {
Dimension dim;
TextMetricsInfo mi;
metricsT(mi, dim);