X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmathed%2Fmath_macroarg.C;h=35d09d22d9463e4d351663c2e740f2a89123f266;hb=32253ab4d12680e8587dc8123e82ecb98da670e1;hp=f65510383290efca8decca4b827c065beb24313f;hpb=5a8177491db6ae29956507ef02fe33ccb6d998eb;p=lyx.git

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index f655103832..35d09d22d9 100644
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -11,8 +11,8 @@
 
 
 
-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: "
@@ -32,7 +32,10 @@ MathInset * MathMacroArgument::clone() const
 
 void MathMacroArgument::write(WriteStream & os) const
 {
-	os << str_;
+	if (code_ == LM_TC_MIN)
+		os << str_;
+	else
+		os << '\\' << math_font_name(code_) << '{' << str_ << '}';
 }
 
 
@@ -67,6 +70,8 @@ void MathMacroArgument::normalize(NormalStream & os) const
 void MathMacroArgument::substitute(MathMacro const & m)
 {
 	cell(0) = m.cell(number_ - 1);
+	for (MathArray::iterator it = cell(0).begin(); it != cell(0).end(); ++it)
+		it->nucleus()->handleFont(code_);
 	expanded_ = true;
 }