Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

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

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 0da62f915535cb8a1ed5736b8de67b0a9aeaf994..b8c5d14625dd81f097ac06196867f49c66b6efe7 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -11,11 +11,14 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 
 using namespace std;
 
@@ -29,29 +32,29 @@ Inset * InsetMathUnderset::clone() const
 
 void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy2 = mi.base.changeEnsureMath();
        Dimension dim1;
        cell(1).metrics(mi, dim1);
-       FracChanger dummy(mi.base);
+       Changer dummy = mi.base.changeFrac();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
        dim.wid = max(dim0.width(), dim1.width()) + 4;
        dim.asc = dim1.ascent();
        dim.des = dim1.descent() + dim0.height() + 4;
-       metricsMarkers(dim);
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy2 = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
        int m  = x + dim.wid / 2;
        int yo = y + dim1.descent() + dim0.ascent() + 1;
        cell(1).draw(pi, m - dim1.width() / 2, y);
-       FracChanger dummy(pi.base);
+       Changer dummy = pi.base.changeFrac();
        cell(0).draw(pi, m - dim0.width() / 2, yo);
-       drawMarkers(pi, x, y);
 }
 
 
@@ -85,6 +88,8 @@ bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const
 void InsetMathUnderset::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
+       if (os.fragile())
+               os << "\\protect";
        os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -115,11 +120,10 @@ void InsetMathUnderset::validate(LaTeXFeatures & features) const
        if (features.runparams().isLaTeX())
                features.require("amsmath");
        else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
+               features.addCSSSnippet(
                        "span.underset{display: inline-block; vertical-align: top; text-align:center;}\n"
                        "span.underset span {display: block;}\n"
-                       "span.bottom{font-size: 66%;}\n"
-                       "</style>");
+                       "span.bottom{font-size: 66%;}");
 
        InsetMathNest::validate(features);
 }