Whitespace.

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index cffc1d76deacabf7f87704d26f4d4ded25a0684c..9a244eaa34594a69c7da531eae0882bf4767405c 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)
 {}
 
 
@@ -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)
 {}
 
 
@@ -540,17 +535,30 @@ void InsetMathBinom::normalize(NormalStream & os) const
 
 void InsetMathBinom::mathmlize(MathStream & os) const
 {
+       char ldelim = ' ';
+       char rdelim = ' ';
        switch (kind_) {
        case BINOM:
-               os << MTag("mbinom") << cell(0) << cell(1) << ETag("mbinom");
-               break;
+       case TBINOM:
        case DBINOM:
-               os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
+       case CHOOSE:
+               ldelim = '(';
+               rdelim = ')';
                break;
-       case TBINOM:
-               os << MTag("mtbinom") << cell(0) << cell(1) << ETag("mtbinom");
+       case BRACE:
+               ldelim = '{';
+               rdelim = '}';
+               break;
+       case BRACK:
+               ldelim = '[';
+               rdelim = ']';
                break;
        }
+       os << "<mo fence='true' stretchy='true' form='prefix'>" << ldelim << "</mo>"
+          << "<mfrac linethickness='0'>"
+          << cell(0) << cell(1)
+          << "</mfrac>"
+          << "<mo fence='true' stretchy='true' form='postfix'>" << rdelim << "</mo>";
 }