#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
+#include "support/RefChanger.h"
#include "support/textutils.h"
#include <ostream>
bool addToMathRow(MathRow & mrow, MetricsInfo & mi) const
{
// macro arguments are in macros
- LATTEST(mi.base.macro_nesting > 0);
- if (mi.base.macro_nesting == 1)
- mi.base.macro_nesting = 0;
+ LATTEST(mathMacro_->nesting() > 0);
+ /// The macro nesting can change display of insets. Change it locally.
+ Changer chg = make_change(mi.base.macro_nesting, mathMacro_->nesting());
- MathRow::Element e_beg(MathRow::BEG_ARG, mi);
+ MathRow::Element e_beg(MathRow::BEG_ARG);
e_beg.macro = mathMacro_;
e_beg.ar = &mathMacro_->cell(idx_);
mrow.push_back(e_beg);
// if there was no contents, and the contents is editable,
// then we insert a box instead.
- if (!has_contents && mi.base.macro_nesting == 0) {
- MathRow::Element e(MathRow::BOX, mi);
+ if (!has_contents && mathMacro_->nesting() == 1) {
+ MathRow::Element e(MathRow::BOX);
e.color = Color_mathline;
mrow.push_back(e);
has_contents = true;
}
- if (mi.base.macro_nesting == 0)
- mi.base.macro_nesting = 1;
-
- MathRow::Element e_end(MathRow::END_ARG, mi);
+ MathRow::Element e_end(MathRow::END_ARG);
e_end.macro = mathMacro_;
e_end.ar = &mathMacro_->cell(idx_);
return has_contents;
}
///
- void metrics(MetricsInfo & mi, Dimension & dim) const {
- // macro arguments are in macros
- LATTEST(mi.base.macro_nesting > 0);
- if (mi.base.macro_nesting == 1)
- mi.base.macro_nesting = 0;
-
- mathMacro_->macro()->unlock();
- mathMacro_->cell(idx_).metrics(mi, dim);
-
- if (!mathMacro_->editMetrics(mi.base.bv)
- && mathMacro_->cell(idx_).empty())
- def_.metrics(mi, dim);
-
- mathMacro_->macro()->lock();
- if (mi.base.macro_nesting == 0)
- mi.base.macro_nesting = 1;
+ void metrics(MetricsInfo &, Dimension &) const {
+ // This should never be invoked, since ArgumentProxy insets are linearized
+ LATTEST(false);
}
// write(), normalize(), infoize() and infoize2() are not needed since
// MathMacro uses the definition and not the expanded cells.
///
void octave(OctaveStream & os) const { os << mathMacro_->cell(idx_); }
///
- void draw(PainterInfo & pi, int x, int y) const {
- LATTEST(pi.base.macro_nesting > 0);
- if (pi.base.macro_nesting == 1)
- pi.base.macro_nesting = 0;
-
- if (mathMacro_->editMetrics(pi.base.bv)) {
- // The only way a ArgumentProxy can appear is in a cell of the
- // MathMacro. Moreover the cells are only drawn in the DISPLAY_FOLDED
- // mode and then, if the macro is edited the monochrome
- // mode is entered by the MathMacro before calling the cells' draw
- // method. Then eventually this code is reached and the proxy leaves
- // monochrome mode temporarely. Hence, if it is not in monochrome
- // here (and the assert triggers in pain.leaveMonochromeMode())
- // it's a bug.
- pi.pain.leaveMonochromeMode();
- mathMacro_->cell(idx_).draw(pi, x, y);
- pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
- } else if (mathMacro_->cell(idx_).empty()) {
- mathMacro_->cell(idx_).setXY(*pi.base.bv, x, y);
- def_.draw(pi, x, y);
- } else
- mathMacro_->cell(idx_).draw(pi, x, y);
-
- if (pi.base.macro_nesting == 0)
- pi.base.macro_nesting = 1;
+ void draw(PainterInfo &, int, int) const {
+ // This should never be invoked, since ArgumentProxy insets are linearized
+ LATTEST(false);
}
///
size_t idx() const { return idx_; }
bool isUpdating_;
/// maximal number of arguments the macro is greedy for
size_t appetite_;
+ /// Level of nesting in macros (including this one)
+ int nesting_;
};
// This is the same as what is done in metrics().
d->editing_[mi.base.bv] = editMode(mi.base.bv);
+ /// The macro nesting can change display of insets. Change it locally.
+ Changer chg = make_change(mi.base.macro_nesting, d->nesting_);
+
if (displayMode() != MathMacro::DISPLAY_NORMAL
|| d->editing_[mi.base.bv])
return InsetMath::addToMathRow(mrow, mi);
- MathRow::Element e_beg(MathRow::BEG_MACRO, mi);
+ MathRow::Element e_beg(MathRow::BEG_MACRO);
e_beg.macro = this;
mrow.push_back(e_beg);
- ++mi.base.macro_nesting;
-
d->macro_->lock();
bool has_contents = d->expanded_.addToMathRow(mrow, mi);
d->macro_->unlock();
// if there was no contents and the array is editable, then we
// insert a grey box instead.
if (!has_contents && mi.base.macro_nesting == 1) {
- MathRow::Element e(MathRow::BOX, mi);
+ MathRow::Element e(MathRow::BOX);
e.color = Color_mathmacroblend;
mrow.push_back(e);
has_contents = true;
}
- --mi.base.macro_nesting;
-
- MathRow::Element e_end(MathRow::END_MACRO, mi);
+ MathRow::Element e_end(MathRow::END_MACRO);
e_end.macro = this;
mrow.push_back(e_end);
}
+int MathMacro::nesting() const
+{
+ return d->nesting_;
+}
+
+
void MathMacro::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
- // the macro contents is not editable (except the arguments)
- ++mi.base.macro_nesting;
+ /// The macro nesting can change display of insets. Change it locally.
+ Changer chg = make_change(mi.base.macro_nesting, d->nesting_);
// set edit mode for which we will have calculated metrics. But only
d->editing_[mi.base.bv] = editMode(mi.base.bv);
dim.des += 2;
}
}
-
- // restore macro nesting
- --mi.base.macro_nesting;
}
void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
- UpdateType utype)
+ UpdateType utype, int nesting)
{
// block recursive calls (bug 8999)
if (d->isUpdating_)
if (d->macro_ == 0)
return;
+ // remember nesting level of this macro
+ d->nesting_ = nesting;
+
// update requires
d->requires_ = d->macro_->requires();
// protected by UpdateLocker.
if (d->macro_->expand(values, d->expanded_)) {
if (utype == OutputUpdate && !d->expanded_.empty())
- d->expanded_.updateMacros(cur, mc, utype);
+ d->expanded_.updateMacros(cur, mc, utype, nesting);
}
// get definition for list edit mode
docstring const & display = d->macro_->display();
dim.height() - 2, Color_mathmacroframe);
drawMarkers2(pi, expx, expy);
} else {
- // the macro contents is not editable (except the arguments)
- ++pi.base.macro_nesting;
-
bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
Changer dummy = (currentMode() == TEXT_MODE)
? pi.base.font.changeShape(UP_SHAPE)
} else
d->expanded_.draw(pi, expx, expy);
- --pi.base.macro_nesting;
-
if (!drawBox)
drawMarkers(pi, x, y);