X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathXArrow.cpp;h=eef5b4388c4546aff6f65ea5eb7d839801331760;hb=f67cf6f4bb3e3d22ac9aebfa22027c3537cbdf61;hp=ac4cea005cdb6ed99e810d4707e0907e915c8f17;hpb=31713932b247802b5b59482f5157c8a4f7206825;p=lyx.git

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index ac4cea005c..eef5b4388c 100644
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -23,8 +23,8 @@ using namespace std;
 namespace lyx {
 
 
-InsetMathXArrow::InsetMathXArrow(docstring const & name)
-	: InsetMathFracBase(), name_(name)
+InsetMathXArrow::InsetMathXArrow(Buffer * buf, docstring const & name)
+	: InsetMathFracBase(buf), name_(name)
 {}
 
 
@@ -62,12 +62,11 @@ void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathXArrow::write(WriteStream & os) const
 {
-	bool brace = ensureMath(os);
+	MathEnsurer ensurer(os);
 	os << '\\' << name_;
-	if (cell(1).size())
+	if (!cell(1).empty())
 		os << '[' << cell(1) << ']';
 	os << '{' << cell(0) << '}';
-	os.pendingBrace(brace);
 }
 
 
@@ -77,9 +76,36 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 }
 
 
+void InsetMathXArrow::mathmlize(MathStream & ms) const
+{
+	char const * const arrow = name_ == "xleftarrow" 
+			? "&larr;" : "&rarr;";
+	ms << "<munderover accent='false' accentunder='false'>"
+	   << arrow << cell(1) << cell(0)
+	   << "</munderover>";
+}
+
+
+void InsetMathXArrow::htmlize(HtmlStream & os) const
+{
+	char const * const arrow = name_ == "xleftarrow" 
+			? "&larr;" : "&rarr;";
+	os << MTag("span", "class='xarrow'")
+		 << MTag("span", "class='xatop'") << cell(0) << ETag("span")
+		 << MTag("span", "class='xabottom'") << arrow << ETag("span")
+		 << ETag("span");
+}
+
+
 void InsetMathXArrow::validate(LaTeXFeatures & features) const
 {
 	features.require("amsmath");
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		// CSS adapted from eLyXer
+		features.addCSSSnippet(
+			"span.xarrow{display: inline-block; vertical-align: middle; text-align:center;}\n"
+			"span.xatop{display: block;}\n"
+			"span.xabottom{display: block;}");
 	InsetMathNest::validate(features);
 }