Fix command-line export

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

diff --git a/src/mathed/MathMacroTemplate.C b/src/mathed/MathMacroTemplate.C
index 35e433b2ee58284cf90c956ef0e52a16714e6178..b546e76720d74e8317c7f90681a1fed9108d8e45 100644 (file)
--- a/src/mathed/MathMacroTemplate.C
+++ b/src/mathed/MathMacroTemplate.C
@@ -21,8 +21,8 @@
 #include "lyxlex.h"
 #include "LColor.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 
 #include "support/lstrings.h"
 
@@ -117,7 +117,7 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(1).metrics(mi);
        docstring dp = prefix();
        dim.wid = cell(0).width() + cell(1).width() + 20
-               + font_metrics::width(dp, mi.base.font);
+               + theFontMetrics(mi.base.font).width(dp);
        dim.asc = std::max(cell(0).ascent(),  cell(1).ascent())  + 7;
        dim.des = std::max(cell(0).descent(), cell(1).descent()) + 7;
        dim_ = dim;
@@ -155,7 +155,8 @@ void MathMacroTemplate::draw(PainterInfo & p, int x, int y) const
 #endif
        docstring dp = prefix();
        pi.pain.text(x + 2, y, dp, font);
-       x += font_metrics::width(dp, pi.base.font) + 6;
+       // FIXME: Painter text should retain the drawn text width
+       x += theFontMetrics(font).width(dp) + 6;
 
        int const w0 = cell(0).width();
        int const w1 = cell(1).width();