whitespace changes;

[lyx.git] / src / font.C

diff --git a/src/font.C b/src/font.C
index 5a6f4fa74727db4355a430db335c316c46c65b67..c2cb085c084769d93be1a918cbe878d510987dc2 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -20,9 +20,11 @@
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
-// namespace {
-static inline
+namespace {
+
+inline
 XFontStruct * getXFontstruct(LyXFont const & f)
 {
        return fontloader.load(f.family(), f.series(),
@@ -30,12 +32,13 @@ XFontStruct * getXFontstruct(LyXFont const & f)
 }
 
 
-static inline
+inline
 XID getFontID(LyXFont const & f)
 {
        return getXFontstruct(f)->fid;
 }
-// } // end of anon namespace
+
+} // namespace anon
 
 int lyxfont::maxAscent(LyXFont const & f)
 {
@@ -111,7 +114,7 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
                Encoding const * encoding = f.language()->encoding();
                //LyXFont const * font = &f;
                LyXFont font(f);
-               if (f.family() == LyXFont::SYMBOL_FAMILY) {
+               if (f.isSymbolFont()) {
 #ifdef USE_UNICODE_FOR_SYMBOLS
                        //LyXFont font2 = f;
                        font.setFamily(LyXFont::ROMAN_FAMILY);
@@ -174,7 +177,7 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
        } else {
                // emulate smallcaps since X doesn't support this
                unsigned int result = 0;
-               static XChar2b c = {0, 0};
+               static XChar2b c;
                LyXFont smallfont(f);
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                for (int i = 0; i < n; ++i) {
@@ -183,7 +186,7 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
                                result += ::XTextWidth16(getXFontstruct(smallfont), &c, 1);
                        } else {
                                result += ::XTextWidth16(getXFontstruct(f), &s[i], 1);
-                       }
+               }
                }
                return result;
        }
@@ -206,5 +209,28 @@ void lyxfont::XSetFont(Display * display, GC gc, LyXFont const & f)
        ::XSetFont(display, gc, getFontID(f));
 }
 
+
+void lyxfont::rectText(string const & str, LyXFont const & font,
+             int & width, int & ascent, int & descent)
+{
+       static int const d = 2;
+       width = lyxfont::width(str, font) + d * 2 + 2;
+       ascent = lyxfont::maxAscent(font) + d;
+       descent = lyxfont::maxDescent(font) + d;
+}
+
+
+
+void lyxfont::buttonText(string const & str, LyXFont const & font,
+               int & width, int & ascent, int & descent)
+{
+       static int const d = 3;
+       
+       width = lyxfont::width(str, font) + d * 2 + 2;
+       ascent = lyxfont::maxAscent(font) + d;
+       descent = lyxfont::maxDescent(font) + d;
+}
+
+
 //} // end of namespace font
 //} // end of namespace lyx