Reduce the number of accesses to coord cache when drawing a math row

[lyx.git] / src / mathed / InsetMathSqrt.cpp

diff --git a/src/mathed/InsetMathSqrt.cpp b/src/mathed/InsetMathSqrt.cpp
index 1157dd8b6f43e993a682e5cb1a551b0b97f70a99..7cfe028c242cec0c09ba42083db3f9a1ecba29ff 100644 (file)
--- a/src/mathed/InsetMathSqrt.cpp
+++ b/src/mathed/InsetMathSqrt.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.
  */
@@ -11,17 +11,23 @@
 #include <config.h>
 
 #include "InsetMathSqrt.h"
+
+#include "InsetMathRoot.h"
 #include "MathData.h"
 #include "MathStream.h"
+#include "MathSupport.h"
+
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 #include "TextPainter.h"
-#include "Color.h"
+
 #include "frontends/Painter.h"
 
 
 namespace lyx {
 
-InsetMathSqrt::InsetMathSqrt()
-       : InsetMathNest(1)
+InsetMathSqrt::InsetMathSqrt(Buffer * buf)
+       : InsetMathNest(buf, 1)
 {}
 
 
@@ -33,29 +39,13 @@ Inset * InsetMathSqrt::clone() const
 
 void InsetMathSqrt::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi, dim);
-       dim.asc += 4;
-       dim.des += 2;
-       dim.wid += 12;
-       metricsMarkers(dim);
-       dim_ = dim;
+       mathed_root_metrics(mi, cell(0), nullptr, dim);
 }
 
 
 void InsetMathSqrt::draw(PainterInfo & pi, int x, int y) const
 {
-       cell(0).draw(pi, x + 10, y);
-       int const a = dim_.ascent();
-       int const d = dim_.descent();
-       int xp[3];
-       int yp[3];
-       pi.pain.line(x + dim_.width(), y - a + 1,
-                                                        x + 8, y - a + 1, Color::math);
-       xp[0] = x + 8;            yp[0] = y - a + 1;
-       xp[1] = x + 5;            yp[1] = y + d - 1;
-       xp[2] = x;                yp[2] = y + (d - a)/2;
-       pi.pain.lines(xp, yp, 3, Color::math);
-       drawMarkers(pi, x, y);
+       mathed_draw_root(pi, x, y, cell(0), nullptr, dimension(*pi.base.bv));
 }
 
 
@@ -67,17 +57,21 @@ void InsetMathSqrt::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 }
 
 
-void InsetMathSqrt::drawT(TextPainter & pain, int x, int y) const
+void InsetMathSqrt::drawT(TextPainter & /*pain*/, int /*x*/, int /*y*/) const
 {
+       /*
        cell(0).drawT(pain, x + 2, y);
-       pain.horizontalLine(x + 2, y - cell(0).ascent(), cell(0).width(), '_');
-       pain.verticalLine  (x + 1, y - cell(0).ascent() + 1, cell(0).height());
-       pain.draw(x, y + cell(0).descent(), '\\');
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+       pain.horizontalLine(x + 2, y - dim0.ascent(), dim0.width(), '_');
+       pain.verticalLine  (x + 1, y - dim0.ascent() + 1, dim0.height());
+       pain.draw(x, y + dim0.descent(), '\\');
+       */
 }
 
 
-void InsetMathSqrt::write(WriteStream & os) const
+void InsetMathSqrt::write(TeXMathStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << "\\sqrt{" << cell(0) << '}';
 }
 
@@ -104,10 +98,26 @@ void InsetMathSqrt::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSqrt::mathmlize(MathStream & os) const
+void InsetMathSqrt::mathmlize(MathMLStream & ms) const
+{
+       ms << MTag("msqrt") << cell(0) << ETag("msqrt");
+}
+
+
+void InsetMathSqrt::htmlize(HtmlStream & os) const
 {
-       os << MTag("msqrt") << cell(0) << ETag("msqrt");
+       os << MTag("span", "class='sqrt'")
+          << from_ascii("&radic;")
+          << MTag("span", "class='sqrtof'")    << cell(0) << ETag("span")
+                << ETag("span");
 }
 
 
+void InsetMathSqrt::validate(LaTeXFeatures & features) const
+{
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addCSSSnippet("span.sqrtof{border-top: thin solid black;}");
+       InsetMathNest::validate(features);
+}
+
 } // namespace lyx