///
InsetCode lyxCode() const { return ARGUMENT_PROXY_CODE; }
///
+ bool addToMathRow(MathRow & mrow, MetricsInfo const & mi) const
+ {
+ MathRow::Element e(MathRow::BEG_ARG);
+ e.macro = mathMacro_;
+ e.ar = &mathMacro_->cell(idx_);
+ mrow.push_back(e);
+
+ mathMacro_->macro()->unlock();
+ bool const has_contents = mathMacro_->cell(idx_).addToMathRow(mrow, mi);
+ mathMacro_->macro()->lock();
+
+ e.type = MathRow::END_ARG;
+ mrow.push_back(e);
+
+ if (has_contents)
+ return true;
+ // if there was no contents, then we insert the empty macro inset
+ // instead.
+ return InsetMath::addToMathRow(mrow, mi);
+ }
+ ///
void metrics(MetricsInfo & mi, Dimension & dim) const {
mathMacro_->macro()->unlock();
mathMacro_->cell(idx_).metrics(mi, dim);
}
+bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo const & mi) const
+{
+ // set edit mode for which we will have calculated row.
+ // This is the same as what is done in metrics().
+ d->editing_[mi.base.bv] = editMode(mi.base.bv);
+
+ if (displayMode() == MathMacro::DISPLAY_NORMAL
+ && !d->editing_[mi.base.bv]) {
+ MathRow::Element e(MathRow::BEG_MACRO);
+ e.macro = this;
+ mrow.push_back(e);
+
+ d->macro_->lock();
+ bool const has_contents = d->expanded_.addToMathRow(mrow, mi);
+ d->macro_->unlock();
+
+ e.type = MathRow::END_MACRO;
+ mrow.push_back(e);
+
+ if (has_contents)
+ return true;
+ // if there was no contents, then we insert the empty macro inset
+ // instead.
+ }
+ return InsetMath::addToMathRow(mrow, mi);
+}
+
+
Inset * MathMacro::clone() const
{
MathMacro * copy = new MathMacro(*this);
}
-MacroData const * MathMacro::macro()
+MacroData const * MathMacro::macro() const
{
return d->macro_;
}
if (lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX
&& d->editing_[mi.base.bv]) {
FontInfo font = mi.base.font;
- augmentFont(font, from_ascii("lyxtex"));
+ augmentFont(font, "lyxtex");
Dimension namedim;
mathed_string_dim(font, name(), namedim);
#if 0
}
// get definition for list edit mode
docstring const & display = d->macro_->display();
- asArray(display.empty() ? d->macro_->definition() : display, d->definition_);
+ asArray(display.empty() ? d->macro_->definition() : display,
+ d->definition_, Parse::QUIET);
}
drawMarkers2(pi, expx, expy);
} else {
bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
+ bool upshape = currentMode() == TEXT_MODE;
+ Changer dummy = pi.base.font.changeShape(upshape ? UP_SHAPE
+ : pi.base.font.shape());
// warm up cells
for (size_t i = 0; i < nargs(); ++i)
if (drawBox && d->editing_[pi.base.bv]) {
// draw header and rectangle around
FontInfo font = pi.base.font;
- augmentFont(font, from_ascii("lyxtex"));
+ augmentFont(font, "lyxtex");
font.setSize(FONT_SIZE_TINY);
font.setColor(Color_mathmacrolabel);
Dimension namedim;
}
+InsetMath::mode_type MathMacro::currentMode() const
+{
+ // User defined macros are always assumed to be mathmode macros.
+ // Only the global macros defined in lib/symbols may be textmode.
+
+ MacroData const * data = MacroTable::globalMacros().get(name());
+ bool textmode = data && data->symbol() && data->symbol()->extra == "textmode";
+ return textmode ? TEXT_MODE : MATH_MODE;
+}
+
+
void MathMacro::validate(LaTeXFeatures & features) const
{
// Immediately after a document is loaded, in some cases the MacroData
void MathMacro::write(WriteStream & os) const
{
- MathEnsurer ensurer(os, d->macro_ != 0, true);
+ MacroData const * data = MacroTable::globalMacros().get(name());
+ bool textmode_macro = data && data->symbol()
+ && data->symbol()->extra == "textmode";
+ bool needs_mathmode = data && (!data->symbol()
+ || data->symbol()->extra != "textmode");
+
+ MathEnsurer ensurer(os, needs_mathmode, true, textmode_macro);
// non-normal mode
if (d->displayMode_ != DISPLAY_NORMAL) {