From dc88d6ecd2e245d7d50d142f62c80069b2dcb0dc Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Thu, 26 Nov 2009 16:38:26 +0000
Subject: [PATCH] Restore XHTML for InsetBox.

I guess that this should be "inline", that is, appear where it appears
in the LyX file, as opposed to being deferred until after the current
paragraph is output. But I'm not sure about this. If anyone has a view,
let me know.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32215 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetBox.cpp  | 23 ++++++++++++-----------
 src/insets/InsetBox.h    |  2 +-
 src/insets/InsetText.cpp |  5 +++++
 src/insets/InsetText.h   |  3 +++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 25552d5aa8..ad2084f5bb 100644
--- 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();
 }
 
 
diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 1a45b04d8f..83ba43403e 100644
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -117,7 +117,7 @@ private:
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 1d57c843a9..ccdc9f04ac 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -889,4 +889,9 @@ docstring InsetText::getCaptionHTML(OutputParams const & runparams) const
 }
 
 
+InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2)
+{
+	return static_cast<InsetText::XHTMLOptions>((int)a1 | (int)a2);
+}
+
 } // namespace lyx
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index fb1fb0a6ba..421870b0e6 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -222,6 +222,9 @@ private:
 	mutable Text text_;
 };
 
+
+InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2);
+
 } // namespace lyx
 
 #endif