fix typo that put too many include paths for most people

[lyx.git] / src / mathed / formulamacro.C

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 814bfca680470af690643df8249b81c58079b8b6..48d87cf4034d14b8e17dff0510a6c949aa7e7ec2 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -3,7 +3,7 @@
  *  Purpose:     Implementation of the formula macro LyX inset
  *  Author:      André Pönitz, based on ideas of Alejandro Aguilar Sierra
  *  Created:     March 2001
- *  Description: Allows the edition of math macros inside Lyx. 
+ *  Description: Allows the edition of math macros inside Lyx.
  *
  *  Copyright: 2001  The LyX Project
  *
@@ -47,10 +47,10 @@ InsetFormulaMacro::InsetFormulaMacro()
 }
 
 
-InsetFormulaMacro::InsetFormulaMacro(string name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 {
        setInsetName(name);
-       MathMacroTable::create(name, nargs, string());
+       MathMacroTable::create(name, nargs);
 }
 
 
@@ -71,15 +71,15 @@ Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
 void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
        os << "FormulaMacro ";
-       WriteStream wi(os, false);
+       WriteStream wi(os, false, false);
        par()->write(wi);
 }
 
 
-int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile, 
+int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
                             bool /*free_spacing*/) const
 {
-       WriteStream wi(os, fragile);
+       WriteStream wi(os, fragile, true);
        par()->write(wi);
        return 2;
 }
@@ -87,7 +87,7 @@ int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
 
 int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 {
-       WriteStream wi(os, false);
+       WriteStream wi(os, false, true);
        par()->write(wi);
        return 0;
 }
@@ -172,7 +172,7 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
 
        // label
        font.setColor(LColor::math);
-       
+
        int const a = y - ascent(bv, font) + 1;
        int const w = width(bv, font) - 2;
        int const h = ascent(bv, font) + descent(bv, font) - 2;
@@ -193,4 +193,3 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
        yo_ = y;
        par()->draw(pain, xo_, yo_);
 }
-