#include "debug.h"
+using std::endl;
-MathMacroArgument::MathMacroArgument(int n)
- : MathNestInset(1), number_(n), expanded_(false)
+
+MathMacroArgument::MathMacroArgument(int n, MathTextCodes code)
+ : MathNestInset(1), number_(n), expanded_(false), code_(code)
{
if (n < 1 || n > 9) {
lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
- << n << std::endl;
+ << n << endl;
}
str_[0] = '#';
- str_[1] = '0' + n;
+ str_[1] = static_cast<unsigned char>('0' + n);
str_[2] = '\0';
}
void MathMacroArgument::write(WriteStream & os) const
{
- os << '#' << number_;
+ if (code_ == LM_TC_MIN)
+ os << str_;
+ else
+ os << '\\' << math_font_name(code_) << '{' << str_ << '}';
}
void MathMacroArgument::metrics(MathMetricsInfo const & mi) const
{
- mi_ = mi;
+ whichFont(font_, LM_TC_TEX, mi);
if (expanded_) {
- xcell(0).metrics(mi_);
+ xcell(0).metrics(mi);
width_ = xcell(0).width();
ascent_ = xcell(0).ascent();
descent_ = xcell(0).descent();
} else
- mathed_string_dim(LM_TC_TEX, mi_, str_, ascent_, descent_, width_);
+ mathed_string_dim(font_, str_, ascent_, descent_, width_);
}
if (expanded_)
xcell(0).draw(pain, x, y);
else
- drawStr(pain, LM_TC_TEX, mi_, x, y, str_);
+ drawStr(pain, font_, x, y, str_);
}
void MathMacroArgument::normalize(NormalStream & os) const
{
- os << "[macroarg " << number_ << "] ";
+ os << "[macroarg " << str_ << "] ";
}
void MathMacroArgument::substitute(MathMacro const & m)
{
cell(0) = m.cell(number_ - 1);
+ if (code_ != LM_TC_MIN)
+ for (MathArray::iterator it = cell(0).begin(); it != cell(0).end(); ++it)
+ it->nucleus()->handleFont(code_);
expanded_ = true;
}
-