X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainter.C;h=34f54f2a33bd6ec142fd8fcb9c005cd2b32f56ba;hb=f676dacf9c69d8c906653f54d00342c01de6facf;hp=94943ff9579a0a293bc8e9fd18a0fb9744eb0569;hpb=325dccab098a80c1d43ab76e9a928f937aa04fc4;p=lyx.git diff --git a/src/Painter.C b/src/Painter.C index 94943ff957..34f54f2a33 100644 --- a/src/Painter.C +++ b/src/Painter.C @@ -283,14 +283,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 +316,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(c))) { c = toupper(c); @@ -359,7 +356,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);