Revert r32684, per Andre's suggestion.

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index a0f6aaad5d3a6b69de89588a5a405e27137fe91f..459866c924ed17fbcd5d66acfc0cca9014a9c866 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,26 +12,25 @@
 #include <config.h>
 
 #include "InsetMathDelim.h"
+
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathStream.h"
 #include "MathSupport.h"
+#include "MetricsInfo.h"
 
-#include "frontends/FontMetrics.h"
-
-namespace lyx {
+#include "support/docstring.h"
 
+#include "frontends/FontMetrics.h"
 
-using std::string;
-using std::max;
-using std::auto_ptr;
+using namespace std;
 
+namespace lyx {
 
 static docstring convertDelimToLatexName(docstring const & name)
 {
        if (name.size() == 1) {
                char_type const c = name[0];
-               if (c == '<' || c == '(' || c == '[' || c == '.' 
+               if (c == '<' || c == '(' || c == '[' || c == '.'
                    || c == '>' || c == ')' || c == ']' || c == '/' || c == '|')
                        return name;
        }
@@ -39,27 +38,29 @@ static docstring convertDelimToLatexName(docstring const & name)
 }
 
 
-InsetMathDelim::InsetMathDelim(docstring const & l, docstring const & r)
-       : InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l,
+               docstring const & r)
+       : InsetMathNest(buf, 1), left_(l), right_(r)
 {}
 
 
-InsetMathDelim::InsetMathDelim
-               (docstring const & l, docstring const & r, MathArray const & ar)
-       : InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r,
+       MathData const & ar)
+       : InsetMathNest(buf, 1), left_(l), right_(r)
 {
        cell(0) = ar;
 }
 
 
-auto_ptr<InsetBase> InsetMathDelim::doClone() const
+Inset * InsetMathDelim::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathDelim(*this));
+       return new InsetMathDelim(*this);
 }
 
 
 void InsetMathDelim::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << "\\left" << convertDelimToLatexName(left_) << cell(0)
           << "\\right" << convertDelimToLatexName(right_);
 }
@@ -72,35 +73,33 @@ void InsetMathDelim::normalize(NormalStream & os) const
 }
 
 
-bool InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi);
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
        Dimension t = theFontMetrics(mi.base.font).dimension('I');
        int h0 = (t.asc + t.des) / 2;
-       int a0 = max(cell(0).ascent(), t.asc)   - h0;
-       int d0 = max(cell(0).descent(), t.des)  + h0;
-       dw_ = cell(0).height() / 5;
+       int a0 = max(dim0.asc, t.asc)   - h0;
+       int d0 = max(dim0.des, t.des)  + h0;
+       dw_ = dim0.height() / 5;
        if (dw_ > 8)
                dw_ = 8;
        if (dw_ < 4)
                dw_ = 4;
-       dim.wid = cell(0).width() + 2 * dw_ + 8;
+       dim.wid = dim0.width() + 2 * dw_ + 8;
        dim.asc = max(a0, d0) + h0;
        dim.des = max(a0, d0) - h0;
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
 {
-       int const b = y - dim_.asc;
+       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,
-               b, dw_, dim_.height(), right_);
+       mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_);
+       mathed_draw_deco(pi, x + dim.width() - dw_ - 4,
+               b, dw_, dim.height(), right_);
        setPosCache(pi, x, y);
 }
 
@@ -164,8 +163,8 @@ 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'>" << left_ << "</mo>"
+               << cell(0) << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" << right_ << "</mo>";
 }