#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
}
-MathXArray const & MathXYArrowInset::targetCell() const
+MathArray const & MathXYArrowInset::targetCell() const
{
+#if 0
MathXYMatrixInset const * p = targetMatrix();
int x = 0;
int y = 0;
lyxerr << "target: n: " << n << " out of range\n";
n = 0;
}
- return p->xcell(n);
+ return p->cell(n);
+#else
+ static MathArray dummy;
+ return dummy;
+#endif
}
-MathXArray const & MathXYArrowInset::sourceCell() const
+MathArray const & MathXYArrowInset::sourceCell() const
{
- return targetMatrix()->xcell(mi_.idx);
+#if 0
+ return targetMatrix()->cell(mi_.idx);
+#else
+ static MathArray dummy;
+ return dummy;
+#endif
}
-void MathXYArrowInset::metrics(MathMetricsInfo const & mi) const
+void MathXYArrowInset::metrics(MathMetricsInfo & mi) const
{
MathNestInset::metrics(mi);
- mi_ = mi;
- whichFont(font_, LM_TC_TEXTRM, mi);
+ mi_ = mi;
+ MathFontSetChanger dummy(mi.base, "textrm");
+#if 0
target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
if (editing()) {
- int w = mathed_string_width(font_, "target: ");
- width_ = w + max(xcell(0).width(), xcell(1).width());
- ascent_ = xcell(0).ascent();
- descent_ = xcell(0).descent() + xcell(1).height() + 10;
+ int w = mathed_string_width(mi.base.font, "target: ");
+ width_ = w + max(cell(0).width(), cell(1).width());
+ ascent_ = cell(0).ascent();
+ descent_ = cell(0).descent() + cell(1).height() + 10;
} else {
width_ = 0;
ascent_ = 0;
descent_ = 0;
//mathed_string_dim(font_, "X", ascent_, descent_, width_);
}
+#endif
}
-void MathXYArrowInset::draw(Painter & pain, int x, int y) const
+void MathXYArrowInset::draw(MathPainterInfo & pi, int x, int y) const
{
metrics(mi_);
+ MathFontSetChanger dummy(pi.base, "textrm");
if (editing()) {
+#if 0
+
int lasc;
int ldes;
int lwid;
- mathed_string_dim(font_, "target: ", lasc, ldes, lwid);
+ mathed_string_dim(pi.base.font, "target: ", lasc, ldes, lwid);
+
+ cell(0).draw(pi, x + lwid, y);
+ drawStr(pi, pi.base.font, x + 3, y, "target");
+ y += max(cell(0).descent(), ldes) + 5;
- xcell(0).draw(pain, x + lwid, y);
- drawStr(pain, font_, x + 3, y, "target");
- y += max(xcell(0).descent(), ldes) + 5;
+ y += max(cell(1).ascent(), lasc) + 5;
+ cell(1).draw(pi, x + lwid, y);
+ drawStr(pi, pi.base.font, x + 3, y, "label");
- y += max(xcell(1).ascent(), lasc) + 5;
- xcell(1).draw(pain, x + lwid, y);
- drawStr(pain, font_, x + 3, y, "label");
+#endif
} else {
- //drawStr(pain, font_, x, y, "X");
- MathXArray const & s = sourceCell();
- MathXArray const & t = targetCell();
- pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
- xcell(1).draw(pain, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
+ drawStr(pi, font_, x, y, "X");
+ MathArray const & s = sourceCell();
+ MathArray const & t = targetCell();
+ pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
+ cell(1).draw(pi, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
}
}
{
os << "\\ar";
if (cell(0).size())
- os << "[" << cell(0) << "]";
+ os << '[' << cell(0) << ']';
if (cell(1).size())
- os << (up_ ? "^" : "_") << "{" << cell(1) << "}";
+ os << (up_ ? '^' : '_') << '{' << cell(1) << '}';
os << " ";
}
{
os << "[xyarrow ";
MathNestInset::normalize(os);
- os << "]";
+ os << ']';
}