RefChanger

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 0653e88b8c4f8e05631a83b30b8f1f2acab120a5..b10d37ad698b81e0048dd5c2961fd5d5c3aadb15 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -25,6 +25,8 @@
 
 #include "frontends/FontMetrics.h"
 
+#include <algorithm>
+
 using namespace std;
 
 namespace lyx {
@@ -43,13 +45,13 @@ static docstring convertDelimToLatexName(docstring const & name)
 
 InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l,
                docstring const & r)
-       : InsetMathNest(buf, 1), left_(l), right_(r)
+       : InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
 {}
 
 
 InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r,
        MathData const & ar)
-       : InsetMathNest(buf, 1), left_(l), right_(r)
+       : InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
 {
        cell(0) = ar;
 }
@@ -71,16 +73,16 @@ void InsetMathDelim::validate(LaTeXFeatures & features) const
        MathWordList::const_iterator it = words.find(left_);
        if (it != words.end())
        {
-               docstring const req = it->second.requires;
+               string const req = it->second.requires;
                if (!req.empty())
-                       features.require(to_ascii(req));
+                       features.require(req);
        }
        it = words.find(right_);
        if (it != words.end())
        {
-               docstring const req = it->second.requires;
+               string const req = it->second.requires;
                if (!req.empty())
-                       features.require(to_ascii(req));
+                       features.require(req);
        }
 }
 
@@ -113,7 +115,7 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
                dw_ = 8;
        if (dw_ < 4)
                dw_ = 4;
-       dim.wid = dim0.width() + 2 * dw_ + 8;
+       dim.wid = dim0.width() + 2 * dw_ + 2 * mathed_thinmuskip(mi.base.font);
        dim.asc = max(a0, d0) + h0;
        dim.des = max(a0, d0) - h0;
 }
@@ -123,9 +125,10 @@ void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
 {
        Dimension const dim = dimension(*pi.base.bv);
        int const b = y - dim.asc;
-       cell(0).draw(pi, x + dw_ + 4, y);
-       mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_);
-       mathed_draw_deco(pi, x + dim.width() - dw_ - 4,
+       int const skip = mathed_thinmuskip(pi.base.font);
+       cell(0).draw(pi, x + dw_ + skip, y);
+       mathed_draw_deco(pi, x + skip, b, dw_, dim.height(), left_);
+       mathed_draw_deco(pi, x + dim.width() - dw_ - skip,
                b, dw_, dim.height(), right_);
        setPosCache(pi, x, y);
 }