Fixup 89662a68: remove markers that should not be there

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

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index dc943bb52043ccc8922f4737fca06d169335840c..e21beb236e98730460d693f68c0aab4705482aaa 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -335,7 +335,7 @@ void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
 
 
 void InsetMathHull::addToToc(DocIterator const & pit, bool output_active,
-                                                        UpdateType utype) const
+                                                        UpdateType utype, TocBackend & backend) const
 {
        if (!buffer_) {
                //FIXME: buffer_ should be set at creation for this inset! Problem is
@@ -344,15 +344,42 @@ void InsetMathHull::addToToc(DocIterator const & pit, bool output_active,
                return;
        }
 
-       shared_ptr<Toc> toc = buffer().tocBackend().toc("equation");
-
+       TocBuilder & b = backend.builder("equation");
+       // compute first and last item
+       row_type first = nrows();
+       for (row_type row = 0; row != nrows(); ++row)
+               if (numbered(row)) {
+                       first = row;
+                       break;
+               }
+       if (first == nrows())
+               // no equation
+               return;
+       row_type last = nrows() - 1;
+       for (; last != 0; --last)
+               if (numbered(last))
+                       break;
+       // add equation numbers
+       b.pushItem(pit, docstring(), output_active);
+       if (first != last)
+               b.argumentItem(bformat(from_ascii("(%1$s-%2$s)"),
+                                      numbers_[first], numbers_[last]));
        for (row_type row = 0; row != nrows(); ++row) {
                if (!numbered(row))
                        continue;
                if (label_[row])
-                       label_[row]->addToToc(pit, output_active, utype);
-               toc->push_back(TocItem(pit, 0, nicelabel(row), output_active));
+                       label_[row]->addToToc(pit, output_active, utype, backend);
+               docstring label = nicelabel(row);
+               if (first == last)
+                       // this is the only equation
+                       b.argumentItem(label);
+               else {
+                       // insert as sub-items
+                       b.pushItem(pit, label, output_active);
+                       b.pop();
+               }
        }
+       b.pop();
 }
 
 
@@ -515,14 +542,12 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
                        if (display())
                                dim.des += displayMargin();
                }
-               // Cache the inset dimension.
-               setDimCache(mi, dim);
                return;
        }
 
-       // FIXME: Changing the same object repeatedly is inefficient.
        Changer dummy1 = mi.base.changeFontSet(standardFont());
-       Changer dummy2 = mi.base.changeStyle(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       Changer dummy2 = mi.base.font.changeStyle(display() ? LM_ST_DISPLAY
+                                                           : LM_ST_TEXT);
 
        // let the cells adjust themselves
        InsetMathGrid::metrics(mi, dim);
@@ -542,17 +567,15 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
                        dim.wid += 30 + l;
        }
 
-       if (type_ == hullRegexp)
-               dim.wid += 2;
+       // reserve some space for marker.
+       dim.wid += 2;
+
        // make it at least as high as the current font
        int asc = 0;
        int des = 0;
        math_font_max_dim(mi.base.font, asc, des);
        dim.asc = max(dim.asc, asc);
        dim.des = max(dim.des, des);
-       // Cache the inset dimension.
-       // FIXME: This will overwrite InsetMathGrid dimension, is that OK?
-       setDimCache(mi, dim);
 }
 
 
@@ -600,7 +623,8 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
        if (previewState(bv)) {
                // Do not draw change tracking cue if taken care of by RowPainter
                // already.
-               Changer dummy = make_change(pi.change_, Change(), !canPaintChange(*bv));
+               Changer dummy = !canPaintChange(*bv) ? make_change(pi.change_, Change())
+                       : Changer();
                if (previewTooSmall(dim)) {
                        // we have an extra frame
                        preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
@@ -608,18 +632,20 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
                        // one pixel gap in front
                        preview_->draw(pi, x + 1, y);
                }
-               setPosCache(pi, x, y);
                return;
        }
 
        ColorCode color = pi.selected && lyxrc.use_system_colors
                                ? Color_selectiontext : standardColor();
        bool const really_change_color = pi.base.font.color() == Color_none;
-       Changer dummy0 = pi.base.font.changeColor(color, really_change_color);
+       Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
+               : Changer();
        Changer dummy1 = pi.base.changeFontSet(standardFont());
-       Changer dummy2 = pi.base.changeStyle(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY
+                                                           : LM_ST_TEXT);
 
        InsetMathGrid::draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 
        if (numberedType()) {
                int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
@@ -634,7 +660,6 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
        if (canPaintChange(*bv))
                pi.change_.paintCue(pi, x + 1, y + 1 - dim.asc,
                                    x + dim.wid, y + dim.des);
-       setPosCache(pi, x, y);
 }