X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffont.C;h=f022b22c41eedb25c4ab4e8848368759466b7b51;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=076f16d7b26507ae8ef73e829291de89c974bd8b;hpb=d6665cba427b04ae37f42c846398cad518d2be0f;p=lyx.git

diff --git a/src/font.C b/src/font.C
index 076f16d7b2..f022b22c41 100644
--- a/src/font.C
+++ b/src/font.C
@@ -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)
 {
@@ -55,7 +58,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) 
+	    && 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;
@@ -68,7 +71,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) 
+	    && 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;
@@ -81,7 +84,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) 
+	    && uc <= finfo->max_char_or_byte2+256*finfo->max_byte1) 
 		return finfo->per_char[uc - finfo->min_char_or_byte2].lbearing;
 	else
 		return 0;
@@ -94,14 +97,14 @@ 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) 
+	    && 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);
 }
 
 
-int lyxfont::width(char const * s, int n, LyXFont const & f)
+int lyxfont::width(char const * s, size_t n, LyXFont const & f)
 {
 	if (!lyxrc.use_gui)
 		return n;
@@ -109,22 +112,23 @@ int lyxfont::width(char const * s, int n, LyXFont const & f)
 	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
 		XChar2b * xs = new XChar2b[n];
 		Encoding const * encoding = f.language()->encoding();
-		LyXFont const * font = &f; 
+		//LyXFont const * font = &f;
+		LyXFont 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;
+			//LyXFont font2 = f;
+			font.setFamily(LyXFont::ROMAN_FAMILY);
+			font.setShape(LyXFont::UP_SHAPE);
+			//font = &font2;
 #endif
-			encoding = &symbol_encoding;
+			encoding = encodings.symbol_encoding();
 		}
-		for (int i = 0; i < n; ++i) {
+		for (size_t 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);
+		int result = width(xs, n, font);
 		delete[] xs;
 		return result;
 	}
@@ -137,7 +141,7 @@ int lyxfont::width(char const * s, int n, LyXFont const & f)
 		char c;
 		LyXFont smallfont(f);
 		smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
-		for (int i = 0; i < n; ++i) {
+		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))) {