-/*
- * 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.
*/
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
#include "math_macro.h"
#include "math_support.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;
MathMacro::MathMacro(string const & name)
-MathInset * MathMacro::clone() const
+auto_ptr<InsetBase> MathMacro::clone() const
{
- return new MathMacro(*this);
+ return auto_ptr<InsetBase>(new MathMacro(*this));
}
}
-void MathMacro::metrics(MathMetricsInfo & mi) const
+void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
augmentFont(font_, "lyxtex");
mi_ = mi;
if (defining()) {
- mathed_string_dim(font_, name(), dim_);
- return;
- }
- if (editing()) {
+ mathed_string_dim(font_, name(), dim);
+
+ } else if (editing(mi.base.bv)) {
+
expand();
- dim_ = expanded_.metrics(mi_);
- metricsMarkers2(2);
+ expanded_.metrics(mi_, dim);
+ metricsMarkers(dim);
- dim_.w += mathed_string_width(font_, name()) + 10;
+ dim.wid += mathed_string_width(font_, name()) + 10;
- Dimension ldim;
- mathed_string_dim(font_, "#1: ", ldim);
+ int ww = mathed_string_width(font_, "#1: ");
for (idx_type i = 0; i < nargs(); ++i) {
MathArray const & c = cell(i);
c.metrics(mi_);
- dim_.w = max(dim_.w, c.width() + ldim.w);
- dim_.d += max(c.ascent(), ldim.a) + 5;
- dim_.d += max(c.descent(), ldim.d) + 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;
}
- return;
+
+ } else {
+
+ expand();
+ expanded_.substitute(*this);
+ expanded_.metrics(mi_, dim);
+
}
- expand();
- expanded_.substitute(*this);
- expanded_.metrics(mi_);
- dim_ = expanded_.dim();
+ dim_ = dim;
}
-void MathMacro::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacro::draw(PainterInfo & pi, int x, int y) const
{
- metrics(mi_);
+ metrics(mi_, dim_);
LyXFont texfont;
augmentFont(texfont, "lyxtex");
return;
}
- if (editing()) {
- int h = y - ascent() + 2 + expanded_.ascent();
+ if (editing(pi.base.bv)) {
+ int h = y - dim_.ascent() + 2 + expanded_.ascent();
drawStr(pi, font_, x + 3, h, name());
int const w = mathed_string_width(font_, name());
for (idx_type i = 0; i < nargs(); ++i) {
MathArray const & c = cell(i);
- h += max(c.ascent(), ldim.a) + 5;
- c.draw(pi, x + ldim.w, h);
+ h += max(c.ascent(), ldim.asc) + 5;
+ c.draw(pi, x + ldim.wid, h);
char str[] = "#1:";
str[1] += static_cast<char>(i);
drawStr(pi, texfont, x + 3, h, str);
- h += max(c.descent(), ldim.d) + 5;
+ h += max(c.descent(), ldim.des) + 5;
}
return;
}
void MathMacro::dump() const
{
MathMacroTable::dump();
- lyxerr << "\n macro: '" << this << "'\n";
- lyxerr << " name: '" << name() << "'\n";
- lyxerr << " template: '";
+ lyxerr << "\n macro: '" << this << "'\n"
+ << " name: '" << name() << "'\n"
+ << " template: '";
WriteStream wi(lyxerr);
tmplate_->write(wi);
- lyxerr << "'\n";
+ lyxerr << "'" << endl;
}
-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;
}
}
-void MathMacro::maplize(MapleStream & os) const
+void MathMacro::maple(MapleStream & os) const
{
updateExpansion();
- ::maplize(expanded_, os);
+ ::maple(expanded_, os);
}
}
-void MathMacro::octavize(OctaveStream & os) const
+void MathMacro::octave(OctaveStream & os) const
{
updateExpansion();
- ::octavize(expanded_, os);
+ ::octave(expanded_, os);
}
expand();
expanded_.substitute(*this);
}
+
+
+void MathMacro::infoize(std::ostream & os) const
+{
+ os << "Macro: " << name();
+}
+
+
+void MathMacro::infoize2(std::ostream & os) const
+{
+ os << "Macro: " << name();
+}