Fix bug #12795

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 8e415bbbd0bc98b6fe05c13d1e41b0155f18710c..e1ace0dc925b1c759b0b3eb410eac5c1e735133b 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -152,11 +152,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        if (non_float_)
                pi.base.font.setColor(Color_error);
        else
-               pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
-       if (is_deleted_)
-               pi.base.font.setStrikeout(FONT_ON);
-       else if (isChanged() && lyxrc.ct_additions_underlined)
-               pi.base.font.setUnderbar(FONT_ON);
+               pi.base.font.setPaintColor(pi.textColor(pi.base.font.color()));
        int const lo = leftOffset(pi.base.bv);
        if (rtl_) {
                InsetText::draw(pi, x, y);
@@ -166,6 +162,10 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
                pi.pain.text(x + lo, y, full_label_, pi.base.font);
                InsetText::draw(pi, x + labelwidth_, y);
        }
+       // Draw the change tracking cue on the label, unless RowPainter already
+       // takes care of it.
+       if (canPaintChange(*pi.base.bv))
+               pi.change.paintCue(pi, x, y, x + labelwidth_, pi.base.font);
        pi.base.font = tmpfont;
 }
 
@@ -311,7 +311,7 @@ docstring InsetCaption::xhtml(XMLStream & xs, OutputParams const & rp) const
                return docstring();
        InsetLayout const & il = getLayout();
        string const & tag = il.htmltag();
-       string attr = il.htmlattr();
+       string attr = il.htmlGetAttrString();
        if (!type_.empty()) {
                string const our_class = "float-caption-" + type_;
                size_t const loc = attr.find("class='");
@@ -331,8 +331,7 @@ docstring InsetCaption::toolTip(BufferView const & bv, int x, int y) const
 {
        if (non_float_)
                return _("Standard captions are not allowed outside floats. You will get a LaTeX error.\n"
-                        "For captions outside floats, please use the module 'Non-Floating Figures and Tables' "
-                        "from Document > Settings > Modules.");
+                        "For captions outside floats, you can use the 'nonfloat' LaTeX package.");
        return InsetText::toolTip(bv, x, y);
 }