Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 09254d133f9351ca368cc6565c3265e50ac8fa03..7f96e35433c894d804b33572fbfef44c474c8666 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -25,11 +25,12 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetList.h"
+#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"
 
@@ -47,7 +48,7 @@ using namespace lyx::support;
 namespace lyx {
 
 
-InsetCaption::InsetCaption(Buffer const & buf)
+InsetCaption::InsetCaption(Buffer * buf)
        : InsetText(buf, InsetText::PlainLayout)
 {
        setAutoBreakRows(true);
@@ -59,7 +60,7 @@ InsetCaption::InsetCaption(Buffer const & buf)
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption\n";
-       text().write(buffer(), os);
+       text().write(os);
 }
 
 
@@ -75,12 +76,6 @@ void InsetCaption::read(Lexer & lex)
 }
 
 
-docstring InsetCaption::editMessage() const
-{
-       return _("Opened Caption Inset");
-}
-
-
 void InsetCaption::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
@@ -172,6 +167,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:
@@ -256,17 +252,17 @@ 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";
+       xs << StartTag("div", "class='float-caption'");
+       docstring def = getCaptionAsHTML(xs, rp);
+       xs << EndTag("div");
        return def;
 }
 
+
 int InsetCaption::getArgument(odocstream & os,
                        OutputParams const & runparams) const
 {
@@ -289,18 +285,21 @@ 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::updateLabels(ParIterator const & it, bool out)
 {
        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();
        // Memorize type for addToToc().
@@ -325,13 +324,13 @@ void InsetCaption::updateLabels(ParIterator const & it)
                        cnts.step(counter);
                        full_label_ = bformat(from_ascii("%1$s %2$s:"), 
                                              name,
-                                             cnts.theCounter(counter));
+                                             cnts.theCounter(counter, lang));
                } else
                        full_label_ = bformat(from_ascii("%1$s #:"), name);     
        }
 
        // Do the real work now.
-       InsetText::updateLabels(it);
+       InsetText::updateLabels(it, out);
 }