X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathRoot.cpp;h=8c4d1fa5ac784b94403c964b20bb729ee0014d74;hb=02e82157ec583c3900e359de86be79fac6512387;hp=2c453bafa1fcb6335ddf70a630fc546ae419b0f4;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index 2c453bafa1..8c4d1fa5ac 100644
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,18 +12,24 @@
 #include <config.h>
 
 #include "InsetMathRoot.h"
+
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 
 
+using namespace std;
+
 namespace lyx {
 
 
-InsetMathRoot::InsetMathRoot()
-	: InsetMathNest(2)
+InsetMathRoot::InsetMathRoot(Buffer * buf)
+	: InsetMathNest(buf, 2)
 {}
 
 
@@ -35,21 +41,20 @@ Inset * InsetMathRoot::clone() const
 
 void InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	using std::max;
+	Changer dummy = mi.base.changeEnsureMath();
 	InsetMathNest::metrics(mi);
 	Dimension const & dim0 = cell(0).dimension(*mi.base.bv);
 	Dimension const & dim1 = cell(1).dimension(*mi.base.bv);
 	dim.asc = max(dim0.ascent()  + 5, dim1.ascent())  + 2;
 	dim.des = max(dim0.descent() - 5, dim1.descent()) + 2;
 	dim.wid = dim0.width() + dim1.width() + 10;
-	metricsMarkers(dim);
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const
 {
+	Changer dummy = pi.base.changeEnsureMath();
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
 	int const w = dim0.width();
 	// the "exponent"
@@ -62,18 +67,19 @@ void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const
 	int xp[4];
 	int yp[4];
 	pi.pain.line(x + dim.width(), y - a + 1,
-							 x + w + 4, y - a + 1, Color_math);
+				x + w + 4, y - a + 1, pi.base.font.color());
 	xp[0] = x + w + 4;         yp[0] = y - a + 1;
 	xp[1] = x + w;             yp[1] = y + d;
 	xp[2] = x + w - 2;         yp[2] = y + (d - a)/2 + 2;
 	xp[3] = x + w - 5;         yp[3] = y + (d - a)/2 + 4;
-	pi.pain.lines(xp, yp, 4, Color_math);
+	pi.pain.lines(xp, yp, 4, pi.base.font.color());
 	drawMarkers(pi, x, y);
 }
 
 
 void InsetMathRoot::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << "\\sqrt[" << cell(0) << "]{" << cell(1) << '}';
 }
 
@@ -119,4 +125,23 @@ void InsetMathRoot::mathmlize(MathStream & os) const
 }
 
 
+void InsetMathRoot::htmlize(HtmlStream & os) const
+{
+	os << MTag("span", "class='root'")
+	   << MTag("sup") << cell(0) << ETag("sup")
+	   << from_ascii("&radic;") 
+	   << MTag("span", "class='rootof'")	<< cell(1) << ETag("span") 
+		 << ETag("span");
+}
+
+
+void InsetMathRoot::validate(LaTeXFeatures & features) const
+{
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet(
+			"span.rootof{border-top: thin solid black;}\n"
+			"span.root sup{font-size: 75%;}");
+	InsetMathNest::validate(features);
+}
+
 } // namespace lyx