X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffont.C;h=f9bcb0ec805d438820f6b013f51266ac3675dbea;hb=98c966c64594611e469313314abd1e59524adb4a;hp=210d10bd60e61a0feccdbd16703736a1a6803b79;hpb=94c00c08a86bbe839d0d9f357a345c1f8250eafb;p=lyx.git

diff --git a/src/font.C b/src/font.C
index 210d10bd60..f9bcb0ec80 100644
--- a/src/font.C
+++ b/src/font.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -14,14 +14,16 @@
 #pragma implementation
 #endif
 
-#include <cctype>
-
+#include "support/lstrings.h"
 #include "font.h"
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
 #include "language.h"
 
+#include <boost/smart_ptr.hpp>
+
+
 namespace {
 
 inline
@@ -58,7 +60,7 @@ int lyxfont::ascent(char c, LyXFont const & f)
 	unsigned int uc = static_cast<unsigned char>(c);
 	if (finfo->per_char
 	    && uc >= finfo->min_char_or_byte2
-	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1) 
+	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1)
 		return finfo->per_char[uc - finfo->min_char_or_byte2].ascent;
 	else
 		return finfo->ascent;
@@ -71,7 +73,7 @@ int lyxfont::descent(char c, LyXFont const & f)
 	unsigned int uc = static_cast<unsigned char>(c);
 	if (finfo->per_char
 	    && uc >= finfo->min_char_or_byte2
-	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1) 
+	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1)
 		return finfo->per_char[uc - finfo->min_char_or_byte2].descent;
 	else
 		return finfo->descent;
@@ -84,7 +86,7 @@ int lyxfont::lbearing(char c, LyXFont const & f)
 	unsigned int uc = static_cast<unsigned char>(c);
 	if (finfo->per_char
 	    && uc >= finfo->min_char_or_byte2
-	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1) 
+	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1)
 		return finfo->per_char[uc - finfo->min_char_or_byte2].lbearing;
 	else
 		return 0;
@@ -97,7 +99,7 @@ int lyxfont::rbearing(char c, LyXFont const & f)
 	unsigned int uc = static_cast<unsigned char>(c);
 	if (finfo->per_char
 	    && uc >= finfo->min_char_or_byte2
-	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1) 
+	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1)
 		return finfo->per_char[uc - finfo->min_char_or_byte2].rbearing;
 	else
 		return width(c, f);
@@ -110,16 +112,13 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
 		return n;
 
 	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
-		XChar2b * xs = new XChar2b[n];
+		boost::scoped_array<XChar2b> xs(new XChar2b[n]);
 		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);
 			font.setShape(LyXFont::UP_SHAPE);
-			//font = &font2;
 #endif
 			encoding = encodings.symbol_encoding();
 		}
@@ -127,9 +126,8 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
 			Uchar c = encoding->ucs(s[i]);
 			xs[i].byte1 = c >> 8;
 			xs[i].byte2 = c & 0xff;
-                }
-		int result = width(xs, n, font);
-		delete[] xs;
+		}
+		int result = width(xs.get(), n, font);
 		return result;
 	}
 
@@ -138,14 +136,11 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
 	} else {
 		// emulate smallcaps since X doesn't support this
 		unsigned int result = 0;
-		char c;
 		LyXFont smallfont(f);
 		smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
 		for (size_t i = 0; i < n; ++i) {
-			c = s[i];
-			// when islower is a macro, the cast is needed (JMarc)
-			if (islower(static_cast<unsigned char>(c))) {
-				c = toupper(c);
+			char const c = uppercase(s[i]);
+			if (c != s[i]) {
 				result += ::XTextWidth(getXFontstruct(smallfont), &c, 1);
 			} else {
 				result += ::XTextWidth(getXFontstruct(f), &c, 1);
@@ -158,7 +153,8 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
 
 int lyxfont::signedWidth(string const & s, LyXFont const & f)
 {
-	if (s.empty()) return 0;
+	if (s.empty())
+		return 0;
 	if (s[0] == '-')
 		return -width(s.substr(1, s.length() - 1), f);
 	else
@@ -171,7 +167,7 @@ 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 {
@@ -181,8 +177,13 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
 		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);
+			if (s[i].byte1)
+				c = s[i];
+			else {
+				c.byte1 = s[i].byte1;
+				c.byte2 = uppercase(s[i].byte2);
+			}
+			if (c.byte2 != s[i].byte2) {
 				result += ::XTextWidth16(getXFontstruct(smallfont), &c, 1);
 			} else {
 				result += ::XTextWidth16(getXFontstruct(f), &s[i], 1);
@@ -204,7 +205,7 @@ int lyxfont::XTextWidth16(LyXFont const & f, XChar2b const * str, int count)
 }
 
 
-void lyxfont::XSetFont(Display * display, GC gc, LyXFont const & f) 
+void lyxfont::XSetFont(Display * display, GC gc, LyXFont const & f)
 {
 	::XSetFont(display, gc, getFontID(f));
 }
@@ -224,9 +225,11 @@ void lyxfont::rectText(string const & str, LyXFont const & font,
 void lyxfont::buttonText(string const & str, LyXFont const & font,
 		int & width, int & ascent, int & descent)
 {
-	width = lyxfont::width(str, font) + 8;
-	ascent = lyxfont::maxAscent(font) + 3;
-	descent = lyxfont::maxDescent(font) + 3;
+	static int const d = 3;
+
+	width = lyxfont::width(str, font) + d * 2 + 2;
+	ascent = lyxfont::maxAscent(font) + d;
+	descent = lyxfont::maxDescent(font) + d;
 }