Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index f69b17b3bfa7ad1093c86e01ff72867310d1048a..f3dbc5808a9ac55b0a1f53c6fb357313860ce689 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.
  */
@@ -24,8 +24,8 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
 #include "OutputParams.h"
@@ -37,6 +37,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>
@@ -48,20 +49,18 @@ namespace lyx {
 
 
 InsetCaption::InsetCaption(Buffer const & buf)
-       : InsetText(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(buffer(), os);
 }
 
 
@@ -111,7 +110,7 @@ void InsetCaption::addToToc(DocIterator const & cpit)
        pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc(type_);
-       docstring const str = full_label_ + ". " + text_.getPar(0).asString();
+       docstring const str = full_label_ + ". " + text().getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
 
        // Proceed with the rest of the inset.
@@ -214,7 +213,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 +257,17 @@ int InsetCaption::docbook(odocstream & os,
 }
 
 
+docstring InsetCaption::xhtml(odocstream & os,
+                         OutputParams const & rp) const
+{
+       if (rp.disable_captions)
+               return docstring();
+       os << "<div class='float-caption'>\n";
+       docstring def = getCaptionAsHTML(os, rp);
+       os << "</div>\n";
+       return def;
+}
+
 int InsetCaption::getArgument(odocstream & os,
                        OutputParams const & runparams) const
 {
@@ -272,7 +282,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 +290,23 @@ int InsetCaption::getCaptionText(odocstream & os,
 }
 
 
+docstring InsetCaption::getCaptionAsHTML(odocstream & os,
+                       OutputParams const & runparams) const
+{
+       os << full_label_ << ' ';
+       return InsetText::xhtml(os, runparams);
+}
+
+
 void InsetCaption::updateLabels(ParIterator const & it)
 {
        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 +318,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,7 +327,7 @@ 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);     
        }