Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 7c759d3432117aec80b201b0790aca68cec30f99..35f2ed3d0038ee1b8b0166dee1158f67090af6e6 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -13,9 +13,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "formulamacro.h"
 #include "commandtags.h"
@@ -40,6 +37,8 @@
 
 #include "Lsstream.h"
 
+#include "BoostFormat.h"
+
 using std::ostream;
 
 extern MathCursor * mathcursor;
@@ -61,7 +60,7 @@ InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-       std::istringstream is(s);
+       std::istringstream is(STRCONV(s));
        read(is);
 }
 
@@ -126,7 +125,11 @@ void InsetFormulaMacro::read(std::istream & is)
 
 string InsetFormulaMacro::prefix() const
 {
-       return string(" ") + _("Macro: ") + getInsetName() + ": ";
+#if USE_BOOST_FORMAT
+       return boost::io::str(boost::format(_(" Macro: %s: ")) % getInsetName());
+#else
+       return _(" Macro: ") + getInsetName() + ": ";
+#endif
 }