Extracted from r14281

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

diff --git a/src/frontends/font_metrics.h b/src/frontends/font_metrics.h
index 8b3fb4ad9ac9aa57822c9749d4441a7177093a02..4d4a79b83a6d9104c191755cccea50d6c30ae568 100644 (file)
--- a/src/frontends/font_metrics.h
+++ b/src/frontends/font_metrics.h
@@ -13,6 +13,8 @@
 #ifndef FONT_METRICS_H
 #define FONT_METRICS_H
 
+#include "support/types.h"
+
 #include <string>
 
 
@@ -46,24 +48,35 @@ namespace font_metrics {
        int maxAscent(LyXFont const & f);
        /// return the maximum descent of the font
        int maxDescent(LyXFont const & f);
+       /// return the maximum descent of the font
+       inline int maxHeight(LyXFont const & f) {
+               return maxAscent(f) + maxDescent(f);
+       }
        /// return the ascent of the char in the font
-       int ascent(char c, LyXFont const & f);
+       int ascent(lyx::char_type c, LyXFont const & f);
        /// return the descent of the char in the font
-       int descent(char c, LyXFont const & f);
+       int descent(lyx::char_type c, LyXFont const & f);
+       /// return the descent of the char in the font
+       inline int height(lyx::char_type c, LyXFont const & f) {
+               return ascent(c, f) + descent(c, f);
+       }
        /// return the left bearing of the char in the font
-       int lbearing(char c, LyXFont const & f);
+       int lbearing(lyx::char_type c, LyXFont const & f);
        /// return the right bearing of the char in the font
-       int rbearing(char c, LyXFont const & f);
+       int rbearing(lyx::char_type c, LyXFont const & f);
+       /// return the inner width of the char in the font
+       inline int center(lyx::char_type c, LyXFont const & f) {
+               return (rbearing(c, f) - lbearing(c, f)) / 2;
+       }
        /// return the width of the string in the font
        int width(char const * s, size_t n, LyXFont const & f);
        /// return the width of the char in the font
-       inline int width(char c, LyXFont const & f) {
+       inline int width(lyx::char_type c, LyXFont const & f) {
                return width(&c, 1, f);
        }
        /// return the width of the string in the font
        inline int width(std::string const & s, LyXFont const & f) {
-               if (s.empty()) return 0;
-               return width(s.data(), s.length(), f);
+               return s.empty() ? 0 : width(s.data(), s.length(), f);
        }
        /// FIXME ??
        int signedWidth(std::string const & s, LyXFont const & f);