Fix bug 1749. CAUTION: lyx2lyx not fully working yet (see FIXMEs).

[lyx.git] / src / frontends / FontMetrics.h

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 829b5cec1f156230b89210de0c067835e6779782..04a6f7c7cf84d6292772f503b8729410458e535a 100644 (file)
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -47,6 +47,8 @@
 
 namespace lyx {
 
+class Dimension;
+
 namespace frontend {
 
 class FontMetrics
@@ -58,6 +60,11 @@ public:
        virtual int maxAscent() const = 0;
        /// return the maximum descent of the font
        virtual int maxDescent() const = 0;
+       /// return default dimension of the font.
+       /// \warning \c width is set to zero.
+       virtual Dimension const defaultDimension() const = 0;
+       /// return the width of the char in the font
+       virtual int width(char_type c) const = 0;
        /// return the ascent of the char in the font
        virtual int ascent(char_type c) const = 0;
        /// return the descent of the char in the font
@@ -67,9 +74,11 @@ public:
        /// return the right bearing of the char in the font
        virtual int rbearing(char_type c) const = 0;
        /// return the width of the string in the font
-       virtual int width(char_type const * s, size_t n) const = 0;
+       virtual int width(docstring const & s) const = 0;
        /// FIXME ??
        virtual int signedWidth(docstring const & s) const = 0;
+       /// return char dimension for the font.
+       virtual Dimension const dimension(char_type c) const = 0;
        /**
         * fill in width,ascent,descent with the values for the
         * given string in the font.
@@ -102,28 +111,15 @@ public:
        inline int center(char_type c) const {
                return (rbearing(c) - lbearing(c)) / 2;
        }
-
-       /// return the width of the char in the font
-       inline int width(char_type c) const
-       {
-               char_type tmp[2] = { c, L'\0'};
-               return width(tmp, 1);
-       }
-
-       /// return the width of the string in the font
-       inline int width(docstring const & s) const
-       {
-           return s.empty() ? 0 : width(s.data(), s.length());
-       }
 };
 
 
 } // namespace frontend
 
-class LyXFont;
+class Font;
 
-/// Implementation is in Application.C
-frontend::FontMetrics const & theFontMetrics(LyXFont const & f);
+/// Implementation is in Application.cpp
+frontend::FontMetrics const & theFontMetrics(Font const & f);
 
 } // namespace lyx