Fix a crash with uninitialized buffer member of MathData

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index e039e64a19170c9b507f725808c24d8b78002ca5..1989d48dc2d9c6d840f810ba0a4123b80834ddb6 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -69,21 +69,8 @@ void InsetMathDelim::validate(LaTeXFeatures & features) const
        // The delimiters may be used without \left or \right as well.
        // Therefore they are listed in lib/symbols, and if they have
        // requirements, we need to add them here.
-       MathWordList const & words = mathedWordList();
-       MathWordList::const_iterator it = words.find(left_);
-       if (it != words.end())
-       {
-               string const req = it->second.requires;
-               if (!req.empty())
-                       features.require(req);
-       }
-       it = words.find(right_);
-       if (it != words.end())
-       {
-               string const req = it->second.requires;
-               if (!req.empty())
-                       features.require(req);
-       }
+       validate_math_word(features, left_);
+       validate_math_word(features, right_);
 }
 
 
@@ -106,7 +93,7 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Changer dummy = mi.base.changeEnsureMath();
        Dimension dim0;
-       cell(0).metrics(mi, dim0);
+       cell(0).metrics(mi, dim0, false);
        Dimension t = theFontMetrics(mi.base.font).dimension('I');
        int h0 = (t.asc + t.des) / 2;
        int a0 = max(dim0.asc, t.asc)   - h0;
@@ -116,7 +103,7 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
                dw_ = 8;
        if (dw_ < 4)
                dw_ = 4;
-       dim.wid = dim0.width() + 2 * dw_;
+       dim.wid = dim0.width() + 2 * dw_ + 2 * mathed_thinmuskip(mi.base.font);
        dim.asc = max(a0, d0) + h0;
        dim.des = max(a0, d0) - h0;
 }
@@ -127,9 +114,10 @@ void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
        Changer dummy = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
        int const b = y - dim.asc;
-       cell(0).draw(pi, x + dw_, y);
-       mathed_draw_deco(pi, x, b, dw_, dim.height(), left_);
-       mathed_draw_deco(pi, x + dim.width() - dw_,
+       int const skip = mathed_thinmuskip(pi.base.font);
+       cell(0).draw(pi, x + dw_ + skip, y);
+       mathed_draw_deco(pi, x + skip / 2, b, dw_, dim.height(), left_);
+       mathed_draw_deco(pi, x + dim.width() - dw_ - skip / 2,
                b, dw_, dim.height(), right_);
 }
 
@@ -194,19 +182,23 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 void InsetMathDelim::mathmlize(MathStream & os) const
 {
        os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>"
-          << convertDelimToXMLEscape(left_) 
+          << "<mrow>"
+          << convertDelimToXMLEscape(left_)
+          << "</mrow>"
           << "</mo>\n"
-          << cell(0) 
-          << "\n<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" 
-          << convertDelimToXMLEscape(right_) 
+          << cell(0)
+          << "\n<mo form='postfix' fence='true' stretchy='true' symmetric='true'>"
+          << "<mrow>"
+          << convertDelimToXMLEscape(right_)
+          << "</mrow>"
           << "</mo>\n";
 }
 
 
 void InsetMathDelim::htmlize(HtmlStream & os) const
 {
-       os << convertDelimToXMLEscape(left_) 
-          << cell(0) 
+       os << convertDelimToXMLEscape(left_)
+          << cell(0)
           << convertDelimToXMLEscape(right_);
 }