#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
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();
}
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;
}
} 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);
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
} else {
// emulate smallcaps since X doesn't support this
unsigned int result = 0;
- static XChar2b c = {0, 0};
+ static XChar2b c;
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);
- }
+ }
}
return result;
}
::XSetFont(display, gc, getFontID(f));
}
+
+void lyxfont::rectText(string const & str, LyXFont const & font,
+ int & width, int & ascent, int & descent)
+{
+ static int const d = 2;
+ width = lyxfont::width(str, font) + d * 2 + 2;
+ ascent = lyxfont::maxAscent(font) + d;
+ descent = lyxfont::maxDescent(font) + d;
+}
+
+
+
+void lyxfont::buttonText(string const & str, LyXFont const & font,
+ int & width, int & ascent, int & descent)
+{
+ static int const d = 3;
+
+ width = lyxfont::width(str, font) + d * 2 + 2;
+ ascent = lyxfont::maxAscent(font) + d;
+ descent = lyxfont::maxDescent(font) + d;
+}
+
+
//} // end of namespace font
//} // end of namespace lyx