Pure HTML output for math macros.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 87888c0fdf8f89d8fbb2d504b6305cf7ce0cfb5f..9046d054e5ee688b8a5b93fccff5d060afab2f03 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -28,9 +28,9 @@
 #include "Language.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
@@ -48,7 +48,7 @@ using namespace lyx::support;
 namespace lyx {
 
 
-InsetCaption::InsetCaption(Buffer const & buf)
+InsetCaption::InsetCaption(Buffer * buf)
        : InsetText(buf, InsetText::PlainLayout)
 {
        setAutoBreakRows(true);
@@ -60,7 +60,15 @@ InsetCaption::InsetCaption(Buffer const & buf)
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption\n";
-       text().write(buffer(), os);
+       text().write(os);
+}
+
+
+docstring InsetCaption::name() const
+{
+       if (type_.empty())
+               return from_ascii("Caption");
+       return from_utf8("Caption:" + type_);
 }
 
 
@@ -167,6 +175,7 @@ Inset * InsetCaption::editXY(Cursor & cur, int x, int y)
 bool InsetCaption::insetAllowed(InsetCode code) const
 {
        switch (code) {
+       // code that is not allowed in a caption
        case FLOAT_CODE:
        case TABULAR_CODE:
        case WRAP_CODE:
@@ -251,17 +260,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.disable_captions)
+       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
 {
@@ -284,21 +297,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())
@@ -318,7 +337,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));
@@ -327,7 +346,9 @@ void InsetCaption::updateLabels(ParIterator const & it)
        }
 
        // Do the real work now.
-       InsetText::updateLabels(it);
+       InsetText::updateBuffer(it, utype);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();
 }