X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathStackrel.cpp;h=d8b9e97d255c1b69d0c9740260898dbfe70cad04;hb=efaae780dbbe3685e26e040ed4255e5abf268106;hp=200fde5a358a748f1e63b3c13cee957c6627f4ef;hpb=38b9a4530e8eb870e60cf8a15c208010fb292054;p=lyx.git
diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index 200fde5a35..d8b9e97d25 100644
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -12,6 +12,7 @@
#include "InsetMathStackrel.h"
+#include "Cursor.h"
#include "LaTeXFeatures.h"
#include "MathData.h"
#include "MathStream.h"
@@ -20,7 +21,8 @@ using namespace std;
namespace lyx {
-InsetMathStackrel::InsetMathStackrel(Buffer * buf) : InsetMathFracBase(buf)
+InsetMathStackrel::InsetMathStackrel(Buffer * buf, bool sub)
+ : InsetMathFracBase(buf, sub ? 3 : 2)
{}
@@ -30,6 +32,24 @@ Inset * InsetMathStackrel::clone() const
}
+bool InsetMathStackrel::idxUpDown(Cursor & cur, bool up) const
+{
+ if (up) {
+ if (cur.idx() == 0)
+ return false;
+ } else {
+ if (cur.idx() + 1 == nargs())
+ return false;
+ }
+ InsetMath::idx_type target = up ? cur.idx() - 1 : cur.idx() + 1;
+ if (cur.idx() == target)
+ return false;
+ cur.idx() = target;
+ cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
+ return true;
+}
+
+
void InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
{
Dimension dim1;
@@ -37,9 +57,17 @@ void InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
FracChanger dummy(mi.base);
Dimension dim0;
cell(0).metrics(mi, dim0);
- dim.wid = max(dim0.width(), dim1.width()) + 4;
- dim.asc = dim1.ascent() + dim0.height() + 4;
- dim.des = dim1.descent();
+ if (nargs() > 2) {
+ Dimension dim2;
+ cell(2).metrics(mi, dim2);
+ dim.wid = max(max(dim0.width(), dim1.width()), dim2.width()) + 4;
+ dim.asc = dim1.ascent() + dim0.height() + 4;
+ dim.des = dim1.descent() + dim2.height() + dim2.descent() + 1;
+ } else {
+ dim.wid = max(dim0.width(), dim1.width()) + 4;
+ dim.asc = dim1.ascent() + dim0.height() + 4;
+ dim.des = dim1.descent();
+ }
metricsMarkers(dim);
}
@@ -54,6 +82,11 @@ void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
cell(1).draw(pi, m - dim1.width() / 2, y);
FracChanger dummy(pi.base);
cell(0).draw(pi, m - dim0.width() / 2, yo);
+ if (nargs() > 2) {
+ Dimension const & dim2 = cell(2).dimension(*pi.base.bv);
+ int y2 = y + dim1.descent() + dim2.ascent() + 1;
+ cell(2).draw(pi, m - dim2.width() / 2, y2);
+ }
drawMarkers(pi, x, y);
}
@@ -61,40 +94,69 @@ void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
void InsetMathStackrel::write(WriteStream & os) const
{
MathEnsurer ensurer(os);
- os << "\\stackrel{" << cell(0) << "}{" << cell(1) << '}';
+ os << "\\stackrel";
+ if (nargs() > 2)
+ os << '[' << cell(2) << ']';
+ os << '{' << cell(0) << "}{" << cell(1) << '}';
}
void InsetMathStackrel::normalize(NormalStream & os) const
{
- os << "[stackrel " << cell(0) << ' ' << cell(1) << ']';
+ os << "[stackrel " << cell(0) << ' ' << cell(1);
+ if (nargs() > 2)
+ os << ' ' << cell(2);
+ os << ']';
}
void InsetMathStackrel::mathmlize(MathStream & ms) const
{
- ms << "" << cell(1) << cell(0) << "";
+ if (nargs() > 2)
+ ms << "" << cell(1) << cell(2) << cell(0) << "";
+ else
+ ms << "" << cell(1) << cell(0) << "";
}
void InsetMathStackrel::htmlize(HtmlStream & os) const
{
- // at the moment, this is exactly the same as overset
- os << MTag("span", "class='overset'")
- << MTag("span", "class='top'") << cell(0) << ETag("span")
- << MTag("span") << cell(1) << ETag("span")
- << ETag("span");
+ if (nargs() > 2) {
+ os << MTag("span", "class='underoverset'")
+ << MTag("span", "class='top'") << cell(0) << ETag("span")
+ << MTag("span") << cell(1) << ETag("span")
+ << MTag("span", "class='bottom'") << cell(2) << ETag("span");
+ } else {
+ // at the moment, this is exactly the same as overset
+ os << MTag("span", "class='overset'")
+ << MTag("span", "class='top'") << cell(0) << ETag("span")
+ << MTag("span") << cell(1) << ETag("span");
+ }
+ os << ETag("span");
}
void InsetMathStackrel::validate(LaTeXFeatures & features) const
{
- // from overset
- if (features.runparams().math_flavor == OutputParams::MathAsHTML)
- features.addCSSSnippet(
- "span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
- "span.overset span {display: block;}\n"
- "span.top{font-size: 66%;}");
+ if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
+ if (nargs() > 2) {
+ // FIXME: "vertical-align: middle" works only if the
+ // height of sub and super script is approximately equal.
+ features.addCSSSnippet(
+ "span.underoverset{display: inline-block; vertical-align: middle; text-align:center;}\n"
+ "span.underoverset span {display: block;}\n"
+ "span.bottom{font-size: 66%;}\n"
+ "span.top{font-size: 66%;}");
+ } else {
+ // from overset
+ features.addCSSSnippet(
+ "span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+ "span.overset span {display: block;}\n"
+ "span.top{font-size: 66%;}");
+ }
+ }
+ if (nargs() > 2)
+ features.require("stackrel");
InsetMathNest::validate(features);
}