small changes to ButtonController usage

[lyx.git] / src / font.C

diff --git a/src/font.C b/src/font.C
index 1590c72b551baede827d1d1305e2ba64df88966c..462241db9675eb7b1cb70853e239be2986f36f19 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -1,12 +1,25 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include <cctype>
 
 #include "font.h"
 #include "FontLoader.h"
 #include "lyxrc.h"
-
-extern LyXRC lyxrc;
+#include "encoding.h"
 
 // namespace {
 static inline
@@ -88,29 +101,34 @@ int lyxfont::rbearing(char c, LyXFont const & f)
 }
 
 
-int lyxfont::width(char c, LyXFont const & f)
-{
-       if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
-               return lyxrc.use_gui ? ::XTextWidth(getXFontstruct(f), &c, 1)
-                       : 1;
-       } else {
-               LyXFont smallfont(f);
-               smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
-               if (islower(static_cast<unsigned char>(c))) {
-                       c = toupper(c);
-                       return ::XTextWidth(getXFontstruct(smallfont), &c, 1);
-               } else {
-                       return ::XTextWidth(getXFontstruct(f), &c, 1);
-               }
-       }
-}
-
-
 int lyxfont::width(char const * s, int n, LyXFont const & f)
 {
        if (!lyxrc.use_gui)
                return n;
-       
+
+       if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
+               XChar2b * xs = new XChar2b[n];
+               Encoding const * encoding = f.language()->encoding();
+               LyXFont const * font = &f; 
+               if (f.family() == LyXFont::SYMBOL_FAMILY) {
+#ifdef USE_UNICODE_FOR_SYMBOLS
+                       LyXFont font2 = f;
+                       font2.setFamily(LyXFont::ROMAN_FAMILY);
+                       font2.setShape(LyXFont::UP_SHAPE);
+                       font = &font2;
+#endif
+                       encoding = &symbol_encoding;
+               }
+               for (int i = 0; i < n; ++i) {
+                       Uchar c = encoding->ucs(s[i]);
+                       xs[i].byte1 = c >> 8;
+                       xs[i].byte2 = c & 0xff;
+                }
+               int result = width(xs, n, *font);
+               delete[] xs;
+               return result;
+       }
+
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
                return ::XTextWidth(getXFontstruct(f), s, n);
        } else {
@@ -144,12 +162,43 @@ int lyxfont::signedWidth(string const & s, LyXFont const & f)
 }
 
 
+int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
+{
+       if (!lyxrc.use_gui)
+               return n;
+       
+       if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
+               return ::XTextWidth16(getXFontstruct(f), s, n);
+       } else {
+               // emulate smallcaps since X doesn't support this
+               unsigned int result = 0;
+               static XChar2b c = {0, 0};
+               LyXFont smallfont(f);
+               smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
+               for (int i = 0; i < n; ++i) {
+                       if (s[i].byte1 == 0 && islower(s[i].byte2)) {
+                               c.byte2 = toupper(s[i].byte2);
+                               result += ::XTextWidth16(getXFontstruct(smallfont), &c, 1);
+                       } else {
+                               result += ::XTextWidth16(getXFontstruct(f), &s[i], 1);
+                       }
+               }
+               return result;
+       }
+}
+
 int lyxfont::XTextWidth(LyXFont const & f, char * str, int count)
 {
        return ::XTextWidth(getXFontstruct(f), str, count);
 }
 
 
+int lyxfont::XTextWidth16(LyXFont const & f, XChar2b * str, int count)
+{
+       return ::XTextWidth16(getXFontstruct(f), str, count);
+}
+
+
 void lyxfont::XSetFont(Display * display, GC gc, LyXFont const & f) 
 {
        ::XSetFont(display, gc, getFontID(f));