Improve the list of equations

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 4c873f15e8ea1f1fd9b923ee13d9e84a975efea3..2680ad090d20f17cb517cf74969ebb68968c28c7 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -14,14 +14,19 @@
 #include "InsetMathDelim.h"
 
 #include "MathData.h"
+#include "MathFactory.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include "LaTeXFeatures.h"
+
 #include "support/docstring.h"
 
 #include "frontends/FontMetrics.h"
 
+#include <algorithm>
+
 using namespace std;
 
 namespace lyx {
@@ -40,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;
 }
@@ -58,6 +63,17 @@ Inset * InsetMathDelim::clone() const
 }
 
 
+void InsetMathDelim::validate(LaTeXFeatures & features) const
+{
+       InsetMathNest::validate(features);
+       // 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.
+       validate_math_word(features, left_);
+       validate_math_word(features, right_);
+}
+
+
 void InsetMathDelim::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
@@ -75,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');
@@ -86,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;
 }
@@ -94,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);
 }
 
 
@@ -163,8 +180,21 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 
 void InsetMathDelim::mathmlize(MathStream & os) const
 {
-       os << "<fenced open=\"" << left_ << "\" close=\""
-               << right_ << "\">" << cell(0) << "</fenced>";
+       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 << convertDelimToXMLEscape(left_) 
+          << cell(0) 
+          << convertDelimToXMLEscape(right_);
 }