Introduce a return value for mathmlize(). We will need this to be able

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index dc848fe6117ad9165507ee53b7467309b37807f9..3fbd56d8fdfc1bf552538258d4a4455d2a4af2be 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -17,6 +17,7 @@
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
 #include "MathData.h"
+#include "MathExtern.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "MetricsInfo.h"
@@ -35,14 +36,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 +62,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 +226,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) {
@@ -382,20 +385,14 @@ void InsetMathFrac::octave(OctaveStream & os) const
 }
 
 
-void InsetMathFrac::mathmlize(MathStream & os) const
+docstring InsetMathFrac::mathmlize(MathStream & os) const
 {
-       switch (kind_) {
-       case DFRAC:
-               os << MTag("mdfrac") << cell(0) << cell(1) << ETag("mdfrac");
-               break;
-       case TFRAC:
-               os << MTag("mtfrac") << cell(0) << cell(1) << ETag("mtfrac");
-               break;
-       case FRAC:
-       default:
-               os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
-               break;
-       }
+       os << MTag("mfrac") << MTag("mrow");
+       docstring rv = lyx::mathmlize(cell(0), os);
+       os << ETag("mrow") << MTag("mrow");
+       rv += lyx::mathmlize(cell(1), os);
+       os << ETag("mrow") << ETag("mfrac");
+       return rv;
 }
 
 
@@ -417,8 +414,8 @@ void InsetMathFrac::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 
-InsetMathBinom::InsetMathBinom(Kind kind)
-       : kind_(kind)
+InsetMathBinom::InsetMathBinom(Buffer * buf, Kind kind)
+       : InsetMathFracBase(buf), kind_(kind)
 {}
 
 
@@ -539,8 +536,9 @@ void InsetMathBinom::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBinom::mathmlize(MathStream & os) const
+docstring InsetMathBinom::mathmlize(MathStream & os) const
 {
+       // FIXME This all needs fixing
        switch (kind_) {
        case BINOM:
                os << MTag("mbinom") << cell(0) << cell(1) << ETag("mbinom");
@@ -553,6 +551,7 @@ void InsetMathBinom::mathmlize(MathStream & os) const
                os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
                break;
        }
+       return docstring();
 }