Restore XHTML for InsetBox.

[features.git] / src / insets / InsetBox.cpp

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 25552d5aa88f4ff4d87a381fad5d6357aac64259..ad2084f5bb7497c54d54f6e4db9390c075aa3a7f 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -24,6 +24,7 @@
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -478,24 +479,24 @@ int InsetBox::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetBox::xhtml(odocstream &, OutputParams const & runparams) const
+docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
 {
+       // construct attributes
+       string attrs = "class='" + params_.type + "'";
        string style;
        if (!params_.width.empty())
                style += ("width: " + params_.width.asHTMLString() + ";");
        if (!params_.height.empty())
                style += ("height: " + params_.height.asHTMLString() + ";");
-       
-       docstring retval = from_ascii("<div class='" + params_.type + "'");
        if (!style.empty())
-               retval += from_ascii(" style='" + style + "'");
-       retval += ">\n";
-       odocstringstream os;
-       docstring defer = InsetText::xhtml(os, runparams);
-       retval += os.str();
-       retval += "</div>\n";
-       retval += defer + "\n";
-       return retval;
+               attrs += " style='" + style + "'";
+
+       xs << StartTag("div", attrs);
+       XHTMLOptions const opts = InsetText::WriteLabel | InsetText::WriteInnerTag;
+       docstring defer = InsetText::insetAsXHTML(xs, runparams, opts);
+       xs << EndTag("div");
+       xs << defer;
+       return docstring();
 }