-/*
- * File: math_macro.C
- * Purpose: Implementation of macro class for mathed
- * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- * Created: November 1996
- * Description: WYSIWYG math macros
+/**
+ * \file math_macro.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * Dependencies: Math
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
*
- * Copyright: 1996, 1997 Alejandro Aguilar Sierra
- *
- * Version: 0.2, Math & Lyx project.
- *
- * This code is under the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "math_macrotable.h"
#include "math_macrotemplate.h"
#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "cursor.h"
#include "debug.h"
#include "LaTeXFeatures.h"
+using std::string;
using std::max;
using std::auto_ptr;
using std::endl;
if (defining()) {
- mathed_string_dim(font_, name(), dim_);
+ mathed_string_dim(font_, name(), dim);
- } else if (editing()) {
+ } else if (editing(mi.base.bv)) {
expand();
- expanded_.metrics(mi_, dim_);
- metricsMarkers();
+ expanded_.metrics(mi_, dim);
+ metricsMarkers(dim);
- dim_.wid += mathed_string_width(font_, name()) + 10;
+ dim.wid += mathed_string_width(font_, name()) + 10;
int ww = mathed_string_width(font_, "#1: ");
for (idx_type i = 0; i < nargs(); ++i) {
MathArray const & c = cell(i);
c.metrics(mi_);
- dim_.wid = max(dim_.wid, c.width() + ww);
- dim_.des += max(c.ascent(), dim_.asc) + 5;
- dim_.des += max(c.descent(), dim_.des) + 5;
+ dim.wid = max(dim.wid, c.width() + ww);
+ dim.des += max(c.ascent(), dim.asc) + 5;
+ dim.des += max(c.descent(), dim.des) + 5;
}
} else {
expand();
expanded_.substitute(*this);
- expanded_.metrics(mi_, dim_);
+ expanded_.metrics(mi_, dim);
}
- dim = dim_;
+ dim_ = dim;
}
return;
}
- if (editing()) {
+ if (editing(pi.base.bv)) {
int h = y - dim_.ascent() + 2 + expanded_.ascent();
drawStr(pi, font_, x + 3, h, name());
}
-bool MathMacro::idxUpDown(idx_type & idx, pos_type &, bool up, int x) const
+bool MathMacro::idxUpDown(LCursor & cur, bool up) const
{
- pos_type pos;
if (up) {
- if (!MathNestInset::idxLeft(idx, pos))
+ if (!MathNestInset::idxLeft(cur))
return false;
- pos = cell(idx).x2pos(x);
- return true;
} else {
- if (!MathNestInset::idxRight(idx, pos))
+ if (!MathNestInset::idxRight(cur))
return false;
- pos = cell(idx).x2pos(x);
- return true;
}
+ cur.pos() = cur.cell().x2pos(cur.x_target());
+ return true;
}
-bool MathMacro::idxLeft(idx_type &, pos_type &) const
+bool MathMacro::idxLeft(LCursor &) const
{
return false;
}
-bool MathMacro::idxRight(idx_type &, pos_type &) const
+bool MathMacro::idxRight(LCursor &) const
{
return false;
}