InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index f84364cdd4303cab7bf117643e9becc65be73def..a1b084fe4766362963a63abd32f56ade768b64eb 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -28,6 +28,7 @@
 #include "Language.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "TextClass.h"
@@ -52,7 +53,7 @@ InsetCaption::InsetCaption(Buffer * buf)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
-       setFrameColor(Color_captionframe);
+       setFrameColor(Color_collapsableframe);
 }
 
 
@@ -63,6 +64,14 @@ void InsetCaption::write(ostream & os) const
 }
 
 
+docstring InsetCaption::name() const
+{
+       if (type_.empty())
+               return from_ascii("Caption");
+       return from_utf8("Caption:" + type_);
+}
+
+
 void InsetCaption::read(Lexer & lex)
 {
 #if 0
@@ -143,6 +152,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
        FontInfo tmpfont = pi.base.font;
        pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
+       pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
        pi.pain.text(x, y, full_label_, pi.base.font);
        InsetText::draw(pi, x + labelwidth_, y);
        pi.base.font = tmpfont;
@@ -166,12 +176,15 @@ Inset * InsetCaption::editXY(Cursor & cur, int x, int y)
 bool InsetCaption::insetAllowed(InsetCode code) const
 {
        switch (code) {
-       case FLOAT_CODE:
-       case TABULAR_CODE:
-       case WRAP_CODE:
+       // code that is not allowed in a caption
        case CAPTION_CODE:
+       case FLOAT_CODE:
+       case FOOT_CODE:
        case NEWPAGE_CODE:
+       case MARGIN_CODE:
        case MATHMACRO_CODE:
+       case TABULAR_CODE:
+       case WRAP_CODE:
                return false;
        default:
                return InsetText::insetAllowed(code);
@@ -182,14 +195,14 @@ bool InsetCaption::insetAllowed(InsetCode code) const
 bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_BREAK_PARAGRAPH:
                status.setEnabled(false);
                return true;
 
-       case LFUN_OPTIONAL_INSERT:
-               status.setEnabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1);
+       case LFUN_ARGUMENT_INSERT:
+               status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1);
                return true;
 
        case LFUN_INSET_TOGGLE:
@@ -219,7 +232,7 @@ int InsetCaption::latex(odocstream & os,
        // optional argument.
        runparams.moving_arg = true;
        os << "\\caption";
-       int l = latexOptArgInsets(paragraphs()[0], os, runparams, 1);
+       int l = latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
        os << '{';
        l += InsetText::latex(os, runparams);
        os << "}\n";
@@ -250,17 +263,21 @@ int InsetCaption::docbook(odocstream & os,
 }
 
 
-docstring InsetCaption::xhtml(odocstream & os,
-                         OutputParams const & rp) const
+docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        if (rp.html_disable_captions)
                return docstring();
-       os << "<div class='float-caption'>\n";
-       docstring def = getCaptionAsHTML(os, rp);
-       os << "</div>\n";
+       string attr = "class='float-caption";
+       if (!type_.empty())
+               attr += " float-caption-" + type_;
+       attr += "'";
+       xs << html::StartTag("div", attr);
+       docstring def = getCaptionAsHTML(xs, rp);
+       xs << html::EndTag("div");
        return def;
 }
 
+
 int InsetCaption::getArgument(odocstream & os,
                        OutputParams const & runparams) const
 {
@@ -271,7 +288,7 @@ int InsetCaption::getArgument(odocstream & os,
 int InsetCaption::getOptArg(odocstream & os,
                        OutputParams const & runparams) const
 {
-       return latexOptArgInsets(paragraphs()[0], os, runparams, 1);
+       return latexArgInsets(paragraphs()[0], os, runparams, 0, 1);
 }
 
 
@@ -283,21 +300,27 @@ int InsetCaption::getCaptionAsPlaintext(odocstream & os,
 }
 
 
-docstring InsetCaption::getCaptionAsHTML(odocstream & os,
+docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
                        OutputParams const & runparams) const
 {
-       os << full_label_ << ' ';
-       return InsetText::xhtml(os, runparams);
+       xs << full_label_ << ' ';
+       InsetText::XHTMLOptions const opts = 
+               InsetText::WriteLabel | InsetText::WriteInnerTag;
+       return InsetText::insetAsXHTML(xs, runparams, opts);
 }
 
 
-void InsetCaption::updateLabels(ParIterator const & it)
+void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        Buffer const & master = *buffer().masterBuffer();
        DocumentClass const & tclass = master.params().documentClass();
        string const & lang = it.paragraph().getParLanguage(master.params())->code();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
+       if (utype == OutputUpdate) {
+               // counters are local to the caption
+               cnts.saveLastCounter();
+       }
        // Memorize type for addToToc().
        type_ = type;
        if (type.empty())
@@ -317,7 +340,7 @@ void InsetCaption::updateLabels(ParIterator const & it)
                                       master.B_(tclass.floats().getType(type).name()));
                }
                if (cnts.hasCounter(counter)) {
-                       cnts.step(counter);
+                       cnts.step(counter, utype);
                        full_label_ = bformat(from_ascii("%1$s %2$s:"), 
                                              name,
                                              cnts.theCounter(counter, lang));
@@ -326,7 +349,9 @@ void InsetCaption::updateLabels(ParIterator const & it)
        }
 
        // Do the real work now.
-       InsetText::updateLabels(it);
+       InsetText::updateBuffer(it, utype);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();
 }