Improve the list of equations

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index fb4f8f4d87c4a756f96e3d913ffac765b3338d11..2680ad090d20f17cb517cf74969ebb68968c28c7 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;
 }
@@ -67,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_);
 }
 
 
@@ -102,6 +91,7 @@ void InsetMathDelim::normalize(NormalStream & os) const
 
 void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy = mi.base.changeEnsureMath();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
        Dimension t = theFontMetrics(mi.base.font).dimension('I');
@@ -113,7 +103,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_;
        dim.asc = max(a0, d0) + h0;
        dim.des = max(a0, d0) - h0;
 }
@@ -121,13 +111,13 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
 
 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_ + 4, y);
-       mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_);
-       mathed_draw_deco(pi, x + dim.width() - dw_ - 4,
+       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_,
                b, dw_, dim.height(), right_);
-       setPosCache(pi, x, y);
 }
 
 
@@ -190,14 +180,21 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 
 void InsetMathDelim::mathmlize(MathStream & os) const
 {
-       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>" << left_ << "</mo>"
-               << cell(0) << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" << right_ << "</mo>";
+       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>"
+          << convertDelimToXMLEscape(left_) 
+          << "</mo>\n"
+          << cell(0) 
+          << "\n<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" 
+          << convertDelimToXMLEscape(right_) 
+          << "</mo>\n";
 }
 
 
 void InsetMathDelim::htmlize(HtmlStream & os) const
 {
-       os << left_ << cell(0) << right_;
+       os << convertDelimToXMLEscape(left_) 
+          << cell(0) 
+          << convertDelimToXMLEscape(right_);
 }