hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetspace.C

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index c97a3ebb08b49ae8eed002498a9a6a9f1e4c57af..72dcca13b2e1c5cf4b5b168a310c06e45d6193a6 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -21,10 +21,12 @@
 #include "metricsinfo.h"
 #include "outputparams.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 
+namespace lyx {
+
 using std::string;
 using std::max;
 using std::auto_ptr;
@@ -48,18 +50,19 @@ InsetSpace::Kind InsetSpace::kind() const
 
 void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LyXFont & font = mi.base.font;
-       dim.asc = font_metrics::maxAscent(font);
-       dim.des = font_metrics::maxDescent(font);
+       frontend::FontMetrics const & fm =
+               theFontMetrics(mi.base.font);
+       dim.asc = fm.maxAscent();
+       dim.des = fm.maxDescent();
 
        switch (kind_) {
                case THIN:
                case NEGTHIN:
-                    dim.wid = font_metrics::width(lyx::char_type('x'), font) / 3;
+                    dim.wid = fm.width(char_type('x')) / 3;
                        break;
                case PROTECTED:
                case NORMAL:
-                    dim.wid = font_metrics::width(lyx::char_type('x'), font);
+                    dim.wid = fm.width(char_type('x'));
                        break;
                case QUAD:
                        dim.wid = 20;
@@ -79,7 +82,8 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 {
        int const w = width();
-       int const h = font_metrics::ascent('x', pi.base.font);
+       int const h = theFontMetrics(pi.base.font)
+               .ascent('x');
        int xp[4], yp[4];
 
        xp[0] = x;
@@ -160,7 +164,7 @@ void InsetSpace::read(Buffer const &, LyXLex & lex)
 }
 
 
-int InsetSpace::latex(Buffer const &, ostream & os,
+int InsetSpace::latex(Buffer const &, odocstream & os,
                      OutputParams const & runparams) const
 {
        switch (kind_) {
@@ -193,7 +197,7 @@ int InsetSpace::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetSpace::plaintext(Buffer const &, ostream & os,
+int InsetSpace::plaintext(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
        switch (kind_) {
@@ -212,7 +216,7 @@ int InsetSpace::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetSpace::docbook(Buffer const &, ostream & os,
+int InsetSpace::docbook(Buffer const &, odocstream & os,
                        OutputParams const &) const
 {
        switch (kind_) {
@@ -233,7 +237,7 @@ int InsetSpace::docbook(Buffer const &, ostream & os,
 }
 
 
-int InsetSpace::textString(Buffer const & buf, ostream & os,
+int InsetSpace::textString(Buffer const & buf, odocstream & os,
                       OutputParams const & op) const
 {
        return plaintext(buf, os, op);
@@ -260,3 +264,6 @@ bool InsetSpace::isSpace() const
 {
        return true;
 }
+
+
+} // namespace lyx