update libtool

[lyx.git] / src / Painter.C

diff --git a/src/Painter.C b/src/Painter.C
index 94943ff9579a0a293bc8e9fd18a0fb9744eb0569..13eaa3a68af11b6a26e9590fba038e4068c0cb13 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright 1998-2000 The LyX Team
+ *         Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
 
@@ -32,6 +32,7 @@
 #include "ColorHandler.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
 #include "frontends/support/LyXImage.h"
 
@@ -283,14 +284,11 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
                XChar2b * xs = new XChar2b[ls];
                Encoding const * encoding = f.language()->encoding();
-               //LyXFont const * font = &f;
                LyXFont font(f);
                if (f.family() == LyXFont::SYMBOL_FAMILY) {
 #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();
                }
@@ -319,7 +317,7 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                char c;
                int tmpx = x;
-               for(size_t i = 0; i < ls; ++i) {
+               for (size_t i = 0; i < ls; ++i) {
                        c = s[i];
                        if (islower(static_cast<unsigned char>(c))) {
                                c = toupper(c);
@@ -359,7 +357,7 @@ PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                static XChar2b c = {0, 0};
                int tmpx = x;
-               for(int i = 0; i < ls; ++i) {
+               for (int i = 0; i < ls; ++i) {
                        if (s[i].byte1 == 0 && islower(s[i].byte2)) {
                                c.byte2 = toupper(s[i].byte2);
                                lyxfont::XSetFont(display, gc, smallfont);