rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index d51ecea60e47c39b2cc96c06c9b4d3d9287ad673..c9231fe82cb1682ddc3bcaedb7aa3ebd9d574ca5 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -13,17 +13,15 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "formulamacro.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
+#include "math_metricsinfo.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "BufferView.h"
@@ -37,7 +35,9 @@
 #include "lyxtext.h"
 #include "lyxfont.h"
 
-#include <sstream>
+#include "Lsstream.h"
+
+#include "BoostFormat.h"
 
 using std::ostream;
 
@@ -60,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);
 }
 
@@ -117,15 +117,19 @@ void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 void InsetFormulaMacro::read(std::istream & is)
 {
        MathMacroTemplate * p = new MathMacroTemplate(is);
-       MathMacroTable::create(MathAtom(p));
        setInsetName(p->name());
+       MathMacroTable::create(MathAtom(p));
        metrics();
 }
 
 
 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
 }
 
 
@@ -167,31 +171,33 @@ Inset::Code InsetFormulaMacro::lyxCode() const
 
 
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int y, float & xx, bool /*cleared*/) const
+                            int y, float & xx) const
 {
-       MathPainterInfo pain = MathPainterInfo(bv->painter());
-       LyXFont font(f);
-
        // label
+       LyXFont font(f);
        font.setColor(LColor::math);
 
+       MathPainterInfo pi = MathPainterInfo(bv->painter());
+       pi.base.style = LM_ST_TEXT;
+       pi.base.font  = font;
+
        int const x = int(xx);
        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;
 
        // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
-       pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
-       pain.pain.rectangle(x, a, w, h, LColor::mathframe);
+       pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+       pi.pain.rectangle(x, a, w, h, LColor::mathframe);
 
        if (mathcursor &&
                        const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
-               mathcursor->drawSelection(pain);
+               mathcursor->drawSelection(pi);
 
-       pain.pain.text(x + 2, y, prefix(), font);
+       pi.pain.text(x + 2, y, prefix(), font);
 
        // formula
-       par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+       par()->draw(pi, x + font_metrics::width(prefix(), f) + 5, y);
        xx += w + 2;
        xo_ = x;
        yo_ = y;