Better mechanism for setting cell height

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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index d3c23f60d8bf568f3bb2f0e75a8e43b5956593f2..908a887eebb5bbea01d8a944d3885293b42a2acc 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -37,7 +37,7 @@ namespace lyx {
 
 
 InsetMathDecoration::InsetMathDecoration(Buffer * buf, latexkeys const * key)
-       : InsetMathNest(buf, 1), key_(key)
+       : InsetMathNest(buf, 1), key_(key), dh_(0), dy_(0), dw_(0)
 {
 //     lyxerr << " creating deco " << key->name << endl;
 }
@@ -59,13 +59,7 @@ bool InsetMathDecoration::isScriptable() const
 {
        return
                        key_->name == "overbrace" ||
-                       key_->name == "underbrace" ||
-                       key_->name == "overleftarrow" ||
-                       key_->name == "overrightarrow" ||
-                       key_->name == "overleftrightarrow" ||
-                       key_->name == "underleftarrow" ||
-                       key_->name == "underrightarrow" ||
-                       key_->name == "underleftrightarrow";
+                       key_->name == "underbrace";
 }
 
 
@@ -111,9 +105,7 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       bool really_change_font = currentMode() == TEXT_MODE
-                               && isMathFont(from_ascii(mi.base.fontname));
-       FontSetChanger dummy(mi.base, "textnormal", really_change_font);
+       Changer dummy = mi.base.changeEnsureMath(currentMode());
 
        cell(0).metrics(mi, dim);
 
@@ -127,26 +119,20 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
                dy_ = dim.des + 1;
                dim.des += dh_ + 2;
        }
-
-       metricsMarkers(dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-       bool really_change_font = currentMode() == TEXT_MODE
-                               && isMathFont(from_ascii(pi.base.fontname));
-       FontSetChanger dummy(pi.base, "textnormal", really_change_font);
+       Changer dummy = pi.base.changeEnsureMath(currentMode());
 
-       cell(0).draw(pi, x + 1, y);
+       cell(0).draw(pi, x, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        if (wide())
                mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
        else
                mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
                        y + dy_, dw_, dh_, key_->name);
-       drawMarkers(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -175,7 +161,7 @@ void InsetMathDecoration::infoize(odocstream & os) const
 
 namespace {
        struct Attributes {
-               Attributes() {}
+               Attributes() : over(false) {}
                Attributes(bool o, string t)
                        : over(o), tag(t) {}
                bool over;
@@ -223,7 +209,7 @@ namespace {
                        buildTranslationMap(t);
                return t;
        }
-}
+} // namespace
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
@@ -245,7 +231,7 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
                os << MTag("span", "class='overbar'") << cell(0) << ETag("span");
                return;
        }
-       
+
        if (name == "underbar" || name == "underline") {
                os << MTag("span", "class='underbar'") << cell(0) << ETag("span");
                return;
@@ -254,12 +240,12 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
        TranslationMap const & t = translationMap();
        TranslationMap::const_iterator cur = t.find(name);
        LASSERT(cur != t.end(), return);
-       
+
        bool symontop = cur->second.over;
        string const symclass = symontop ? "symontop" : "symonbot";
        os << MTag("span", "class='symbolpair " + symclass + "'")
           << '\n';
-       
+
        if (symontop)
                os << MTag("span", "class='symbol'") << from_ascii(cur->second.tag);
        else
@@ -287,12 +273,12 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const
                                "span.symbolpair{display: inline-block; text-align:center;}\n"
                                "span.symontop{vertical-align: top;}\n"
                                "span.symonbot{vertical-align: bottom;}\n"
-                               "span.symbolpair span{display: block;}\n"                       
+                               "span.symbolpair span{display: block;}\n"
                                "span.symbol{height: 0.5ex;}");
                }
        } else {
                if (!key_->requires.empty())
-                       features.require(to_utf8(key_->requires));
+                       features.require(key_->requires);
        }
        InsetMathNest::validate(features);
 }