* This code is under the GNU General Public Licence version 2 or later.
*/
-#include <config.h>
-
#ifdef __GNUG__
#pragma implementation
#endif
#include "math_macrotable.h"
#include "math_macrotemplate.h"
#include "Painter.h"
+#include "LaTeXFeatures.h"
-
-using namespace std;
+using std::endl;
MathMacro::MathMacro(MathMacroTemplate const & t)
- : MathInset(t.name(), LM_OT_MACRO, t.numargs()), tmplate_(&t)
+ : MathInset(t.numargs(), t.name(), LM_OT_MACRO), tmplate_(&t)
{}
-MathInset * MathMacro::Clone() const
+MathMacro::MathMacro(MathMacro const & t)
+ : MathInset(t), tmplate_(t.tmplate_) // don't copy 'expanded_'!
+{}
+
+
+
+MathInset * MathMacro::clone() const
{
return new MathMacro(*this);
}
-void MathMacro::Metrics(MathStyles st)
+void MathMacro::Metrics(MathStyles st, int, int)
{
if (mathcursor && mathcursor->isInside(this)) {
expanded_ = tmplate_->xcell(0);
width_ += mathed_string_width(LM_TC_TEXTRM, size_, name_) + 10;
+ int lasc;
+ int ldes;
+ int lwid;
+ mathed_string_dim(LM_TC_TEXTRM, size_, "#1: ", lasc, ldes, lwid);
+
for (int i = 0; i < nargs(); ++i) {
MathXArray & c = xcell(i);
c.Metrics(st);
- width_ = max(width_, c.width() + 30);
- descent_ += c.height() + 10;
+ width_ = std::max(width_, c.width() + lwid);
+ descent_ += std::max(c.ascent(), lasc) + 5;
+ descent_ += std::max(c.descent(), ldes) + 5;
}
} else {
expanded_ = tmplate_->xcell(0);
xo(x);
yo(y);
+ Metrics(size());
+
LColor::color col;
if (mathcursor && mathcursor->isInside(this)) {
int h = y - ascent() + 2 + expanded_.ascent();
drawStr(pain, LM_TC_TEXTRM, size(), x + 3, h, name_);
- int w = mathed_string_width(LM_TC_TEXTRM, size(), name_);
+ int const w = mathed_string_width(LM_TC_TEXTRM, size(), name_);
expanded_.draw(pain, x + w + 12, h);
h += expanded_.descent();
+ int lasc;
+ int ldes;
+ int lwid;
+ mathed_string_dim(LM_TC_TEXTRM, size_, "#1: ", lasc, ldes, lwid);
+
for (int i = 0; i < nargs(); ++i) {
MathXArray & c = xcell(i);
- h += c.ascent() + 5;
- c.draw(pain, x + 30, h);
+ h += std::max(c.ascent(), lasc) + 5;
+ c.draw(pain, x + lwid, h);
char str[] = "#1:";
str[1] += i;
drawStr(pain, LM_TC_TEX, size(), x + 3, h, str);
- h += c.descent() + 5;
+ h += std::max(c.descent(), ldes) + 5;
}
col = LColor::red;
} else {
col = LColor::black;
}
- pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2, col);
+ if (nargs() > 0)
+ pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2, col);
}
-void MathMacro::dump(ostream & os) const
+void MathMacro::dump(std::ostream & os) const
{
MathMacroTable::dump();
os << "\n macro: '" << this << "'\n";
os << endl;
}
-void MathMacro::Write(ostream & os, bool fragile) const
+void MathMacro::Write(std::ostream & os, bool fragile) const
{
os << '\\' << name_;
for (int i = 0; i < nargs(); ++i) {
}
-void MathMacro::WriteNormal(ostream & os) const
+void MathMacro::WriteNormal(std::ostream & os) const
{
os << "[macro " << name_ << " ";
for (int i = 0; i < nargs(); ++i) {
{
return false;
}
+
+
+void MathMacro::Validate(LaTeXFeatures & features) const
+{
+ if (name_ == "binom")
+ features.binom = true;
+ MathInset::Validate(features);
+}