Allow using \binom without amsmath and add support for \brace and \brack

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index ff0596250abf6a75b1730272a8fa1ddc6b4f1519..ac2d894e091c118f82564876dcce950ef007bca3 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -45,7 +45,7 @@ bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -94,7 +94,7 @@ bool InsetMathFrac::idxForward(Cursor & cur) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -112,7 +112,7 @@ bool InsetMathFrac::idxBackward(Cursor & cur) const
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
-       cur.pos() = cell(target).x2pos(cur.x_target());
+       cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
@@ -168,8 +168,6 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                }
        }
        metricsMarkers(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -250,7 +248,7 @@ void InsetMathFrac::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 }
 
 
-void InsetMathFrac::drawT(TextPainter & pain, int x, int y) const
+void InsetMathFrac::drawT(TextPainter & /*pain*/, int /*x*/, int /*y*/) const
 {
        // FIXME: BROKEN!
        /*
@@ -373,8 +371,6 @@ void InsetMathDFrac::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid = max(dim0.wid, dim1.wid) + 2;
        dim.asc = dim0.height() + 2 + 5;
        dim.des = dim1.height() + 2 - 5;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -433,8 +429,6 @@ void InsetMathTFrac::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid = max(dim0.width(), dim1.width()) + 2;
        dim.asc = dim0.height() + 2 + 5;
        dim.des = dim1.height() + 2 - 5;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -478,8 +472,8 @@ void InsetMathTFrac::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathBinom::InsetMathBinom(bool choose)
-       : choose_(choose)
+InsetMathBinom::InsetMathBinom(Kind kind)
+       : kind_(kind)
 {}
 
 
@@ -510,8 +504,6 @@ void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.des = dim1.height() + 4 - 5;
        dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -520,29 +512,43 @@ void InsetMathBinom::draw(PainterInfo & pi, int x, int y) const
        Dimension const dim = dimension(*pi.base.bv);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       docstring const bra = kind_ == BRACE ? from_ascii("{") :
+                             kind_ == BRACK ? from_ascii("[") : from_ascii("(");
+       docstring const ket = kind_ == BRACE ? from_ascii("}") :
+                             kind_ == BRACK ? from_ascii("]") : from_ascii(")");
        int m = x + dim.width() / 2;
        FracChanger dummy(pi.base);
        cell(0).draw(pi, m - dim0.width() / 2, y - dim0.des - 3 - 5);
        cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc  + 3 - 5);
-       mathed_draw_deco(pi, x, y - dim.ascent(), dw(dim.height()), dim.height(), from_ascii("("));
+       mathed_draw_deco(pi, x, y - dim.ascent(), dw(dim.height()), dim.height(), bra);
        mathed_draw_deco(pi, x + dim.width() - dw(dim.height()), y - dim.ascent(),
-               dw(dim.height()), dim.height(), from_ascii(")"));
+               dw(dim.height()), dim.height(), ket);
        drawMarkers2(pi, x, y);
 }
 
 
 bool InsetMathBinom::extraBraces() const
 {
-       return choose_;
+       return kind_ == CHOOSE || kind_ == BRACE || kind_ == BRACK;
 }
 
 
 void InsetMathBinom::write(WriteStream & os) const
 {
-       if (choose_)
-               os << '{' << cell(0) << " \\choose " << cell(1) << '}';
-       else
+       switch (kind_) {
+       case BINOM:
                os << "\\binom{" << cell(0) << "}{" << cell(1) << '}';
+               break;
+       case CHOOSE:
+               os << '{' << cell(0) << " \\choose " << cell(1) << '}';
+               break;
+       case BRACE:
+               os << '{' << cell(0) << " \\brace " << cell(1) << '}';
+               break;
+       case BRACK:
+               os << '{' << cell(0) << " \\brack " << cell(1) << '}';
+               break;
+       }
 }
 
 
@@ -552,6 +558,15 @@ void InsetMathBinom::normalize(NormalStream & os) const
 }
 
 
+void InsetMathBinom::validate(LaTeXFeatures & features) const
+{
+       if (kind_ == BINOM) {
+               features.require("binom");
+               InsetMathNest::validate(features);
+       }
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetMathDBinom
@@ -584,8 +599,6 @@ void InsetMathDBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.des = dim1.height() + 4 - 5;
        dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
@@ -654,8 +667,6 @@ void InsetMathTBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.des = dim1.height() + 4 - 5;
        dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
        metricsMarkers2(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }