Add comment.

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index 6d10da98470ae7e4f1063579e2645f9881d68630..11d24469db1c09b752105035e8a1951186a2fcbb 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -35,14 +35,16 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathFracBase::InsetMathFracBase(idx_type ncells)
-       : InsetMathNest(ncells)
+InsetMathFracBase::InsetMathFracBase(Buffer * buf, idx_type ncells)
+       : InsetMathNest(buf, ncells)
 {}
 
 
 bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const
 {
-       InsetMath::idx_type target = !up; // up ? 0 : 1, since upper cell has idx 0
+       // If we only have one cell, target = 0, otherwise
+       // target = up ? 0 : 1, since upper cell has idx 0
+       InsetMath::idx_type target = nargs() > 1 ? !up : 0;
        if (cur.idx() == target)
                return false;
        cur.idx() = target;
@@ -59,8 +61,8 @@ bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathFrac::InsetMathFrac(Kind kind, InsetMath::idx_type ncells)
-       : InsetMathFracBase(ncells), kind_(kind)
+InsetMathFrac::InsetMathFrac(Buffer * buf, Kind kind, InsetMath::idx_type ncells)
+       : InsetMathFracBase(buf, ncells), kind_(kind)
 {}
 
 
@@ -147,12 +149,13 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                        dim.des = max(dim2.des, dim1.height() - 5);
                }
        } else {
+               // general cell metrics used for \frac
                FracChanger dummy(mi.base);
                cell(0).metrics(mi, dim0);
                cell(1).metrics(mi, dim1);
                if (nargs() == 3)
                        cell(2).metrics(mi, dim2);
-
+               // metrics for special fraction types
                if (kind_ == NICEFRAC) {
                        dim.wid = dim0.width() + dim1.wid + 5;
                        dim.asc = dim0.height() + 5;
@@ -165,7 +168,7 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                } else {
                        if (kind_ == CFRAC || kind_ == CFRACLEFT
                        || kind_ == CFRACRIGHT || kind_ == DFRAC) {
-                               // \cfrac and \dfrac are in always in display size
+                               // \cfrac and \dfrac are always in display size
                                StyleChanger dummy2(mi.base, LM_ST_DISPLAY);
                                cell(0).metrics(mi, dim0);
                                cell(1).metrics(mi, dim1);
@@ -189,7 +192,6 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
        setPosCache(pi, x, y);
        Dimension const dim = dimension(*pi.base.bv);
        Dimension const dim0 = cell(0).dimension(*pi.base.bv);
-       int m = x + dim.wid / 2;
        if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
                if (nargs() == 1) {
                        ShapeChanger dummy2(pi.base.font, UP_SHAPE);
@@ -223,7 +225,7 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
                        ShapeChanger dummy2(pi.base.font, UP_SHAPE);
                        cell(0).draw(pi, x + 2, y - dim0.des - 5);
                        cell(1).draw(pi, x + dim0.width() + 5, y + dim1.asc / 2);
-               } else if (kind_ == FRAC) {
+               } else if (kind_ == FRAC || kind_ == ATOP || kind_ == OVER) {
                        cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5);
                        cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5);
                } else if (kind_ == TFRAC) {
@@ -384,17 +386,10 @@ void InsetMathFrac::octave(OctaveStream & os) const
 
 void InsetMathFrac::mathmlize(MathStream & os) const
 {
-       switch (kind_) {
-       case FRAC:
-               os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
-               break;
-       case DFRAC:
-               os << MTag("mdfrac") << cell(0) << cell(1) << ETag("mdfrac");
-               break;
-       case TFRAC:
-               os << MTag("mtfrac") << cell(0) << cell(1) << ETag("mtfrac");
-               break;
-       }
+       os << MTag("mfrac")
+          << MTag("mrow") << cell(0) << ETag("mrow")
+                << MTag("mrow") << cell(1) << ETag("mrow")
+                << ETag("mfrac");
 }
 
 
@@ -416,8 +411,8 @@ void InsetMathFrac::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathBinom::InsetMathBinom(Kind kind)
-       : kind_(kind)
+InsetMathBinom::InsetMathBinom(Buffer * buf, Kind kind)
+       : InsetMathFracBase(buf), kind_(kind)
 {}
 
 
@@ -544,12 +539,13 @@ void InsetMathBinom::mathmlize(MathStream & os) const
        case BINOM:
                os << MTag("mbinom") << cell(0) << cell(1) << ETag("mbinom");
                break;
-       case DBINOM:
-               os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
-               break;
        case TBINOM:
                os << MTag("mtbinom") << cell(0) << cell(1) << ETag("mtbinom");
                break;
+       case DBINOM:
+       default:
+               os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
+               break;
        }
 }