X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathXArrow.cpp;h=44799bac2fed2f8ff9277ec1c0d8d55913e7585a;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=886c8a6e7fde57ebf991edc7be19767201ab8dc4;hpb=137158532b1ac0cde1557226ee486b3fda39b545;p=lyx.git

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index 886c8a6e7f..44799bac2f 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.
  */
@@ -18,12 +18,13 @@
 
 #include "LaTeXFeatures.h"
 
+using namespace std;
 
 namespace lyx {
 
 
-InsetMathXArrow::InsetMathXArrow(docstring const & name)
-	: InsetMathFracBase(), name_(name)
+InsetMathXArrow::InsetMathXArrow(Buffer * buf, docstring const & name)
+	: InsetMathFracBase(buf), name_(name)
 {}
 
 
@@ -36,14 +37,14 @@ Inset * InsetMathXArrow::clone() const
 void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	ScriptChanger dummy(mi.base);
-	cell(0).metrics(mi);
-	cell(1).metrics(mi);
-	dim.wid = std::max(cell(0).width(), cell(1).width()) + 10;
-	dim.asc = cell(0).height() + 10;
-	dim.des = cell(1).height();
+	Dimension dim0;
+	cell(0).metrics(mi, dim0);
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
+	dim.wid = max(dim0.width(), dim1.width()) + 10;
+	dim.asc = dim0.height() + 10;
+	dim.des = dim1.height();
 	metricsMarkers(dim);
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
 }
 
 
@@ -51,7 +52,8 @@ void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
 	ScriptChanger dummy(pi.base);
 	cell(0).draw(pi, x + 5, y - 10);
-	cell(1).draw(pi, x + 5, y + cell(1).height());
+	Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+	cell(1).draw(pi, x + 5, y + dim1.height());
 	Dimension const dim = dimension(*pi.base.bv);
 	mathed_draw_deco(pi, x + 1, y - 7, dim.wid - 2, 5, name_);
 	drawMarkers(pi, x, y);
@@ -60,6 +62,7 @@ void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathXArrow::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << '\\' << name_;
 	if (cell(1).size())
 		os << '[' << cell(1) << ']';
@@ -73,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);
 }