Routines for calculating numerical labels for BibTeX citations.

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index bbda84a7296c5bae36454c6ea33190c431f59bec..b6a67b067500fe916e6b3d8386d9394d14b61659 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -27,6 +27,7 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "output_xhtml.h"
 #include "ParIterator.h"
 #include "TextClass.h"
 
@@ -110,7 +111,7 @@ namespace lyx {
 // Lgb
 
 
-InsetFloat::InsetFloat(Buffer const & buf, string const & type)
+InsetFloat::InsetFloat(Buffer * buf, string const & type)
        : InsetCollapsable(buf), name_(from_utf8(type))
 {
        setLabel(_("float: ") + floatName(type));
@@ -194,7 +195,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetFloat::updateLabels(ParIterator const & it)
+void InsetFloat::updateLabels(ParIterator const & it, bool out)
 {
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
@@ -212,7 +213,7 @@ void InsetFloat::updateLabels(ParIterator const & it)
        cnts.current_float(params().type);
        cnts.isSubfloat(subflt);
 
-       InsetCollapsable::updateLabels(it);
+       InsetCollapsable::updateLabels(it, out);
 
        //reset afterwards
        cnts.current_float(saveflt);
@@ -281,33 +282,32 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
+docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        FloatList const & floats = buffer().params().documentClass().floats();
        Floating const & ftype = floats.getType(params_.type);
-       string const htmltype = ftype.htmlType().empty() ? 
-                       "div" : ftype.htmlType();
-       string const htmlclass = ftype.htmlClass().empty() ?
-                       "float-" + params_.type : ftype.htmlClass();
-       docstring const otag = 
-                       from_ascii("<" + htmltype + " class='float " + htmlclass + "'>\n");
-       docstring const ctag = from_ascii("</" + htmltype + ">\n");
+       string const & htmltype = ftype.htmlTag();
+       string const & attr = ftype.htmlAttrib();
 
-       odocstringstream out;
-
-       out << otag;
-       docstring def = InsetText::xhtml(out, rp);
-       out << ctag;
+       odocstringstream ods;
+       XHTMLStream newxs(ods);
+       newxs << StartTag(htmltype, attr);
+       InsetText::XHTMLOptions const opts = 
+               InsetText::WriteLabel | InsetText::WriteInnerTag;
+       docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
+       newxs << EndTag(htmltype);
 
        if (rp.inFloat == OutputParams::NONFLOAT)
                // In this case, this float needs to be deferred, but we'll put it
                // before anything the text itself deferred.
-               def = out.str() + '\n' + def;
+               deferred = ods.str() + '\n' + deferred;
        else 
                // In this case, the whole thing is already being deferred, so
                // we can write to the stream.
-               os << out.str();
-       return def;
+               // Note that things will already have been escaped, so we do not 
+               // want to escape them again.
+               xs << XHTMLStream::NextRaw() << ods.str();
+       return deferred;
 }