#include "math_macroarg.h"
#include "math_macro.h"
#include "math_defs.h"
-#include "mathed/support.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
#include "debug.h"
}
-void MathMacroArgument::write(MathWriteInfo & os) const
+void MathMacroArgument::write(WriteStream & os) const
{
- os << '#' << number_;
+ os << str_;
}
-void MathMacroArgument::metrics(MathMetricsInfo const & st) const
+void MathMacroArgument::metrics(MathMetricsInfo const & mi) const
{
+ mi_ = mi;
if (expanded_) {
- xcell(0).metrics(st);
+ xcell(0).metrics(mi_);
width_ = xcell(0).width();
ascent_ = xcell(0).ascent();
descent_ = xcell(0).descent();
} else
- mathed_string_dim(LM_TC_TEX, size_, str_, ascent_, descent_, width_);
+ mathed_string_dim(LM_TC_TEX, mi_, str_, ascent_, descent_, width_);
}
if (expanded_)
xcell(0).draw(pain, x, y);
else
- drawStr(pain, LM_TC_TEX, size_, x, y, str_);
+ drawStr(pain, LM_TC_TEX, mi_, x, y, str_);
}
-void MathMacroArgument::writeNormal(std::ostream & os) const
+void MathMacroArgument::normalize(NormalStream & os) const
{
- os << "[macroarg " << number_ << "] ";
+ os << "[macroarg " << str_ << "] ";
}