X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathRoot.cpp;h=db8954f8c2177c6549a527963e0ddce932266c23;hb=758de9577dcf3ff912c794dc4dffa13e138ffd41;hp=fc7d1d5ade51a1d8085197fa3b08ea2095042fa0;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index fc7d1d5ade..db8954f8c2 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,69 +12,90 @@
 #include <config.h>
 
 #include "InsetMathRoot.h"
+
 #include "MathData.h"
 #include "MathStream.h"
+#include "MathSupport.h"
+
 #include "Cursor.h"
-#include "Color.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 
 
-namespace lyx {
-
-using std::max;
-using std::auto_ptr;
+using namespace std;
 
+namespace lyx {
 
 
-InsetMathRoot::InsetMathRoot()
-	: InsetMathNest(2)
+InsetMathRoot::InsetMathRoot(Buffer * buf)
+	: InsetMathNest(buf, 2)
 {}
 
 
-auto_ptr<Inset> InsetMathRoot::doClone() const
+Inset * InsetMathRoot::clone() const
 {
-	return auto_ptr<Inset>(new InsetMathRoot(*this));
+	return new InsetMathRoot(*this);
 }
 
 
-bool InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	InsetMathNest::metrics(mi);
-	dim.asc = max(cell(0).ascent()  + 5, cell(1).ascent())  + 2;
-	dim.des = max(cell(0).descent() - 5, cell(1).descent()) + 2;
-	dim.wid = cell(0).width() + cell(1).width() + 10;
-	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
+	Changer dummy = mi.base.changeEnsureMath();
+	Dimension dim0;
+	{
+		Changer script = mi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+		cell(0).metrics(mi, dim0);
+		// make sure that the dim is high enough for any character
+		Dimension fontDim;
+		math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
+		dim0 += fontDim;
+	}
+
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
+	// make sure that the dim is high enough for any character
+	Dimension fontDim;
+	math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
+	dim1 += fontDim;
+
+	dim.asc = max(dim0.ascent()  + 5, dim1.ascent()) + 1;
+	dim.des = max(dim0.descent() - 5, dim1.descent());
+	dim.wid = dim0.width() + dim1.width() + 4;
 }
 
 
 void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const
 {
-	int const w = cell(0).width();
+	Changer dummy = pi.base.changeEnsureMath();
+	Dimension const dim = dimension(*pi.base.bv);
+	int const a = dim.ascent();
+	int const d = dim.descent();
+	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+	int const w = dim0.width();
 	// the "exponent"
-	cell(0).draw(pi, x, y - 5 - cell(0).descent());
+	{
+		Changer script = pi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+		cell(0).draw(pi, x, y + (d - a)/2 - dim0.descent());
+	}
 	// the "base"
-	cell(1).draw(pi, x + w + 8, y);
-	int const a = dim_.ascent();
-	int const d = dim_.descent();
-	int xp[5];
-	int yp[5];
-	xp[0] = x + dim_.width();  yp[0] = y - a + 1;
-	xp[1] = x + w + 4;         yp[1] = y - a + 1;
-	xp[2] = x + w;             yp[2] = y + d;
-	xp[3] = x + w - 2;         yp[3] = y + (d - a)/2 + 2;
-	xp[4] = x + w - 5;         yp[4] = y + (d - a)/2 + 4;
-	pi.pain.lines(xp, yp, 5, Color::math);
-	drawMarkers(pi, x, y);
+	cell(1).draw(pi, x + w + 4, y);
+	int xp[4];
+	int yp[4];
+	pi.pain.line(x + dim.width(), y - a + 1,
+				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, pi.base.font.color());
 }
 
 
 void InsetMathRoot::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << "\\sqrt[" << cell(0) << "]{" << cell(1) << '}';
 }
 
@@ -120,4 +141,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