X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=02a458dbeb04c1dc603176335780df1ada16893c;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=4c286da8275b8519b0ea21843498be75c5bd1c54;hpb=725f07728b0aa9a622df3760a8882485b6a2dcc8;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 4c286da827..02a458dbeb 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -18,13 +18,14 @@
 
 #include "frontends/Painter.h"
 
+#include "support/docstring.h"
+
 #include <boost/assert.hpp>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-
 
 MetricsBase::MetricsBase()
 	: bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"),
@@ -38,17 +39,12 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w)
 {}
 
 
-
-MetricsInfo::MetricsInfo()
+MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, 
+	MacroContext const & mc)
+	: base(bv, font, textwidth), macrocontext(mc)
 {}
 
 
-MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth)
-	: base(bv, font, textwidth)
-{}
-
-
-
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
 	: pain(painter), ltr_pos(false), erased_(false), full_repaint(true),
 	background_color(Color_background)