Fix assertion when checking if change in selection

[lyx.git] / src / mathed / MathData.cpp

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 482d50636c0143f862f1ddfe6c6975bd7174d291..1c7eaccfa4c73470bd891c2d0a41a1fcf165944f 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -52,6 +52,14 @@ MathData::MathData(Buffer * buf, const_iterator from, const_iterator to)
 {}
 
 
+void MathData::setBuffer(Buffer & b)
+{
+       buffer_ = &b;
+       for (MathAtom & at : *this)
+               at.nucleus()->setBuffer(b);
+}
+
+
 MathAtom & MathData::operator[](pos_type pos)
 {
        LBUFERR(pos < size());
@@ -259,12 +267,19 @@ bool isInside(DocIterator const & it, MathData const & ar,
 #endif
 
 
+bool MathData::hasCaret(BufferView * bv) const
+{
+       Cursor & cur = bv->cursor();
+       return cur.inMathed() && &cur.cell() == this;
+}
+
+
 void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
 {
        frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
        BufferView * bv = mi.base.bv;
        int const Iascent = fm.dimension('I').ascent();
-       int xascent = fm.dimension('x').ascent();
+       int xascent = fm.xHeight();
        if (xascent >= Iascent)
                xascent = (2 * Iascent) / 3;
        minasc_ = xascent;
@@ -273,7 +288,7 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
        sshift_ = xascent / 4;
 
        MathRow mrow(mi, this);
-       mrow.metrics(mi, dim);
+       bool has_caret = mrow.metrics(mi, dim);
        mrow_cache_[bv] = mrow;
        kerning_ = mrow.kerning(bv);
 
@@ -281,7 +296,7 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
        if (tight)
                // FIXME: this is the minimal ascent seen empirically, check
                // what the TeXbook says.
-               dim.asc = max(dim.asc, fm.ascent('x'));
+               dim.asc = max(dim.asc, fm.xHeight());
        else {
                dim.asc = max(dim.asc, fm.maxAscent());
                dim.des = max(dim.des, fm.maxDescent());
@@ -289,8 +304,8 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
 
        // This is one of the the few points where the drawing font is known,
        // so that we can set the caret vertical dimensions.
-       Cursor & cur = bv->cursor();
-       if (cur.inMathed() && &cur.cell() == this)
+       has_caret |= hasCaret(bv);
+       if (has_caret)
                bv->setCaretAscentDescent(min(dim.asc, fm.maxAscent()),
                                          min(dim.des, fm.maxDescent()));