Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index be5bc00d3fd38aa1ceeac3d4266b99410b2a94a9..7f96e35433c894d804b33572fbfef44c474c8666 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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,21 +48,19 @@ using namespace lyx::support;
 namespace lyx {
 
 
-InsetCaption::InsetCaption(Buffer const & buf)
-       : InsetText(buf)
+InsetCaption::InsetCaption(Buffer * buf)
+       : InsetText(buf, InsetText::PlainLayout)
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_captionframe);
-       // There will always be only one
-       paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
 }
 
 
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption\n";
-       text().write(buffer(), os);
+       text().write(os);
 }
 
 
@@ -77,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
 {
@@ -174,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:
@@ -214,7 +208,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 int InsetCaption::latex(odocstream & os,
                        OutputParams const & runparams_in) const
 {
-       if (in_subfloat_)
+       if (runparams_in.inFloat == OutputParams::SUBFLOAT)
                // caption is output as an optional argument
                return 0;
        // This is a bit too simplistic to take advantage of
@@ -258,6 +252,17 @@ int InsetCaption::docbook(odocstream & os,
 }
 
 
+docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+{
+       if (rp.html_disable_captions)
+               return docstring();
+       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
 {
@@ -272,7 +277,7 @@ int InsetCaption::getOptArg(odocstream & os,
 }
 
 
-int InsetCaption::getCaptionText(odocstream & os,
+int InsetCaption::getCaptionAsPlaintext(odocstream & os,
                        OutputParams const & runparams) const
 {
        os << full_label_ << ' ';
@@ -280,15 +285,25 @@ int InsetCaption::getCaptionText(odocstream & os,
 }
 
 
-void InsetCaption::updateLabels(ParIterator const & it)
+docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
+                       OutputParams const & runparams) const
+{
+       xs << full_label_ << ' ';
+       InsetText::XHTMLOptions const opts = 
+               InsetText::WriteLabel | InsetText::WriteInnerTag;
+       return InsetText::insetAsXHTML(xs, runparams, opts);
+}
+
+
+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().
        type_ = type;
-       in_subfloat_ = cnts.isSubfloat();
        if (type.empty())
                full_label_ = master.B_("Senseless!!! ");
        else {
@@ -300,7 +315,7 @@ void InsetCaption::updateLabels(ParIterator const & it)
                else
                        name = master.B_(tclass.floats().getType(type).name());
                docstring counter = from_utf8(type);
-               if (in_subfloat_) {
+               if (cnts.isSubfloat()) {
                        counter = "sub-" + from_utf8(type);
                        name = bformat(_("Sub-%1$s"),
                                       master.B_(tclass.floats().getType(type).name()));
@@ -309,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);
 }