Make sure that math macros are updated at export time.

The math macros system is quite complex. Macros are updated during
metrics calculation, so a missing update is very likely to cause a
crash. This commit tries to assure that they are updated at export
time, which also happens when the table of contents is updated.
Moreover, in order to circumvent a possible missing update, when
a math macro is detected we try to avoid using the sym_ member
of the MacroData class, as it may contain bogus values.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 0212b165d1cfd2dd0ed18f06a2886b2a71860872..dd18b25bd88cebe77acff0b2a173ab768a0c094a 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -495,7 +495,9 @@ void BufferView::processUpdateFlags(Update::flags flags)
 
        // updateMetrics() does not update paragraph position
        // This is done at draw() time. So we need a redraw!
-       buffer_.changed(false);
+       // We pass true so that metrics are computed for the sake
+       // of having MacroData updated.
+       buffer_.changed(true);
 
        if (needsFitCursor()) {
                // The cursor is off screen so ensure it is visible.
@@ -2181,7 +2183,9 @@ void BufferView::updateHoveredInset() const
 
                // This event (moving without mouse click) is not passed further.
                // This should be changed if it is further utilized.
-               buffer_.changed(false);
+               // We pass true so that metrics are computed for the sake
+               // of having MacroData updated.
+               buffer_.changed(true);
        }
 }
 

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 4529cf92807800219d23035e59122ae78ab3706e..cb853a3ba952ee6604ca0c05dae1ddcd40a3f5ad 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -614,7 +614,8 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
                drawMarkers2(pi, expx, expy);
        } else {
                bool drawBox = lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_INLINE_BOX;
-               bool upshape = d->macro_ && d->macro_->symbol()
+               bool user_macro = mathedWordList().find(name()) == mathedWordList().end();
+               bool upshape = user_macro ? false : d->macro_ && d->macro_->symbol()
                                && d->macro_->symbol()->extra == "textmode";
                Changer dummy = pi.base.font.changeShape(upshape ? UP_SHAPE
                                                        : pi.base.font.shape());
@@ -929,9 +930,10 @@ bool MathMacro::folded() const
 
 void MathMacro::write(WriteStream & os) const
 {
-       bool const textmode_macro = d->macro_ && d->macro_->symbol()
+       bool user_macro = mathedWordList().find(name()) == mathedWordList().end();
+       bool textmode_macro = user_macro ? false : d->macro_ && d->macro_->symbol()
                                && d->macro_->symbol()->extra == "textmode";
-       bool const needs_mathmode = d->macro_ && (!d->macro_->symbol()
+       bool needs_mathmode = user_macro ? bool(d->macro_) : d->macro_ && (!d->macro_->symbol()
                                || d->macro_->symbol()->extra != "textmode");
 
        MathEnsurer ensurer(os, needs_mathmode, true, textmode_macro);