* src/frontends/qt4/GuiSelection.C

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

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index 0d62aed126ef45702c889fce0d6b8e4864927e31..89890c1ba005ff9e7c3b6dab00cb7c41158752ce 100644 (file)
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -38,10 +38,17 @@
  *               <-  width ->
  * --------------+----------+-------<maxDescent
  *
+ * Caution: All char_type and docstring arguments of any method of this class
+ * are no UCS4 chars or strings if the font is a symbol font. They simply
+ * denote the code points of the font instead. You have to keep this in mind
+ * when you implement the methods in a frontend. You must not pass these
+ * parameters to a unicode conversion function in particular.
  */
 
 namespace lyx {
 
+class Dimension;
+
 namespace frontend {
 
 class FontMetrics
@@ -53,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
@@ -65,6 +77,8 @@ public:
        virtual int width(char_type const * s, size_t n) 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.
@@ -98,13 +112,6 @@ public:
                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
        {