Fix math macro bug, caused by the evil string::operator+=(int)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@212 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index b80bba59d937f2338924fbac9a3a8d77fb04216c..4277986e5912383c11471bb7184418b13512054a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 1999-10-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/mathed/math_macro.C (MathMacroArgument::Write,
+       MathMacroTemplate::WriteDef): add tostr() around macro arg numbers
+       when writing them out.
+
+       * src/LString.C: remove, since it is not used anymore.
+       
+       * src/support/lyxstring.C: condition the content to
+       USE_INCLUDED_STRING macro.
+
        * src/mathed/math_symbols.C, src/support/lstrings.C,
        src/support/lyxstring.C: add `using' directive to specify what
        we need in <algorithm>. I do not think that we need to

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 895c2bf95fcd529ae2fb1c58121d4c2e5d7526a0..f8aab671838b7034d1b2e93c0edadd712969bbc3 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -256,7 +256,7 @@ void MathMacroArgument::Write(string &file)
        MathParInset::Write(file);
     } else {
        file += '#';
-       file += number;
+       file += tostr(number);
        file += ' ';
     }
 }
@@ -388,7 +388,7 @@ void MathMacroTemplate::WriteDef(string &file)
       
     if (nargs > 0 ) {
       file += '[';
-      file += nargs;
+      file += tostr(nargs);
       file += ']';
     }