X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathXArrow.cpp;h=d2121d6dfef331cc1ed577e12ffedbab6b16201f;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=b91c4ce21dbc43d7bec686e75b54afa323326ed1;hpb=94a9c127e325025016a5e9dcebaa8f9b3b31b544;p=lyx.git

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index b91c4ce21d..d2121d6dfe 100644
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -10,13 +10,20 @@
 
 #include <config.h>
 
+#include "support/lassert.h"
+
 #include "InsetMathXArrow.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+
+#include <algorithm>
 
 using namespace std;
 
@@ -36,7 +43,8 @@ Inset * InsetMathXArrow::clone() const
 
 void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	ScriptChanger dummy(mi.base);
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Changer dummy = mi.base.changeScript();
 	Dimension dim0;
 	cell(0).metrics(mi, dim0);
 	Dimension dim1;
@@ -44,13 +52,14 @@ void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.wid = max(dim0.width(), dim1.width()) + 10;
 	dim.asc = dim0.height() + 10;
 	dim.des = dim1.height();
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const
 {
-	ScriptChanger dummy(pi.base);
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Changer dummy = pi.base.changeScript();
 	Dimension const dim = dimension(*pi.base.bv);
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
 	// center the cells with the decoration
@@ -112,6 +121,10 @@ void InsetMathXArrow::mathmlize(MathStream & ms) const
 		arrow = "&rightleftharpoons;";
 	else if (name_ == "xmapsto")
 		arrow = "&mapsto;";
+	else {
+		lyxerr << "mathmlize conversion for '" << name_ << "' not implemented" << endl;
+		LASSERT(false, arrow = "&rarr;");
+	}
 	ms << "<munderover accent='false' accentunder='false'>"
 	   << arrow << cell(1) << cell(0)
 	   << "</munderover>";
@@ -152,6 +165,10 @@ void InsetMathXArrow::htmlize(HtmlStream & os) const
 		arrow = "&rightleftharpoons;";
 	else if (name_ == "xmapsto")
 		arrow = "&mapsto;";
+	else {
+		lyxerr << "htmlize conversion for '" << name_ << "' not implemented" << endl;
+		LASSERT(false, arrow = "&rarr;");
+	}
 	os << MTag("span", "class='xarrow'")
 		 << MTag("span", "class='xatop'") << cell(0) << ETag("span")
 		 << MTag("span", "class='xabottom'") << arrow << ETag("span")