* support/qstring_helpers.h: erase ucs4_to_qstring() method.

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

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 20c7808f9f8b45d098897fb9740c761f58df190a..cdad1946da1a67ad72db898a3e1afae4a4cc293c 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,9 @@ 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
@@ -69,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.
@@ -104,12 +111,6 @@ public:
        inline int center(char_type c) const {
                return (rbearing(c) - lbearing(c)) / 2;
        }
-
-       /// 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());
-       }
 };