* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "InsetMathUnderset.h"
-#include "MathArray.h"
+#include "MathData.h"
#include "MathStream.h"
#include "Cursor.h"
#include "LaTeXFeatures.h"
+using namespace std;
namespace lyx {
-using std::max;
-using std::auto_ptr;
-
-
-
-auto_ptr<InsetBase> InsetMathUnderset::doClone() const
+Inset * InsetMathUnderset::clone() const
{
- return auto_ptr<InsetBase>(new InsetMathUnderset(*this));
+ return new InsetMathUnderset(*this);
}
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
{
- cell(1).metrics(mi);
+ Dimension dim1;
+ cell(1).metrics(mi, dim1);
FracChanger dummy(mi.base);
- cell(0).metrics(mi);
- dim.wid = max(cell(0).width(), cell(1).width()) + 4;
- dim.asc = cell(1).ascent();
- dim.des = cell(1).descent() + cell(0).height() + 4;
+ Dimension dim0;
+ cell(0).metrics(mi, dim0);
+ dim.wid = max(dim0.width(), dim1.width()) + 4;
+ dim.asc = dim1.ascent();
+ dim.des = dim1.descent() + dim0.height() + 4;
metricsMarkers(dim);
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
}
void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
{
- int m = x + width() / 2;
- int yo = y + cell(1).descent() + cell(0).ascent() + 1;
- cell(1).draw(pi, m - cell(1).width() / 2, y);
+ 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);
+ int m = x + dim.wid / 2;
+ int yo = y + dim1.descent() + dim0.ascent() + 1;
+ cell(1).draw(pi, m - dim1.width() / 2, y);
FracChanger dummy(pi.base);
- cell(0).draw(pi, m - cell(0).width() / 2, yo);
+ cell(0).draw(pi, m - dim0.width() / 2, yo);
drawMarkers(pi, x, y);
}
if (cur.idx() == target)
return false;
cur.idx() = target;
- cur.pos() = cur.cell().x2pos(cur.x_target());
+ cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target());
return true;
}
void InsetMathUnderset::write(WriteStream & os) const
{
+ MathEnsurer ensurer(os);
os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
}
}
+void InsetMathUnderset::mathmlize(MathStream & ms) const
+{
+ ms << "<munder accent='false'>" << cell(1) << cell(0) << "</munder>";
+}
+
+
void InsetMathUnderset::validate(LaTeXFeatures & features) const
{
features.require("amsmath");