// if there was no contents, and the contents is editable,
// then we insert a box instead.
if (!has_contents && mathMacro_->nesting() == 1) {
- MathRow::Element e(MathRow::BOX);
+ // mathclass is ord because it should be spaced as a normal atom
+ MathRow::Element e(MathRow::BOX, MC_ORD);
e.color = Color_mathline;
mrow.push_back(e);
has_contents = true;
// This should never be invoked, since ArgumentProxy insets are linearized
LATTEST(false);
}
+ ///
+ int kerning(BufferView const * bv) const
+ {
+ return displayCell(bv).kerning(bv);
+ }
+ ///
+ void draw(PainterInfo &, int, int) 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 &, int, int) const {
- // This should never be invoked, since ArgumentProxy insets are linearized
- LATTEST(false);
- }
- ///
- size_t idx() const { return idx_; }
- ///
- int kerning(BufferView const * bv) const
+ MathClass mathClass() const
{
- return displayCell(bv).kerning(bv);
+ return MC_UNKNOWN;
+ // This can be refined once the pointer issues are fixed. I did not
+ // notice any immediate crash with the following code, but it is risky
+ // nevertheless:
+ //return mathMacro_->cell(idx_).mathClass();
}
private:
// 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) {
+ // mathclass is unknown because it is irrelevant for spacing
MathRow::Element e(MathRow::BOX);
e.color = Color_mathmacroblend;
mrow.push_back(e);
} else {
LBUFERR(d->macro_);
- Changer dummy = (currentMode() == TEXT_MODE)
- ? mi.base.font.changeShape(UP_SHAPE)
- : Changer();
-
// calculate metrics, hoping that all cells are seen
d->macro_->lock();
d->expanded_.metrics(mi, dim);
{
Dimension const dim = dimension(*pi.base.bv);
- setPosCache(pi, x, y);
int expx = x;
int expy = y;
drawMarkers2(pi, expx, expy);
} else {
bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
- Changer dummy = (currentMode() == TEXT_MODE)
- ? pi.base.font.changeShape(UP_SHAPE)
- : Changer();
// warm up cells
for (size_t i = 0; i < nargs(); ++i)
}
+MathClass MathMacro::mathClass() const
+{
+ // This can be just a heuristic, since it is only considered for display
+ // when the macro is not linearised. Therefore it affects:
+ // * The spacing of the inset while being edited,
+ // * Intelligent splitting
+ // * Cursor word movement (Ctrl-Arrow).
+ if (MacroData const * m = macroBackup()) {
+ // If it is a global macro and is defined explicitly
+ if (m->symbol()) {
+ MathClass mc = string_to_class(m->symbol()->extra);
+ if (mc != MC_UNKNOWN)
+ return mc;
+ }
+ }
+ // Otherwise guess from the expanded macro
+ return d->expanded_.mathClass();
+}
+
+
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.
+ // There is no way to guess the mode of user defined macros, so they are
+ // always assumed to be mathmode. Only the global macros defined in
+ // lib/symbols may be textmode.
+ mode_type mode = modeToEnsure();
+ return (mode == UNDECIDED_MODE) ? MATH_MODE : mode;
+}
+
+
+InsetMath::mode_type MathMacro::modeToEnsure() const
+{
+ // User defined macros can be either text mode or math mode for output and
+ // display. There is no way to guess. For global macros defined in
+ // lib/symbols, we ensure textmode if flagged as such, otherwise we ensure
+ // math mode.
+ if (MacroData const * m = macroBackup())
+ if (m->symbol())
+ return (m->symbol()->extra == "textmode") ? TEXT_MODE : MATH_MODE;
+ return UNDECIDED_MODE;
+}
+
- MacroData const * data = MacroTable::globalMacros().get(name());
- bool textmode = data && data->symbol() && data->symbol()->extra == "textmode";
- return textmode ? TEXT_MODE : MATH_MODE;
+MacroData const * MathMacro::macroBackup() const
+{
+ if (macro())
+ return &d->macroBackup_;
+ if (MacroData const * data = MacroTable::globalMacros().get(name()))
+ return data;
+ return nullptr;
}
void MathMacro::write(WriteStream & os) const
{
- 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");
-
+ mode_type mode = modeToEnsure();
+ bool textmode_macro = mode == TEXT_MODE;
+ bool needs_mathmode = mode == MATH_MODE;
MathEnsurer ensurer(os, needs_mathmode, true, textmode_macro);
// non-normal mode