anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge the unicode branch into trunk.

Browse Source 
- src/support/unicode.[Ch]: new files with functions for converting
  to and fro ucs4, ucs2 and utf8.
- src/support/docstring.h: specialization of basic_string that
  holds a uint32_t internally.
- Several functions changed to use char_type instead of char or unsigned char.
- Qt3 and Qt4 sends ucs2 on to core
- Gtk sends ucs4 on to core
- Read and write utf-8 .lyx files.
- font_metrics and painter updated to handle ucs4 chars as input.
- Quite a bit of ugly compability code, conversion string->docstring, etc.
- Have fun...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14661 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2006-08-13 22:54:59 +00:00
parent f0648e2320
commit c46b7d8955
68 changed files with 1115 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferView_pimpl.C
View File

@ -619,7 +619,7 @@ bool BufferView::Pimpl::update(Update::flags flags)
bool const need_second_step =
(flags & (Update::Force | Update::FitCursor | Update::MultiParSel))
&& (fitCursor() || multiParSel());
return need_second_step;
}

9
src/frontends/LyXKeySym.h
View File

@ -40,17 +40,16 @@ public:
virtual bool isModifier() const = 0;
/// Is this normal insertable text ? (last ditch attempt only)
virtual bool isText() const { return false; }
virtual bool isText() const = 0;
/// What is the symbolic name of this key? F.ex. "Return" or "c"
virtual std::string getSymbolName() const = 0;
/**
* Return the value of the keysym into the local ISO encoding.
* This converts the LyXKeySym to a 8-bit encoded character.
* This relies on user to use the right encoding.
* Return the value of the keysym into the UCS-4 encoding.
* This converts the LyXKeySym to a 32-bit encoded character.
*/
virtual char getISOEncoded(std::string const & encoding) const = 0;
virtual size_t getUCSEncoded() const = 0;
/**
* Return a string describing the KeySym with modifier mod.

6
src/frontends/Painter.C
View File

@ -17,6 +17,8 @@
#include "LColor.h"
#include "lyxfont.h"
using lyx::docstring;
using std::max;
using std::string;
@ -48,7 +50,7 @@ void Painter::buttonFrame(int x, int y, int w, int h)
void Painter::rectText(int x, int y,
string const & str,
docstring const & str,
LyXFont const & font,
LColor_color back,
LColor_color frame)
@ -70,7 +72,7 @@ void Painter::rectText(int x, int y,
}
void Painter::buttonText(int x, int y, string const & str, LyXFont const & font)
void Painter::buttonText(int x, int y, docstring const & str, LyXFont const & font)
{
int width;
int ascent;

8
src/frontends/Painter.h
View File

@ -135,14 +135,14 @@ public:
/// draw a string at position x, y (y is the baseline)
virtual void text(int x, int y,
std::string const & str, LyXFont const & f) = 0;
lyx::docstring const & str, LyXFont const & f) = 0;
/**
* Draw a string at position x, y (y is the baseline)
* This is just for fast drawing
*/
virtual void text(int x, int y,
char const * str, size_t l,
lyx::char_type const * str, size_t l,
LyXFont const & f) = 0;
/// draw a char at position x, y (y is the baseline)
@ -156,14 +156,14 @@ public:
* around the text with the given color.
*/
virtual void rectText(int x, int baseline,
std::string const & str,
lyx::docstring const & str,
LyXFont const & font,
LColor_color back,
LColor_color frame);
/// draw a string and enclose it inside a button frame
virtual void buttonText(int x,
int baseline, std::string const & s,
int baseline, lyx::docstring const & s,
LyXFont const & font);
protected:

4
src/frontends/WorkArea.C
View File

@ -269,7 +269,9 @@ void WorkArea::greyOut()
x += 260;
y += 265;
getPainter().text(x, y, splash.text(), splash.font());
string stext = splash.text();
docstring dstext(stext.begin(), stext.end());
getPainter().text(x, y, dstext, splash.font());
}
expose(0, 0, width(), height());
getPainter().end();

22
src/frontends/font_metrics.h
View File

@ -57,7 +57,8 @@ namespace font_metrics {
/// return the descent of the char in the font
int descent(lyx::char_type c, LyXFont const & f);
/// return the descent of the char in the font
inline int height(lyx::char_type c, LyXFont const & f) {
inline int height(lyx::char_type c, LyXFont const & f)
{
return ascent(c, f) + descent(c, f);
}
/// return the left bearing of the char in the font
@ -69,22 +70,25 @@ namespace font_metrics {
return (rbearing(c, f) - lbearing(c, f)) / 2;
}
/// return the width of the string in the font
int width(char const * s, size_t n, LyXFont const & f);
int width(lyx::char_type const * s, size_t n, LyXFont const & f);
/// return the width of the char in the font
inline int width(lyx::char_type c, LyXFont const & f) {
return width(&c, 1, f);
inline int width(lyx::char_type c, LyXFont const & f)
{
lyx::char_type tmp[2] = { c, L'\0'};
return width(tmp, 1, f);
}
/// return the width of the string in the font
inline int width(std::string const & s, LyXFont const & f) {
return s.empty() ? 0 : width(s.data(), s.length(), f);
inline int width(lyx::docstring const & s, LyXFont const & f)
{
return s.empty() ? 0 : width(s.data(), s.length(), f);
}
/// FIXME ??
int signedWidth(std::string const & s, LyXFont const & f);
int signedWidth(lyx::docstring const & s, LyXFont const & f);
/**
* fill in width,ascent,descent with the values for the
* given string in the font.
*/
void rectText(std::string const & str, LyXFont const & font,
void rectText(lyx::docstring const & str, LyXFont const & font,
int & width,
int & ascent,
int & descent);
@ -92,7 +96,7 @@ namespace font_metrics {
* fill in width,ascent,descent with the values for the
* given string in the font for a button.
*/
void buttonText(std::string const & str, LyXFont const & font,
void buttonText(lyx::docstring const & str, LyXFont const & font,
int & width,
int & ascent,
int & descent);

37
src/frontends/gtk/GLyXKeySym.C
View File

@ -71,36 +71,9 @@ string GLyXKeySym::getSymbolName() const
}
char GLyXKeySym::getISOEncoded(string const & /*encoding*/) const
size_t GLyXKeySym::getUCSEncoded() const
{
if (keyval_ == GDK_VoidSymbol)
return 0;
unsigned int c = keyval_;
switch (c & 0x0000FF00) {
// latin 1 byte 3 = 0
case 0x00000000: break;
// latin 2 byte 3 = 1
case 0x00000100:
// latin 3 byte 3 = 2
case 0x00000200:
// latin 4 byte 3 = 3
case 0x00000300:
// cyrillic KOI8 & Co
case 0x00000600:
// greek
case 0x00000700:
// latin 8 byte 3 = 18 (0x12)
case 0x00001200:
// latin 9 byte 3 = 19 (0x13)
case 0x00001300:
c &= 0x000000FF;
break;
default:
c = 0;
}
return c;
return gdk_keyval_to_unicode(keyval_);
}
@ -128,6 +101,12 @@ string const GLyXKeySym::print(key_modifier::state mod) const
}
bool GLyXKeySym::isText() const
{
return getUCSEncoded() != 0;
}
bool operator==(LyXKeySym const & k1, LyXKeySym const & k2)
{
return static_cast<GLyXKeySym const &>(k1).getKeyval()

3
src/frontends/gtk/GLyXKeySym.h
View File

@ -24,8 +24,9 @@ public:
virtual ~GLyXKeySym() {}
virtual bool isOK() const;
virtual bool isModifier() const;
virtual bool isText() const;
virtual std::string getSymbolName() const;
virtual char getISOEncoded(std::string const & encoding) const;
virtual size_t getUCSEncoded() const;
virtual std::string const print(key_modifier::state mod) const;
private:
unsigned int keyval_;

51
src/frontends/gtk/GPainter.C
View File

@ -43,13 +43,6 @@
using std::string;
namespace font_metrics {
int width(wchar_t const * s, size_t n, LyXFont const & f);
} // namespace font_metrics
namespace lyx {
namespace frontend {
@ -192,6 +185,7 @@ void GPainter::image(int x, int y, int w, int h,
Gdk::RGB_DITHER_NONE, 0, 0);
}
namespace {
inline XftFont * getXftFont(LyXFont const & f)
{
@ -199,34 +193,47 @@ inline XftFont * getXftFont(LyXFont const & f)
f.realShape(), f.size());
}
} // anon namespace
// ENCODING: we assume we've got 8-bit string in whatever format Xft
// wants. We should be finding out what the backend's giving us and
// then converting it before feeding it to Xft using XftDrawStringUtf8
void GPainter::text(int x, int y, char const * s, size_t ls, LyXFont const & f)
void GPainter::text(int x, int y,
char_type const * s, size_t ls,
LyXFont const & f)
{
XftFont * font = getXftFont(f);
XftColor * xftClr = owner_.getColorHandler().
getXftColor(f.realColor());
XftDraw * draw = owner_.getXftDraw();
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
XftDrawString8(draw, xftClr, font, x, y,
reinterpret_cast<XftChar8 *>(const_cast<char *>(s)), ls);
XftDrawString32(draw,
xftClr,
font,
x, y,
reinterpret_cast<FcChar32 const *>(s),
ls);
} else {
LyXFont smallfont(f);
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
XftFont * fontS = getXftFont(smallfont);
char c;
int tmpx = x;
for (unsigned int i = 0; i < ls; ++i) {
c = lyx::support::uppercase(s[i]);
// Ok, this looks quite ugly...
char_type c = gdk_keyval_to_unicode(gdk_keyval_to_upper(gdk_unicode_to_keyval(s[i])));
if (c != s[i]) {
XftDrawString8(draw, xftClr, fontS, tmpx, y,
reinterpret_cast<XftChar8 *>(const_cast<char *>(&c)), 1);
XftDrawString32(draw,
xftClr,
fontS,
tmpx, y,
reinterpret_cast<FcChar32 *>(&c),
1);
tmpx += font_metrics::width(c, smallfont);
} else {
XftDrawString8(draw, xftClr, font, tmpx, y,
reinterpret_cast<XftChar8 *>(const_cast<char *>(&c)), 1);
XftDrawString32(draw,
xftClr,
font,
tmpx, y,
reinterpret_cast<FcChar32 *>(&c),
1);
tmpx += font_metrics::width(c, f);
}
}
@ -236,13 +243,13 @@ void GPainter::text(int x, int y, char const * s, size_t ls, LyXFont const & f)
}
void GPainter::text(int x, int y, std::string const & s, LyXFont const & f)
void GPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
text (x, y, s.c_str(), s.size(), f);
text (x, y, reinterpret_cast<char_type const *>(s.data()), s.size(), f);
}
void GPainter::text(int x, int y, char c, LyXFont const & f)
void GPainter::text(int x, int y, char_type c, LyXFont const & f)
{
text (x, y, &c, 1, f);
}

6
src/frontends/gtk/GPainter.h
View File

@ -98,16 +98,16 @@ public:
/// draw a string at position x, y (y is the baseline)
virtual void text(int x, int y,
std::string const & str, LyXFont const & f);
lyx::docstring const & str, LyXFont const & f);
/// draw a string at position x, y (y is the baseline)
virtual void text(int x, int y,
char const * str, size_t l,
lyx::char_type const * str, size_t l,
LyXFont const & f);
/// draw a char at position x, y (y is the baseline)
virtual void text(int x, int y,
char c, LyXFont const & f);
lyx::char_type c, LyXFont const & f);
void start();

22
src/frontends/gtk/GWorkArea.C
View File

@ -475,20 +475,20 @@ void GWorkArea::inputCommit(gchar * str)
bool GWorkArea::onKeyPress(GdkEventKey * event)
{
#ifdef I18N
inputCache_ = "";
bool inputGet = gtk_im_context_filter_keypress(imContext_, event);
// cope with ascii
if ((inputGet && inputCache_.size() == 1 && inputCache_[0] < 128) ||
!inputGet) {
#endif
// #ifdef I18N
// inputCache_ = "";
// bool inputGet = gtk_im_context_filter_keypress(imContext_, event);
// // cope with ascii
// if ((inputGet && inputCache_.size() == 1 && inputCache_[0] < 128) ||
// !inputGet) {
// #endif
GLyXKeySym *glk = new GLyXKeySym(event->keyval);
view_.workArea()->processKeySym(LyXKeySymPtr(glk),
gtkKeyState(event->state));
#ifdef I18N
} else if (!inputCache_.empty())
workAreaCJK_IMprocess(inputCache_.size(), inputCache_.data());
#endif
// #ifdef I18N
// } else if (!inputCache_.empty())
// workAreaCJK_IMprocess(inputCache_.size(), inputCache_.data());
// #endif
return true;
}

68
src/frontends/gtk/xftFontMetrics.C
View File

@ -34,6 +34,9 @@
#include <algorithm>
using lyx::char_type;
using lyx::docstring;
using std::string;
@ -79,78 +82,78 @@ inline int XGlyphLogWidth(XGlyphInfo const & info)
} // namespace anon
namespace font_metrics {
int maxAscent(LyXFont const & f)
int font_metrics::maxAscent(LyXFont const & f)
{
XftFont * font = getXftFont(f);
return font->ascent;
}
int maxDescent(LyXFont const & f)
int font_metrics::maxDescent(LyXFont const & f)
{
XftFont * font = getXftFont(f);
return font->descent;
}
int ascent(char c,LyXFont const & f)
int font_metrics::ascent(char_type c,LyXFont const & f)
{
XftFont * font = getXftFont(f);
XGlyphInfo glyph;
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(), font,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
return XGlyphAscent(glyph);
}
int descent(char c,LyXFont const & f)
int font_metrics::descent(char_type c,LyXFont const & f)
{
XftFont * font = getXftFont(f);
XGlyphInfo glyph;
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(), font,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
return XGlyphDescent(glyph);
}
int lbearing(char c,LyXFont const & f)
int font_metrics::lbearing(char_type c,LyXFont const & f)
{
XftFont * font = getXftFont(f);
XGlyphInfo glyph;
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(), font,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
return XGlyphLbearing(glyph);
}
int rbearing(char c,LyXFont const & f)
int font_metrics::rbearing(char_type c,LyXFont const & f)
{
XftFont * font = getXftFont(f);
XGlyphInfo glyph;
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(), font,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
return XGlyphRbearing(glyph);
}
int width(char const * s, size_t n, LyXFont const & f)
int font_metrics::width(char_type const * s, size_t n, LyXFont const & f)
{
XftFont * font = getXftFont(f);
XGlyphInfo glyph;
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE){
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(const_cast<char *>(s)), n, &glyph);
XftTextExtents32(getDisplay(),
font,
reinterpret_cast<FcChar32 const *>(s),
n,
&glyph);
return XGlyphLogWidth(glyph);
} else {
int result = 0;
@ -158,16 +161,18 @@ int width(char const * s, size_t n, LyXFont const & f)
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
XftFont * fontS = getXftFont(smallfont);
for (size_t i = 0; i < n; ++i) {
char c = lyx::support::uppercase(s[i]);
char_type c = lyx::support::uppercase(s[i]);
if (c != s[i]) {
XftTextExtents8(getDisplay(), fontS,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(),
fontS,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
result += XGlyphLogWidth(glyph);
} else {
XftTextExtents8(getDisplay(), font,
reinterpret_cast<XftChar8 *>(&c),
XftTextExtents32(getDisplay(),
font,
reinterpret_cast<FcChar32 *>(&c),
1,
&glyph);
result += XGlyphLogWidth(glyph);
@ -178,18 +183,18 @@ int width(char const * s, size_t n, LyXFont const & f)
}
int signedWidth(string const & s, LyXFont const & f)
int font_metrics::signedWidth(docstring const & s, LyXFont const & f)
{
if (s.empty())
return 0;
if (s[0] == '-')
return width(s.c_str() + 1, s.size() - 1, f);
return width(s.substr(1, s.length() - 1), f);
else
return width(s.c_str(), s.size(), f);
return width(s, f);
}
void rectText(string const & str, LyXFont const & font,
void font_metrics::rectText(docstring const & str, LyXFont const & font,
int & width,
int & ascent,
int & descent)
@ -201,7 +206,7 @@ void rectText(string const & str, LyXFont const & font,
}
void buttonText(string const & str, LyXFont const & font,
void font_metrics::buttonText(docstring const & str, LyXFont const & font,
int & width,
int & ascent,
int & descent)
@ -212,6 +217,3 @@ void buttonText(string const & str, LyXFont const & font,
ascent = font_metrics::maxAscent(font) + d;
descent = font_metrics::maxDescent(font) + d;
}
} // namespace font_metrics

12
src/frontends/nullpainter.h
View File

@ -57,16 +57,18 @@ public:
///
void image(int, int, int, int, lyx::graphics::Image const &) {}
///
void text(int, int, std::string const &, LyXFont const &) {}
void text(int, int, lyx::docstring const &, LyXFont const &) {}
// ///
// void text(int, int, char const *, size_t, LyXFont const &) {}
///
void text(int, int, char const *, size_t, LyXFont const &) {}
void text(int, int, lyx::char_type const *, size_t, LyXFont const &) {}
///
void text(int, int, char, LyXFont const &) {}
void text(int, int, lyx::char_type, LyXFont const &) {}
///
void rectText(int, int, std::string const &,
void rectText(int, int, lyx::docstring const &,
LyXFont const &, LColor_color, LColor_color) {}
///
void buttonText(int, int, std::string const &, LyXFont const &) {}
void buttonText(int, int, lyx::docstring const &, LyXFont const &) {}
///
void underline(LyXFont const &, int, int, int) {}
///

27
src/frontends/qt3/QLPainter.C
View File

@ -21,6 +21,8 @@
#include "language.h"
#include "LColor.h"
#include "support/unicode.h"
#include "frontends/font_metrics.h"
#include <qpainter.h>
@ -157,15 +159,16 @@ void QLPainter::image(int x, int y, int w, int h,
}
void QLPainter::text(int x, int y, string const & s, LyXFont const & f)
void QLPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
return text(x, y, s.data(), s.length(), f);
lyxerr << "Drawing string" << endl;
return text(x, y, reinterpret_cast<lyx::char_type const *>(s.data()), s.length(), f);
}
void QLPainter::text(int x, int y, lyx::char_type c, LyXFont const & f)
{
char s[2] = { c, '\0' };
char_type s[2] = { c, L'\0' };
return text(x, y, s, 1, f);
}
@ -199,23 +202,38 @@ void QLPainter::smallCapsText(int x, int y,
}
void QLPainter::text(int x, int y, char const * s, size_t ls,
void QLPainter::text(int x, int y, lyx::char_type const * s, size_t ls,
LyXFont const & f)
{
lyxerr << "Drawing lyx::char_type const * s" << endl;
setPen(f.realColor());
#if 0
Encoding const * encoding = f.language()->encoding();
if (f.isSymbolFont())
encoding = encodings.symbol_encoding();
#endif
#if 0
QString str;
str.setLength(ls);
for (size_t i = 0; i < ls; ++i)
// Brain-dead MSVC wants at(i) rather than operator[]
str.at(i) = QChar(encoding->ucs(s[i]));
#else
//std::vector<boost::uint32_t> in(s, s + ls);
//std::vector<unsigned short> ucs2 = ucs4_to_ucs2(in);
std::vector<unsigned short> ucs2 = ucs4_to_ucs2(s, ls);
ucs2.push_back(0);
QString str = QString::fromUcs2(&ucs2[0]);
#endif
#if 0
// HACK: QT3 refuses to show single compose characters
if (ls == 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
str = ' ' + str;
#endif
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
qp_->setFont(fontloader.get(f));
@ -233,4 +251,3 @@ void QLPainter::text(int x, int y, char const * s, size_t ls,
} // namespace frontend
} // namespace lyx

8
src/frontends/qt3/QLPainter.h
View File

@ -99,18 +99,18 @@ public:
/// draw a string at position x, y (y is the baseline)
virtual void text(int x, int y,
std::string const & str, LyXFont const & f);
lyx::docstring const & str, LyXFont const & f);
/** Draw a string at position x, y (y is the baseline)
* This is just for fast drawing
*/
virtual void text(int x, int y,
char const * str, size_t l,
LyXFont const & f);
lyx::char_type const * str, size_t l,
LyXFont const & f);
/// draw a char at position x, y (y is the baseline)
virtual void text(int x, int y,
char c, LyXFont const & f);
lyx::char_type c, LyXFont const & f);
private:
/// draw small caps text
void smallCapsText(int x, int y,

35
src/frontends/qt3/QLyXKeySym.C
View File

@ -24,6 +24,7 @@
#include <map>
#include "support/lstrings.h"
#include "support/environment.h"
#include "support/unicode.h"
#include "encoding.h"
#include "language.h"
@ -75,6 +76,7 @@ char const encode(string const & encoding, QString const & str)
void initEncodings()
{
#if 0
//const char * c = QTextCodec::locale();
//string s = c ? c : "";
// In this order, see support/filetools.C
@ -131,7 +133,7 @@ void initEncodings()
encoding_map[""] = defaultCodec;
QTextCodec::setCodecForCStrings(defaultCodec);
#endif
}
@ -152,7 +154,10 @@ void QLyXKeySym::set(QKeyEvent * ev)
}
text_ = ev->text();
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "Setting key to " << key_ << ", " << fromqstr(text_) << endl;
lyxerr[Debug::KEY] << "Setting key to "
<< key_ << ", "
<< text_.utf8()
<< endl;
}
@ -195,14 +200,20 @@ string QLyXKeySym::getSymbolName() const
}
char QLyXKeySym::getISOEncoded(string const & encoding) const
size_t QLyXKeySym::getUCSEncoded() const
{
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "encoding is " << encoding << endl;
unsigned char const c = encode(encoding, text_);
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "ISOEncoded returning value " << int(c) << endl;
return c;
unsigned short const * ptr = text_.ucs2();
std::vector<unsigned short> tmp(ptr, ptr + text_.length());
//lyxerr << "Data is " << tmp << endl;
//lyxerr << "Length is " << text_.length() << endl;
if (text_.isEmpty())
return 0;
//size_t res = utf8_to_ucs4(tmp, tmp.length());
//lyxerr << "Res is " << res << endl;
return ucs2_to_ucs4(tmp)[0];
}
@ -235,11 +246,7 @@ bool QLyXKeySym::isText() const
return false;
}
QChar const c(text_[0]);
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "isText for key " << key_
<< " isPrint is " << c.isPrint() << endl;
return c.isPrint();
return true;
}

7
src/frontends/qt3/QLyXKeySym.h
View File

@ -49,11 +49,10 @@ public:
virtual bool isText() const;
/**
* Return the value of the keysym into the local ISO encoding.
* This converts the LyXKeySym to a 8-bit encoded character.
* This relies on user to use the right encoding.
* Return the value of the keysym into the UCS-4 encoding.
* This converts the LyXKeySym to a 32-bit encoded character.
*/
virtual char getISOEncoded(std::string const & encoding) const;
virtual size_t getUCSEncoded() const;
/// Return a human-readable version of a key+modifier pair.
virtual std::string const print(key_modifier::state mod) const;

2
src/frontends/qt3/QWorkArea.C
View File

@ -55,7 +55,7 @@ namespace lyx {
namespace frontend {
QWorkArea::QWorkArea(LyXView & owner, int, int)
: QWidget(qApp->mainWidget()), owner_(owner), painter_(*this)
: QWidget(qApp->mainWidget()), owner_(owner), painter_(*this)
{
scrollbar_ = new QScrollBar(QScrollBar::Vertical, this);
content_ = new QContentPane(this);

207
src/frontends/qt3/qfont_metrics.C
View File

@ -18,92 +18,17 @@
#include "language.h"
#include "support/unicode.h"
using lyx::char_type;
using lyx::docstring;
using std::string;
namespace font_metrics {
namespace {
int maxAscent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return fontloader.metrics(f).ascent();
}
int maxDescent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
// We add 1 as the value returned by QT is different than X
// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
return fontloader.metrics(f).descent() + 1;
}
int ascent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = fontloader.metrics(f).boundingRect(c);
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return -r.top() - r.height();
#else
return -r.top();
#endif
}
int descent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = fontloader.metrics(f).boundingRect(c);
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return r.bottom() + r.height() + 1;
#else
return r.bottom() + 1;
#endif
}
int lbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return fontloader.metrics(f).leftBearing(c);
}
int rbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QFontMetrics const & m = fontloader.metrics(f);
// Qt rbearing is from the right edge of the char's width().
return m.width(c) - m.rightBearing(c);
}
Encoding const * fontencoding(LyXFont const & f)
{
Encoding const * encoding = f.language()->encoding();
if (f.isSymbolFont())
encoding = encodings.symbol_encoding();
return encoding;
}
int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
int smallcapswidth(unsigned short const * s, size_t ls, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
@ -115,12 +40,10 @@ int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
QFontMetrics const & qm = fontloader.metrics(f);
QFontMetrics const & qsmallm = fontloader.metrics(smallfont);
Encoding const * encoding = fontencoding(f);
int w = 0;
for (size_t i = 0; i < ls; ++i) {
QChar const c = QChar(encoding->ucs(s[i]));
QChar const c = s[i];
QChar const uc = c.upper();
if (c != uc)
w += qsmallm.width(uc);
@ -131,57 +54,133 @@ int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
}
int width(char const * s, size_t ls, LyXFont const & f)
} // anon namespace
int font_metrics::maxAscent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return fontloader.metrics(f).ascent();
}
int font_metrics::maxDescent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
// We add 1 as the value returned by QT is different than X
// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
return fontloader.metrics(f).descent() + 1;
}
int font_metrics::ascent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = fontloader.metrics(f).boundingRect(ucs4_to_ucs2(c));
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return -r.top() - r.height();
#else
return -r.top();
#endif
}
int font_metrics::descent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = fontloader.metrics(f).boundingRect(ucs4_to_ucs2(c));
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return r.bottom() + r.height() + 1;
#else
return r.bottom() + 1;
#endif
}
int font_metrics::lbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return fontloader.metrics(f).leftBearing(ucs4_to_ucs2(c));
}
int font_metrics::rbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QFontMetrics const & m = fontloader.metrics(f);
// Qt rbearing is from the right edge of the char's width().
unsigned short sc = ucs4_to_ucs2(c);
return m.width(sc) - m.rightBearing(sc);
}
int font_metrics::width(lyx::char_type const * str, size_t const ls, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return ls;
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE)
return smallcapswidth(s, ls, f);
std::vector<unsigned short> ucs2 = ucs4_to_ucs2(str, ls);
ucs2.push_back(0);
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE)
return smallcapswidth(&ucs2[0], ls, f);
Encoding const * encoding = fontencoding(f);
QLFontInfo & fi = fontloader.fontinfo(f);
if (ls == 1)
return fi.width(encoding->ucs(s[0]));
return fi.width(ucs2[0]);
int w = 0;
for (size_t i = 0; i < ls; ++i)
w += fi.width(encoding->ucs(s[i]));
w += fi.width(ucs2[i]);
return w;
}
int signedWidth(string const & s, LyXFont const & f)
{
if (s[0] == '-')
return -width(s.substr(1, s.length() - 1), f);
else
return width(s, f);
}
void rectText(string const & str, LyXFont const & f,
void font_metrics::rectText(docstring const & str, LyXFont const & f,
int & w, int & ascent, int & descent)
{
QFontMetrics const & m = fontloader.metrics(f);
static int const d = 2;
w = width(str, f) + d * 2 + 2;
w = font_metrics::width(str, f) + d * 2 + 2;
ascent = m.ascent() + d;
descent = m.descent() + d;
}
void buttonText(string const & str, LyXFont const & f,
void font_metrics::buttonText(docstring const & str, LyXFont const & f,
int & w, int & ascent, int & descent)
{
QFontMetrics const & m = fontloader.metrics(f);
static int const d = 3;
w = width(str, f) + d * 2 + 2;
w = font_metrics::width(str, f) + d * 2 + 2;
ascent = m.ascent() + d;
descent = m.descent() + d;
}
} // namespace font_metrics
int font_metrics::signedWidth(docstring const & s, LyXFont const & f)
{
if (s[0] == '-')
return -font_metrics::width(s.substr(1, s.length() - 1), f);
else
return font_metrics::width(s, f);
}

2
src/frontends/qt4/GuiWorkArea.C
View File

@ -339,7 +339,7 @@ void GuiWorkArea::wheelEvent(QWheelEvent * e)
void GuiWorkArea::generateSyntheticMouseEvent()
{
// Set things off to generate the _next_ 'pseudo' event.
// Set things off to generate the _next_ 'pseudo' event.
if (synthetic_mouse_event_.restart_timeout)
synthetic_mouse_event_.timeout.start();

29
src/frontends/qt4/QLPainter.C
View File

@ -26,11 +26,16 @@
#include "frontends/font_metrics.h"
#include "support/unicode.h"
#include <QPainter>
#include <QPicture>
#include <QPixmap>
#include <QImage>
using lyx::char_type;
using lyx::docstring;
using std::endl;
using std::string;
@ -52,7 +57,7 @@ void QLPainter::start()
{
qp_.reset(new QPainter(qwa_->paintDevice()));
// new QPainter has default QPen:
current_color_ = LColor::black;
current_color_ = LColor::black;
current_ls_ = line_solid;
current_lw_ = line_thin;
}
@ -177,15 +182,15 @@ void QLPainter::image(int x, int y, int w, int h,
}
void QLPainter::text(int x, int y, string const & s, LyXFont const & f)
void QLPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
return text(x, y, s.data(), s.length(), f);
return text(x, y, reinterpret_cast<char_type const *>(s.data()), s.length(), f);
}
void QLPainter::text(int x, int y, char c, LyXFont const & f)
void QLPainter::text(int x, int y, char_type c, LyXFont const & f)
{
char s[2] = { c, '\0' };
char_type s[2] = { c, char_type('\0') };
return text(x, y, s, 1, f);
}
@ -219,22 +224,34 @@ void QLPainter::smallCapsText(int x, int y,
}
void QLPainter::text(int x, int y, char const * s, size_t ls,
void QLPainter::text(int x, int y, char_type const * s, size_t ls,
LyXFont const & f)
{
#if 0
Encoding const * encoding = f.language()->encoding();
if (f.isSymbolFont())
encoding = encodings.symbol_encoding();
#endif
#if 0
QString str;
str.setLength(ls);
for (unsigned int i = 0; i < ls; ++i)
str[i] = QChar(encoding->ucs(s[i]));
#else
//std::vector<boost::uint32_t> in(s, s + ls);
//std::vector<unsigned short> ucs2 = ucs4_to_ucs2(in);
std::vector<unsigned short> ucs2 = ucs4_to_ucs2(s, ls);
ucs2.push_back(0);
QString str = QString::fromUcs2(&ucs2[0]);
#endif
#if 0
// HACK: QT3 refuses to show single compose characters
// Still needed with Qt4?
if (ls == 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
str = ' ' + str;
#endif
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
setQPainterPen(f.realColor());

6
src/frontends/qt4/QLPainter.h
View File

@ -104,18 +104,18 @@ public:
/// draw a string at position x, y (y is the baseline)
virtual void text(int x, int y,
std::string const & str, LyXFont const & f);
lyx::docstring const & str, LyXFont const & f);
/** Draw a string at position x, y (y is the baseline)
* This is just for fast drawing
*/
virtual void text(int x, int y,
char const * str, size_t l,
lyx::char_type const * str, size_t l,
LyXFont const & f);
/// draw a char at position x, y (y is the baseline)
virtual void text(int x, int y,
char c, LyXFont const & f);
lyx::char_type c, LyXFont const & f);
/// draw a pixmap from the image cache
virtual void drawPixmap(int x, int y, QPixmap const & pixmap);

31
src/frontends/qt4/QLyXKeySym.C
View File

@ -26,6 +26,8 @@
#include <map>
#include "support/lstrings.h"
#include "support/environment.h"
#include "support/unicode.h"
#include "encoding.h"
#include "language.h"
@ -75,6 +77,7 @@ char const encode(string const & encoding, QString const & str)
void initEncodings()
{
#if 0
//const char * c = QTextCodec::locale();
//string s = c ? c : "";
// In this order, see support/filetools.C
@ -131,7 +134,7 @@ void initEncodings()
encoding_map[""] = defaultCodec;
QTextCodec::setCodecForCStrings(defaultCodec);
#endif
}
@ -195,14 +198,20 @@ string QLyXKeySym::getSymbolName() const
}
char QLyXKeySym::getISOEncoded(string const & encoding) const
size_t QLyXKeySym::getUCSEncoded() const
{
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "encoding is " << encoding << endl;
unsigned char const c = encode(encoding, text_);
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "ISOEncoded returning value " << int(c) << endl;
return c;
unsigned short const * ptr = text_.ucs2();
std::vector<unsigned short> tmp(ptr, ptr + text_.length());
//lyxerr << "Data is " << tmp << endl;
lyxerr << "Length is " << text_.length() << endl;
if (text_.isEmpty())
return 0;
//size_t res = utf8_to_ucs4(tmp, tmp.length());
//lyxerr << "Res is " << res << endl;
return ucs2_to_ucs4(tmp)[0];
}
@ -235,11 +244,7 @@ bool QLyXKeySym::isText() const
return false;
}
QChar const c(text_[0]);
if (lyxerr.debugging())
lyxerr[Debug::KEY] << "isText for key " << key_
<< " isPrint is " << c.isPrint() << endl;
return c.isPrint();
return true;
}

7
src/frontends/qt4/QLyXKeySym.h
View File

@ -50,11 +50,10 @@ public:
virtual bool isText() const;
/**
* Return the value of the keysym into the local ISO encoding.
* This converts the LyXKeySym to a 8-bit encoded character.
* This relies on user to use the right encoding.
* Return the value of the keysym into the UCS-4 encoding.
* This converts the LyXKeySym to a 32-bit encoded character.
*/
virtual char getISOEncoded(std::string const & encoding) const;
virtual size_t getUCSEncoded() const;
/// Return a human-readable version of a key+modifier pair.
virtual std::string const print(key_modifier::state mod) const;

185
src/frontends/qt4/qfont_metrics.C
View File

@ -19,91 +19,17 @@
#include "language.h"
#include "support/unicode.h"
using lyx::char_type;
using lyx::docstring;
using std::string;
namespace font_metrics {
namespace {
int maxAscent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return theApp->fontLoader().metrics(f).ascent();
}
int maxDescent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
// We add 1 as the value returned by QT is different than X
// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
return theApp->fontLoader().metrics(f).descent() + 1;
}
int ascent(char c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = theApp->fontLoader().metrics(f).boundingRect(c);
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return -r.top() - r.height();
#else
return -r.top();
#endif
}
int descent(char c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = theApp->fontLoader().metrics(f).boundingRect(c);
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return r.bottom() + r.height() + 1;
#else
return r.bottom() + 1;
#endif
}
int lbearing(char c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return theApp->fontLoader().metrics(f).leftBearing(c);
}
int rbearing(char c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QFontMetrics const & m = theApp->fontLoader().metrics(f);
// Qt rbearing is from the right edge of the char's width().
return m.width(c) - m.rightBearing(c);
}
Encoding const * fontencoding(LyXFont const & f)
{
Encoding const * encoding = f.language()->encoding();
if (f.isSymbolFont())
encoding = encodings.symbol_encoding();
return encoding;
}
int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
int smallcapswidth(unsigned short const * s, size_t ls, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
@ -115,12 +41,10 @@ int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
QFontMetrics const & qm = theApp->fontLoader().metrics(f);
QFontMetrics const & qsmallm = theApp->fontLoader().metrics(smallfont);
Encoding const * encoding = fontencoding(f);
int w = 0;
for (size_t i = 0; i < ls; ++i) {
QChar const c = QChar(encoding->ucs(s[i]));
QChar const c = s[i];
QChar const uc = c.upper();
if (c != uc)
w += qsmallm.width(uc);
@ -131,29 +55,104 @@ int smallcapswidth(char const * s, size_t ls, LyXFont const & f)
}
int width(char const * s, size_t ls, LyXFont const & f)
} // anon namespace
int font_metrics::maxAscent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return theApp->fontLoader().metrics(f).ascent();
}
int font_metrics::maxDescent(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
// We add 1 as the value returned by QT is different than X
// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
return theApp->fontLoader().metrics(f).descent() + 1;
}
int font_metrics::ascent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = theApp->fontLoader().metrics(f).boundingRect(ucs4_to_ucs2(c));
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return -r.top() - r.height();
#else
return -r.top();
#endif
}
int font_metrics::descent(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QRect const & r = theApp->fontLoader().metrics(f).boundingRect(ucs4_to_ucs2(c));
// Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y
// value by the height: (x, -y-height, width, height).
// Other versions return: (x, -y, width, height)
#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201)
return r.bottom() + r.height() + 1;
#else
return r.bottom() + 1;
#endif
}
int font_metrics::lbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
return theApp->fontLoader().metrics(f).leftBearing(ucs4_to_ucs2(c));
}
int font_metrics::rbearing(char_type c, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return 1;
QFontMetrics const & m = theApp->fontLoader().metrics(f);
// Qt rbearing is from the right edge of the char's width().
unsigned short sc = ucs4_to_ucs2(c);
return m.width(sc) - m.rightBearing(sc);
}
int font_metrics::width(char_type const * s, size_t ls, LyXFont const & f)
{
if (!lyx_gui::use_gui)
return ls;
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE)
return smallcapswidth(s, ls, f);
std::vector<unsigned short> ucs2 = ucs4_to_ucs2(s, ls);
ucs2.push_back(0);
if (f.realShape() == LyXFont::SMALLCAPS_SHAPE)
return smallcapswidth(&ucs2[0], ls, f);
Encoding const * encoding = fontencoding(f);
QLFontInfo & fi = theApp->fontLoader().fontinfo(f);
if (ls == 1)
return fi.width(encoding->ucs(s[0]));
return fi.width(ucs2[0]);
int w = 0;
for (size_t i = 0; i < ls; ++i)
w += fi.width(encoding->ucs(s[i]));
w += fi.width(ucs2[i]);
return w;
}
int signedWidth(string const & s, LyXFont const & f)
int font_metrics::signedWidth(docstring const & s, LyXFont const & f)
{
if (s[0] == '-')
return -width(s.substr(1, s.length() - 1), f);
@ -162,7 +161,7 @@ int signedWidth(string const & s, LyXFont const & f)
}
void rectText(string const & str, LyXFont const & f,
void font_metrics::rectText(docstring const & str, LyXFont const & f,
int & w, int & ascent, int & descent)
{
QFontMetrics const & m = theApp->fontLoader().metrics(f);
@ -174,7 +173,7 @@ void rectText(string const & str, LyXFont const & f,
void buttonText(string const & str, LyXFont const & f,
void font_metrics::buttonText(docstring const & str, LyXFont const & f,
int & w, int & ascent, int & descent)
{
QFontMetrics const & m = theApp->fontLoader().metrics(f);
@ -183,5 +182,3 @@ void buttonText(string const & str, LyXFont const & f,
ascent = m.ascent() + d;
descent = m.descent() + d;
}
} // namespace font_metrics

7
src/insets/insetbibitem.C
View File

@ -27,6 +27,7 @@
#include "support/std_ostream.h"
#include "support/convert.h"
using lyx::docstring;
using lyx::support::prefixIs;
using std::max;
@ -143,9 +144,11 @@ string const bibitemWidest(Buffer const & buffer)
for (; it != end; ++it) {
if (it->bibitem()) {
string const label = it->bibitem()->getBibLabel();
docstring const dlab(label.begin(), label.end());
int const wx =
font_metrics::width(it->bibitem()->getBibLabel(),
font);
font_metrics::width(dlab, font);
if (wx > w) {
w = wx;
bitem = it->bibitem();

11
src/insets/insetcaption.C
View File

@ -34,7 +34,7 @@
#include <sstream>
using lyx::docstring;
using lyx::support::bformat;
using std::auto_ptr;
@ -123,7 +123,8 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
LCursor cur = mi.base.bv->cursor();
setLabel(cur);
labelwidth_ = font_metrics::width(label, mi.base.font);
docstring dlab(label.begin(), label.end());
labelwidth_ = font_metrics::width(dlab, mi.base.font);
dim.wid = labelwidth_;
Dimension textdim;
InsetText::metrics(mi, textdim);
@ -150,9 +151,9 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
// belongs to.
LCursor cur = pi.base.bv->cursor();
setLabel(cur);
labelwidth_ = font_metrics::width(label, pi.base.font);
pi.pain.text(x, y, label, pi.base.font);
docstring dlab(label.begin(), label.end());
labelwidth_ = font_metrics::width(dlab, pi.base.font);
pi.pain.text(x, y, dlab, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y);
setPosCache(pi, x, y);
}

9
src/insets/insetcharstyle.C
View File

@ -36,6 +36,7 @@
#include <sstream>
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -154,7 +155,8 @@ void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
string s(params_.type);
if (undefined())
s = _("Undef: ") + s;
font_metrics::rectText(s, font, w, a, d);
docstring ds(s.begin(), s.end());
font_metrics::rectText(ds, font, w, a, d);
dim.wid = max(dim.wid, w);
}
dim.asc += TEXT_TO_INSET_OFFSET;
@ -200,9 +202,10 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
string s(params_.type);
if (undefined())
s = _("Undef: ") + s;
font_metrics::rectText(s, font, w, a, d);
docstring ds(s.begin(), s.end());
font_metrics::rectText(ds, font, w, a, d);
pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
s, font, LColor::none, LColor::none);
ds, font, LColor::none, LColor::none);
}
// a visual clue when the cursor is inside the inset

8
src/insets/insetcollapsable.C
View File

@ -30,7 +30,7 @@
#include "frontends/Painter.h"
#include "frontends/LyXView.h"
using lyx::docstring;
using lyx::graphics::PreviewLoader;
using std::endl;
@ -122,7 +122,8 @@ void InsetCollapsable::read(Buffer const & buf, LyXLex & lex)
Dimension InsetCollapsable::dimensionCollapsed() const
{
Dimension dim;
font_metrics::buttonText(label, labelfont_, dim.wid, dim.asc, dim.des);
docstring dlab(label.begin(), label.end());
font_metrics::buttonText(dlab, labelfont_, dim.wid, dim.asc, dim.des);
return dim;
}
@ -174,7 +175,8 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
button_dim.y1 = top;
button_dim.y2 = top + dimc.height();
pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
docstring dlab(label.begin(), label.end());
pi.pain.buttonText(xx, top + dimc.asc, dlab, labelfont_);
if (status() == Open) {
int textx, texty;

26
src/insets/insetlatexaccent.C
View File

@ -24,6 +24,8 @@
#include "support/lstrings.h"
using lyx::char_type;
using lyx::docstring;
using lyx::support::contains;
using lyx::support::trim;
@ -265,7 +267,8 @@ void InsetLatexAccent::metrics(MetricsInfo & mi, Dimension & dim) const
} else {
dim.asc = font_metrics::maxAscent(font) + 4;
dim.des = font_metrics::maxDescent(font) + 4;
dim.wid = font_metrics::width(contents, font) + 4;
docstring dcon(contents.begin(), contents.end());
dim.wid = font_metrics::width(dcon, font) + 4;
}
dim_ = dim;
}
@ -332,7 +335,7 @@ bool InsetLatexAccent::displayISO8859_9(PainterInfo & pi, int x, int y) const
void InsetLatexAccent::drawAccent(PainterInfo const & pi, int x, int y,
char accent) const
char_type accent) const
{
LyXFont const & font = pi.base.font;
x -= font_metrics::center(accent, font);
@ -407,15 +410,18 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
// now the rest - draw within (x, y, x + wid, y + hg)
switch (modtype) {
case ACUTE:
drawAccent(pi, x2, baseline, '\xB4');
//drawAccent(pi, x2, baseline, '\xB4');
drawAccent(pi, x2, baseline, 0xB4);
break;
case GRAVE:
drawAccent(pi, x2, baseline, '\x60');
//drawAccent(pi, x2, baseline, '\x60');
drawAccent(pi, x2, baseline, 0x60);
break;
case MACRON:
drawAccent(pi, x2, baseline, '\xAF');
//drawAccent(pi, x2, baseline, '\xAF');
drawAccent(pi, x2, baseline, 0xAF);
break;
case TILDE:
@ -423,14 +429,14 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
break;
case UNDERBAR: {
char const underbar('\x5F');
char_type const underbar = 0x5F; //('\x5F');
pi.pain.text(x2 - font_metrics::center(underbar, font),
baseline, underbar, font);
break;
}
case CEDILLA: {
char const cedilla('\xB8');
char_type const cedilla = 0xB8; //('\xB8');
pi.pain.text(x2 - font_metrics::center(cedilla, font),
baseline, cedilla, font);
break;
@ -447,7 +453,8 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
break;
case CIRCLE:
drawAccent(pi, x2, baseline, '\xB0');
//drawAccent(pi, x2, baseline, '\xB0');
drawAccent(pi, x2, baseline, 0xB0);
break;
case TIE:
@ -550,7 +557,8 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
pi.pain.rectangle(x + 1, baseline - dim_.asc + 1,
dim_.wid - 2, dim_.asc + dim_.des - 2,
LColor::foreground);
pi.pain.text(x + 2, baseline, contents, font);
docstring dcon(contents.begin(), contents.end());
pi.pain.text(x + 2, baseline, dcon, font);
}
}

3
src/insets/insetlatexaccent.h
View File

@ -13,6 +13,7 @@
#define INSET_LATEX_ACCENT_H
#include "inset.h"
#include "support/types.h"
class Dimension;
@ -125,7 +126,7 @@ private:
/// Check if we know the modifier and can display it ok on screen.
void checkContents();
///
void drawAccent(PainterInfo const & pi, int x, int y, char accent) const;
void drawAccent(PainterInfo const & pi, int x, int y, lyx::char_type accent) const;
///
std::string contents;
/// can display as proper char

6
src/insets/insetpagebreak.C
View File

@ -21,6 +21,7 @@
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
using lyx::docstring;
using lyx::frontend::Painter;
using std::endl;
@ -59,12 +60,13 @@ void InsetPagebreak::draw(PainterInfo & pi, int x, int y) const
int w = 0;
int a = 0;
int d = 0;
font_metrics::rectText(label, font, w, a, d);
docstring dlab(label.begin(), label.end());
font_metrics::rectText(dlab, font, w, a, d);
int const text_start = int(x + (dim_.wid - w) / 2);
int const text_end = text_start + w;
pi.pain.rectText(text_start, y + d, label, font,
pi.pain.rectText(text_start, y + d, dlab, font,
LColor::none, LColor::none);
pi.pain.line(x, y, text_start, y,

4
src/insets/insetquotes.C
View File

@ -30,6 +30,7 @@
#include "support/lstrings.h"
using lyx::docstring;
using lyx::support::prefixIs;
using std::endl;
@ -237,7 +238,8 @@ void InsetQuotes::draw(PainterInfo & pi, int x, int y) const
int const t = font_metrics::width(',', pi.base.font);
pi.pain.text(x + t, y, text[0], pi.base.font);
} else {
pi.pain.text(x, y, text, pi.base.font);
docstring dtext(text.begin(), text.end());
pi.pain.text(x, y, dtext, pi.base.font);
}
}

4
src/insets/insetspace.C
View File

@ -55,11 +55,11 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
switch (kind_) {
case THIN:
case NEGTHIN:
dim.wid = font_metrics::width("x", font) / 3;
dim.wid = font_metrics::width(lyx::char_type('x'), font) / 3;
break;
case PROTECTED:
case NORMAL:
dim.wid = font_metrics::width("x", font);
dim.wid = font_metrics::width(lyx::char_type('x'), font);
break;
case QUAD:
dim.wid = 20;

20
src/insets/insetspecialchar.C
View File

@ -23,6 +23,7 @@
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -54,7 +55,8 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
case MENU_SEPARATOR: s = " x "; break;
case HYPHENATION: s = "-"; break;
}
dim.wid = font_metrics::width(s, font);
docstring ds(s.begin(), s.end());
dim.wid = font_metrics::width(ds, font);
if (kind_ == HYPHENATION && dim.wid > 5)
dim.wid -= 2; // to make it look shorter
dim_ = dim;
@ -69,33 +71,35 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
case HYPHENATION:
{
font.setColor(LColor::special);
pi.pain.text(x, y, '-', font);
pi.pain.text(x, y, lyx::char_type('-'), font);
break;
}
case LIGATURE_BREAK:
{
font.setColor(LColor::special);
pi.pain.text(x, y, '|', font);
pi.pain.text(x, y, lyx::char_type('|'), font);
break;
}
case END_OF_SENTENCE:
{
font.setColor(LColor::special);
pi.pain.text(x, y, '.', font);
pi.pain.text(x, y, lyx::char_type('.'), font);
break;
}
case LDOTS:
{
font.setColor(LColor::special);
pi.pain.text(x, y, ". . .", font);
string ell = ". . . ";
docstring dell(ell.begin(), ell.end());
pi.pain.text(x, y, dell, font);
break;
}
case MENU_SEPARATOR:
{
// A triangle the width and height of an 'x'
int w = font_metrics::width('x', font);
int ox = font_metrics::width(' ', font) + x;
int h = font_metrics::ascent('x', font);
int w = font_metrics::width(lyx::char_type('x'), font);
int ox = font_metrics::width(lyx::char_type(' '), font) + x;
int h = font_metrics::ascent(lyx::char_type('x'), font);
int xp[4], yp[4];
xp[0] = ox; yp[0] = y;

12
src/insets/insetvspace.C
View File

@ -29,6 +29,8 @@
#include <sstream>
using lyx::docstring;
using std::istringstream;
using std::ostream;
using std::ostringstream;
@ -127,7 +129,9 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
int w = 0;
int a = 0;
int d = 0;
font_metrics::rectText(label(), font, w, a, d);
string lab = label();
docstring dlab(lab.begin(), lab.end());
font_metrics::rectText(dlab, font, w, a, d);
height = max(height, a + d);
@ -177,11 +181,13 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
font.setColor(LColor::added_space);
font.decSize();
font.decSize();
font_metrics::rectText(label(), font, w, a, d);
string lab = label();
docstring dlab(lab.begin(), lab.end());
font_metrics::rectText(dlab, font, w, a, d);
pi.pain.rectText(x + 2 * arrow_size + 5,
start + (end - start) / 2 + (a - d) / 2,
label(), font, LColor::none, LColor::none);
dlab, font, LColor::none, LColor::none);
// top arrow
pi.pain.line(x, ty1, midx, ty2, LColor::added_space);

14
src/insets/render_button.C
View File

@ -18,6 +18,8 @@
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -45,10 +47,12 @@ void RenderButton::metrics(MetricsInfo &, Dimension & dim) const
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
docstring dtext(text_.begin(), text_.end());
if (editable_)
font_metrics::buttonText(text_, font, dim.wid, dim.asc, dim.des);
font_metrics::buttonText(dtext, font, dim.wid, dim.asc, dim.des);
else
font_metrics::rectText(text_, font, dim.wid, dim.asc, dim.des);
font_metrics::rectText(dtext, font, dim.wid, dim.asc, dim.des);
dim.wid += 4;
}
@ -61,10 +65,12 @@ void RenderButton::draw(PainterInfo & pi, int x, int y) const
font.setColor(LColor::command);
font.decSize();
docstring dtext(text_.begin(), text_.end());
if (editable_) {
pi.pain.buttonText(x + 2, y, text_, font);
pi.pain.buttonText(x + 2, y, dtext, font);
} else {
pi.pain.rectText(x + 2, y, text_, font,
pi.pain.rectText(x + 2, y, dtext, font,
LColor::commandbg, LColor::commandframe);
}
}

13
src/insets/render_graphic.C
View File

@ -31,6 +31,7 @@
namespace graphics = lyx::graphics;
using lyx::docstring;
using lyx::support::absolutePath;
using lyx::support::onlyFilename;
@ -143,16 +144,18 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
msgFont.setFamily(LyXFont::SANS_FAMILY);
string const justname = onlyFilename(params_.filename);
docstring djust(justname.begin(), justname.end());
if (!justname.empty()) {
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
font_width = font_metrics::width(justname, msgFont);
font_width = font_metrics::width(djust, msgFont);
}
string const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
docstring dmsg(msg.begin(), msg.end());
msgFont.setSize(LyXFont::SIZE_TINY);
font_width = std::max(font_width,
font_metrics::width(msg, msgFont));
font_metrics::width(dmsg, msgFont));
}
dim.wid = std::max(50, font_width + 15);
@ -194,18 +197,20 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
string const justname = onlyFilename(params_.filename);
if (!justname.empty()) {
docstring djust(justname.begin(), justname.end());
msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
y - font_metrics::maxAscent(msgFont) - 4,
justname, msgFont);
djust, msgFont);
}
// Print the message.
string const msg = statusMessage(params_, loader_.status());
if (!msg.empty()) {
docstring dmsg(msg.begin(), msg.end());
msgFont.setSize(LyXFont::SIZE_TINY);
pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
y - 4, msg, msgFont);
y - 4, dmsg, msgFont);
}
}
}

12
src/insets/render_preview.C
View File

@ -32,6 +32,8 @@
#include <boost/bind.hpp>
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -128,9 +130,9 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
LyXFont font(mi.base.font);
font.setFamily(LyXFont::SANS_FAMILY);
font.setSize(LyXFont::SIZE_FOOTNOTE);
dim.wid = 15 +
font_metrics::width(statusMessage(mi.base.bv, snippet_),
font);
string stat = statusMessage(mi.base.bv, snippet_);
docstring dstat(stat.begin(), stat.end());
dim.wid = 15 + font_metrics::width(dstat, font);
}
dim_ = dim;
@ -162,9 +164,11 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
font.setFamily(LyXFont::SANS_FAMILY);
font.setSize(LyXFont::SIZE_FOOTNOTE);
string stat = statusMessage(pi.base.bv, snippet_);
docstring dstat(stat.begin(), stat.end());
pi.pain.text(x + offset + 6,
y - font_metrics::maxAscent(font) - 4,
statusMessage(pi.base.bv, snippet_), font);
dstat, font);
}
}

7
src/lyxfunc.C
View File

@ -92,6 +92,7 @@
#include "support/systemcall.h"
#include "support/convert.h"
#include "support/os.h"
#include "support/unicode.h"
#include <boost/current_function.hpp>
#include <boost/filesystem/operations.hpp>
@ -248,7 +249,8 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
Encoding const * encoding = view()->cursor().getEncoding();
encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
//encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
size_t encoded_last_key = keysym->getUCSEncoded();
// Do a one-deep top-level lookup for
// cancel and meta-fake keys. RVDK_PATCH_5
@ -321,7 +323,8 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
if (func.action == LFUN_SELF_INSERT) {
if (encoded_last_key != 0) {
string const arg(1, encoded_last_key);
std::vector<char> tmp = ucs4_to_utf8(encoded_last_key);
string const arg(tmp.begin(), tmp.end());
dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
FuncRequest::KEYBOARD));
lyxerr[Debug::KEY]

4
src/lyxfunc.h
View File

@ -18,6 +18,8 @@
#include "kbsequence.h"
#include "lfuns.h"
#include "support/types.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals/trackable.hpp>
@ -75,7 +77,7 @@ private:
LyXView * owner;
/// the last character added to the key sequence, in ISO encoded form
char encoded_last_key;
lyx::char_type encoded_last_key;
///
kb_sequence keyseq;

6
src/lyxlex.C
View File

@ -147,6 +147,12 @@ string const LyXLex::getString() const
}
lyx::docstring const LyXLex::getDocString() const
{
return pimpl_->getDocString();
}
// I would prefer to give a tag number instead of an explicit token
// here, but it is not possible because Buffer::readDocument uses
// explicit tokens (JMarc)

5
src/lyxlex.h
View File

@ -17,6 +17,8 @@
#ifndef LYXLEX_H
#define LYXLEX_H
#include "support/types.h"
#include <boost/utility.hpp>
#include <iosfwd>
@ -100,6 +102,9 @@ public:
///
std::string const getString() const;
///
lyx::docstring const getDocString() const;
/** Get a long string, ended by the tag `endtag'.
This string can span several lines. The first line
serves as a template for how many spaces the lines

10
src/lyxlex_pimpl.C
View File

@ -19,6 +19,8 @@
#include "support/filetools.h"
#include "support/lyxalgo.h"
#include "support/lstrings.h"
#include "support/types.h"
#include "support/unicode.h"
#include <functional>
@ -69,6 +71,14 @@ string const LyXLex::Pimpl::getString() const
}
lyx::docstring const LyXLex::Pimpl::getDocString() const
{
std::vector<boost::uint32_t> res = utf8_to_ucs4(buff);
lyx::docstring dstr(res.begin(), res.end());
return dstr;
}
void LyXLex::Pimpl::printError(string const & message) const
{
string const tmpmsg = subst(message, "$$Token", getString());

4
src/lyxlex_pimpl.h
View File

@ -14,6 +14,8 @@
#include "lyxlex.h"
#include "support/types.h"
# include <boost/iostreams/filtering_streambuf.hpp>
# include <boost/iostreams/filter/gzip.hpp>
# include <boost/iostreams/device/file.hpp>
@ -34,6 +36,8 @@ public:
///
std::string const getString() const;
///
lyx::docstring const getDocString() const;
///
void printError(std::string const & message) const;
///
void printTable(std::ostream & os);

4
src/lyxtext.h
View File

@ -51,6 +51,8 @@ public:
///
typedef lyx::pos_type pos_type;
///
typedef lyx::char_type char_type;
///
typedef lyx::pit_type pit_type;
/// constructor
@ -275,7 +277,7 @@ public:
int singleWidth(Paragraph const & par, pos_type pos) const;
///
int singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & Font) const;
pos_type pos, char_type c, LyXFont const & Font) const;
/// return the color of the canvas
LColor_color backgroundColor() const;

5
src/mathed/math_hullinset.C
View File

@ -54,6 +54,7 @@
#include <sstream>
using lyx::docstring;
using lyx::cap::grabAndEraseSelection;
using lyx::support::bformat;
using lyx::support::subst;
@ -326,7 +327,9 @@ void MathHullInset::draw(PainterInfo & pi, int x, int y) const
for (row_type row = 0; row < nrows(); ++row) {
int const yy = y + rowinfo_[row].offset_;
FontSetChanger dummy(pi.base, "mathrm");
pi.draw(xx, yy, nicelabel(row));
string const nl = nicelabel(row);
docstring const dnl(nl.begin(), nl.end());
pi.draw(xx, yy, dnl);
}
}
setPosCache(pi, x, y);

9
src/mathed/math_macro.C
View File

@ -23,6 +23,8 @@
#include "LaTeXFeatures.h"
#include "frontends/Painter.h"
using lyx::docstring;
using std::string;
using std::max;
using std::auto_ptr;
@ -89,7 +91,8 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
LyXFont font = pi.base.font;
augmentFont(font, "lyxtex");
int h = y - dim_.ascent() + 2 + tmpl_.ascent();
pi.pain.text(x + 3, h, name(), font);
docstring dn(name().begin(), name().end());
pi.pain.text(x + 3, h, dn, font);
int const w = mathed_string_width(font, name());
tmpl_.draw(pi, x + w + 12, h);
h += tmpl_.descent();
@ -99,8 +102,8 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
MathArray const & c = cell(i);
h += max(c.ascent(), ldim.asc) + 5;
c.draw(pi, x + ldim.wid, h);
char str[] = "#1:";
str[1] += static_cast<char>(i);
lyx::char_type str[] = { '#', '1', ':', '\0' };
str[1] += static_cast<lyx::char_type>(i);
pi.pain.text(x + 3, h, str, font);
h += max(c.descent(), ldim.des) + 5;
}

10
src/mathed/math_macrotemplate.C
View File

@ -26,6 +26,7 @@
#include "support/lstrings.h"
using lyx::docstring;
using lyx::support::bformat;
using std::string;
@ -111,8 +112,9 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
{
cell(0).metrics(mi);
cell(1).metrics(mi);
docstring dp(prefix().begin(), prefix().end());
dim.wid = cell(0).width() + cell(1).width() + 20
+ font_metrics::width(prefix(), mi.base.font);
+ font_metrics::width(dp, mi.base.font);
dim.asc = std::max(cell(0).ascent(), cell(1).ascent()) + 7;
dim.des = std::max(cell(0).descent(), cell(1).descent()) + 7;
dim_ = dim;
@ -148,9 +150,9 @@ void MathMacroTemplate::draw(PainterInfo & p, int x, int y) const
if (cur.isInside(this))
cur.drawSelection(pi);
#endif
pi.pain.text(x + 2, y, prefix(), font);
x += font_metrics::width(prefix(), pi.base.font) + 6;
docstring dp(prefix().begin(), prefix().end());
pi.pain.text(x + 2, y, dp, font);
x += font_metrics::width(dp, pi.base.font) + 6;
int const w0 = cell(0).width();
int const w1 = cell(1).width();

5
src/mathed/math_numberinset.C
View File

@ -15,6 +15,8 @@
#include "math_streamstr.h"
#include "math_support.h"
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -38,7 +40,8 @@ void MathNumberInset::metrics(MetricsInfo & mi, Dimension & dim) const
void MathNumberInset::draw(PainterInfo & pi, int x, int y) const
{
pi.draw(x, y, str_);
docstring const dstr(str_.begin(), str_.end());
pi.draw(x, y, dstr);
}

4
src/mathed/math_scriptinset.C
View File

@ -22,6 +22,8 @@
#include <boost/assert.hpp>
using lyx::char_type;
using std::string;
using std::max;
using std::auto_ptr;
@ -245,7 +247,7 @@ void MathScriptInset::draw(PainterInfo & pi, int x, int y) const
else {
nuc().setXY(x + dxx(), y);
if (editing(pi.base.bv))
pi.draw(x + dxx(), y, ".");
pi.draw(x + dxx(), y, char_type('.'));
}
ScriptChanger dummy(pi.base);
if (hasUp())

4
src/mathed/math_stringinset.C
View File

@ -15,6 +15,7 @@
#include "math_streamstr.h"
#include "math_support.h"
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -40,7 +41,8 @@ void MathStringInset::metrics(MetricsInfo & mi, Dimension & dim) const
void MathStringInset::draw(PainterInfo & pi, int x, int y) const
{
//lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
pi.draw(x, y, str_);
docstring dstr(str_.begin(), str_.end());
pi.draw(x, y, dstr);
}

13
src/mathed/math_support.C
View File

@ -27,6 +27,7 @@
#include <map>
#include <sstream>
using lyx::docstring;
using lyx::frontend::Painter;
using std::string;
@ -403,13 +404,15 @@ void mathed_string_dim(LyXFont const & font, string const & s, Dimension & dim)
dim.asc = font_metrics::maxAscent(font);
dim.des = font_metrics::maxDescent(font);
#endif
dim.wid = font_metrics::width(s, font);
docstring ds(s.begin(), s.end());
dim.wid = font_metrics::width(ds, font);
}
int mathed_string_width(LyXFont const & font, string const & s)
{
return font_metrics::width(s, font);
docstring ds(s.begin(), s.end());
return font_metrics::width(ds, font);
}
@ -487,7 +490,8 @@ void drawStrRed(PainterInfo & pi, int x, int y, string const & str)
{
LyXFont f = pi.base.font;
f.setColor(LColor::latex);
pi.pain.text(x, y, str, f);
docstring dstr(str.begin(), str.end());
pi.pain.text(x, y, dstr, f);
}
@ -495,7 +499,8 @@ void drawStrBlack(PainterInfo & pi, int x, int y, string const & str)
{
LyXFont f = pi.base.font;
f.setColor(LColor::foreground);
pi.pain.text(x, y, str, f);
docstring dstr(str.begin(), str.end());
pi.pain.text(x, y, dstr, f);
}

5
src/mathed/math_symbolinset.C
View File

@ -20,6 +20,7 @@
#include "LaTeXFeatures.h"
#include "debug.h"
using lyx::docstring;
using std::string;
using std::auto_ptr;
@ -109,7 +110,9 @@ void MathSymbolInset::draw(PainterInfo & pi, int x, int y) const
x += static_cast<int>(0.0833*em+0.5);
FontSetChanger dummy(pi.base, sym_->inset.c_str());
pi.draw(x, y - h_, sym_->draw);
string const sym = sym_->draw;
docstring const dsym(sym.begin(), sym.end());
pi.draw(x, y - h_, dsym);
}

7
src/metricsinfo.C
View File

@ -20,6 +20,9 @@
#include <boost/assert.hpp>
using lyx::char_type;
using lyx::docstring;
using std::string;
@ -53,13 +56,13 @@ PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
}
void PainterInfo::draw(int x, int y, char c)
void PainterInfo::draw(int x, int y, char_type c)
{
pain.text(x, y, c, base.font);
}
void PainterInfo::draw(int x, int y, std::string const & str)
void PainterInfo::draw(int x, int y, docstring const & str)
{
pain.text(x, y, str, base.font);
}

4
src/metricsinfo.h
View File

@ -87,9 +87,9 @@ public:
///
PainterInfo(BufferView * bv, lyx::frontend::Painter & pain);
///
void draw(int x, int y, char c);
void draw(int x, int y, lyx::char_type c);
///
void draw(int x, int y, std::string const & str);
void draw(int x, int y, lyx::docstring const & str);
///
MetricsBase base;

12
src/paragraph.C
View File

@ -44,6 +44,7 @@
#include "support/lstrings.h"
#include "support/textutils.h"
#include "support/convert.h"
#include "support/unicode.h"
#include <boost/tuple/tuple.hpp>
#include <boost/bind.hpp>
@ -54,6 +55,7 @@
#include <sstream>
using lyx::pos_type;
using lyx::char_type;
using lyx::support::subst;
@ -212,9 +214,11 @@ void Paragraph::write(Buffer const & buf, ostream & os,
}
// this check is to amend a bug. LyX sometimes
// inserts '\0' this could cause problems.
if (c != '\0')
os << c;
else
if (c != '\0') {
std::vector<char> tmp = ucs4_to_utf8(c);
tmp.push_back('\0');
os << &tmp[0];
} else
lyxerr << "ERROR (Paragraph::writeFile):"
" NULL char in structure." << endl;
++column;
@ -1801,7 +1805,7 @@ size_t Paragraph::pos2row(pos_type pos) const
}
unsigned char Paragraph::transformChar(unsigned char c, pos_type pos) const
char_type Paragraph::transformChar(char_type c, pos_type pos) const
{
if (!Encodings::is_arabic(c))
if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isDigit(c))

6
src/paragraph.h
View File

@ -69,8 +69,8 @@ public:
/// (returning 0) - if this was 0, then we'd
/// try getInset() and crash. We should fix
/// all these places.
META_INSET = 1
//META_INSET = 0x200001 // above 0x10ffff, for ucs-4
//META_INSET = 1 // as in trunk
META_INSET = 0x200001 // above 0x10ffff, for ucs-4
};
enum ChangeTracking
{
@ -376,7 +376,7 @@ public:
/// return true if we allow this par to stay empty
bool allowEmpty() const;
///
unsigned char transformChar(unsigned char c, lyx::pos_type pos) const;
lyx::char_type transformChar(lyx::char_type c, lyx::pos_type pos) const;
///
ParagraphParameters & params();
///

59
src/rowpainter.C
View File

@ -44,6 +44,7 @@
#include <boost/crc.hpp>
using lyx::docstring;
using lyx::frontend::Painter;
using lyx::frontend::NullPainter;
using lyx::char_type;
@ -218,7 +219,8 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
}
// Draw nikud
pain_.text(int(x_) + dx, yo_, str, font);
docstring dstr(str.begin(), str.end());
pain_.text(int(x_) + dx, yo_, dstr, font);
}
@ -248,7 +250,8 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
}
}
// Draw nikud
pain_.text(int(x_) + dx, yo_, str, font);
docstring dstr(str.begin(), str.end());
pain_.text(int(x_) + dx, yo_, dstr, font);
}
@ -261,10 +264,15 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
Change::Type const prev_change = par_.lookupChange(pos).type;
// first character
#if 0
string str;
str += par_.getChar(pos);
#else
std::vector<char_type> str;
str.push_back(par_.getChar(pos));
#endif
if (arabic) {
unsigned char c = str[0];
char_type c = str[0];
str[0] = par_.transformChar(c, pos);
}
@ -291,7 +299,11 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
if (arabic)
c = par_.transformChar(c, pos);
#if 0
str += c;
#else
str.push_back(c);
#endif
}
if (prev_change == Change::DELETED)
@ -301,8 +313,13 @@ void RowPainter::paintChars(pos_type & vpos, LyXFont font,
// Draw text and set the new x position
//lyxerr << "paint row: yo_ " << yo_ << "\n";
#if 0
pain_.text(int(x_), yo_, str, font);
x_ += font_metrics::width(str, font);
#else
pain_.text(int(x_), yo_, &str[0], str.size(), font);
x_ += font_metrics::width(&str[0], str.size(), font);
#endif
}
@ -444,12 +461,13 @@ int RowPainter::paintAppendixStart(int y)
int w = 0;
int a = 0;
int d = 0;
font_metrics::rectText(label, pb_font, w, a, d);
docstring dlab(label.begin(), label.end());
font_metrics::rectText(dlab, pb_font, w, a, d);
int const text_start = int(xo_ + (width_ - w) / 2);
int const text_end = text_start + w;
pain_.rectText(text_start, y + d, label, pb_font, LColor::none, LColor::none);
pain_.rectText(text_start, y + d, dlab, pb_font, LColor::none, LColor::none);
pain_.line(int(xo_ + 1), y, text_start, y, LColor::appendix);
pain_.line(text_end, y, int(xo_ + width_ - 2), y, LColor::appendix);
@ -502,6 +520,7 @@ void RowPainter::paintFirst()
string const str = par_.getLabelstring();
if (!str.empty()) {
double x = x_;
docstring dstr(str.begin(), str.end());
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
@ -521,20 +540,22 @@ void RowPainter::paintFirst()
if (is_rtl) {
x = width_ - leftMargin() -
font_metrics::width(str, font);
font_metrics::width(dstr, font);
}
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
} else {
string lab = layout->labelsep;
docstring dlab(lab.begin(), lab.end());
if (is_rtl) {
x = width_ - leftMargin()
+ font_metrics::width(layout->labelsep, font);
+ font_metrics::width(dlab, font);
} else {
x = x_ - font_metrics::width(layout->labelsep, font)
- font_metrics::width(str, font);
x = x_ - font_metrics::width(dlab, font)
- font_metrics::width(dstr, font);
}
pain_.text(int(x), yo_, str, font);
pain_.text(int(x), yo_, dstr, font);
}
}
@ -547,6 +568,7 @@ void RowPainter::paintFirst()
LyXFont font = getLabelFont();
if (!par_.getLabelstring().empty()) {
string const str = par_.getLabelstring();
docstring dstr(str.begin(), str.end());
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
@ -564,12 +586,12 @@ void RowPainter::paintFirst()
if (is_rtl)
x = leftMargin();
x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
x -= font_metrics::width(str, font) / 2;
x -= font_metrics::width(dstr, font) / 2;
} else if (is_rtl) {
x = width_ - leftMargin() -
font_metrics::width(str, font);
font_metrics::width(dstr, font);
}
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
}
}
}
@ -602,10 +624,11 @@ void RowPainter::paintLast()
case END_LABEL_STATIC: {
LyXFont font = getLabelFont();
string const & str = par_.layout()->endlabelstring();
docstring dstr(str.begin(), str.end());
double const x = is_rtl ?
x_ - font_metrics::width(str, font)
x_ - font_metrics::width(dstr, font)
: - text_.rightMargin(par_) - row_.width();
pain_.text(int(x), yo_, str, font);
pain_.text(int(x), yo_, dstr, font);
break;
}
@ -683,7 +706,9 @@ void RowPainter::paintText()
}
if (body_pos > 0 && pos == body_pos - 1) {
int const lwidth = font_metrics::width(layout->labelsep,
string lab = layout->labelsep;
docstring dlab(lab.begin(), lab.end());
int const lwidth = font_metrics::width(dlab,
getLabelFont());
x_ += label_hfill_ + lwidth - width_pos;

2
src/support/Makefile.am
View File

@ -74,6 +74,8 @@ libsupport_la_SOURCES = \
types.h \
userinfo.C \
userinfo.h \
unicode.C \
unicode.h \
unlink.C

28
src/support/docstring.h Normal file
View File

@ -0,0 +1,28 @@
// -*- C++ -*-
/**
* \file docstring.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Provide a set of typedefs for commonly used things like sizes and
* indices wile trying to stay compatible with types used
* by the standard containers.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#ifndef LYX_DOCSTRING_H
#define LYX_DOCSTRING_H
#include <boost/cstdint.hpp>
#include <string>
namespace lyx {
typedef std::basic_string<boost::uint32_t> docstring;
}
#endif

2
src/support/lstrings.h
View File

@ -16,6 +16,8 @@
#ifndef LSTRINGS_H
#define LSTRINGS_H
#include "support/types.h"
#include <vector>
#include <string>

10
src/support/types.h
View File

@ -16,15 +16,21 @@
#ifndef LYX_TYPES_H
#define LYX_TYPES_H
#include "docstring.h"
#include <boost/cstdint.hpp>
#include <cstddef>
#include <string>
namespace lyx {
// The type used to hold characters in paragraphs
//typedef uint32_t char_type; // Possibly the ucs-4 type we will use
typedef boost::uint32_t char_type; // Possibly the ucs-4 type we will use
//typedef wchar_t char_type; // The wide char type CJK-LyX uses
typedef char char_type; // Current narrow char type in use
//typedef char char_type; // Current narrow char type in use
//typedef std::wstring docstring;
/// a type for positions used in paragraphs
// needs to be signed for a while to hold the special value -1 that is

285
src/support/unicode.C Normal file
View File

@ -0,0 +1,285 @@
/**
* \file unicode.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*
* A collection of unicode conversion functions, using iconv.
*/
#include <config.h>
#include "unicode.h"
#include "debug.h"
#include <cerrno>
#include <iomanip>
#include <string>
using std::endl;
using std::string;
namespace {
std::vector<char>
iconv_convert(std::string const & tocode, std::string const & fromcode,
std::vector<char> const & buf)
{
iconv_t cd = iconv_open(tocode.c_str(), fromcode.c_str());
if (cd == (iconv_t)(-1)) {
lyxerr << "Error returned from iconv_open" << endl;
switch (errno) {
case EINVAL:
lyxerr << "EINVAL The conversion from " << fromcode
<< " to " << tocode
<< " is not supported by the implementation."
<< endl;
break;
default:
lyxerr << "\tSome other error: " << errno << endl;
break;
}
}
char * inbuf = const_cast<char *>(&buf[0]);
size_t inbytesleft = buf.size();
char out[1000] = { 0 };
char * outbuf = out;
size_t outbytesleft = 1000;
size_t res = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
if (res == (size_t)(-1)) {
lyxerr << "Error returned from iconv" << endl;
switch (errno) {
case E2BIG:
lyxerr << "E2BIG There is not sufficient room at *outbuf." << endl;
break;
case EILSEQ:
lyxerr << "EILSEQ An invalid multibyte sequence"
<< " has been encountered in the input.\n"
<< "When converting from " << fromcode
<< " to " << tocode << ".\n";
lyxerr << "Input: " << std::hex;
for (size_t i = 0; i < buf.size(); ++i) {
unsigned char const b = buf[i];
lyxerr << "0x" << int(b) << " ";
}
lyxerr << endl;
break;
case EINVAL:
lyxerr << "EINVAL An incomplete multibyte sequence"
<< " has been encountered in the input.\n"
<< "When converting from " << fromcode
<< " to " << tocode << ".\n";
lyxerr << "Input: " << std::hex;
for (size_t i = 0; i < buf.size(); ++i) {
unsigned char const b = buf[i];
lyxerr << "0x" << int(b) << " ";
}
lyxerr << endl;
break;
default:
lyxerr << "\tSome other error: " << errno << endl;
break;
}
}
if (iconv_close(cd) == -1) {
lyxerr << "Error returned from iconv_close("
<< errno << ")" << endl;
}
//lyxerr << std::dec;
//lyxerr << "Inbytesleft: " << inbytesleft << endl;
//lyxerr << "Outbytesleft: " << outbytesleft << endl;
int bytes = 1000 - outbytesleft;
std::vector<char> outvec(out, out + bytes);
return outvec;
}
std::vector<boost::uint32_t> bytes_to_ucs4(std::vector<char> const & bytes)
{
//lyxerr << "Outbuf =" << std::hex;
std::vector<uint32_t> ucs4;
for (size_t i = 0; i < bytes.size(); i += 4) {
unsigned char const b1 = bytes[i ];
unsigned char const b2 = bytes[i + 1];
unsigned char const b3 = bytes[i + 2];
unsigned char const b4 = bytes[i + 3];
boost::uint32_t c;
char * cc = reinterpret_cast<char *>(&c);
cc[3] = b1;
cc[2] = b2;
cc[1] = b3;
cc[0] = b4;
if (c > 0xffff) {
lyxerr << "Strange ucs4 value encountered\n";
lyxerr << "0x"
<< std::setw(2) << std::setfill('0') << int(b1)
<< std::setw(2) << std::setfill('0') << int(b2)
<< std::setw(2) << std::setfill('0') << int(b3)
<< std::setw(2) << std::setfill('0') << int(b4)
<< ' '
<< "(0x"
<< c
<< ") ";
}
ucs4.push_back(c);
}
//lyxerr << endl;
return ucs4;
}
std::vector<unsigned short> bytes_to_ucs2(std::vector<char> const & bytes)
{
//lyxerr << "Outbuf =" << std::hex;
std::vector<unsigned short> ucs2;
for (size_t i = 0; i < bytes.size(); i += 2) {
unsigned char const b1 = bytes[i ];
unsigned char const b2 = bytes[i + 1];
unsigned short c;
char * cc = reinterpret_cast<char *>(&c);
cc[0] = b1;
cc[1] = b2;
//lyxerr << "0x"
// << std::setw(2) << std::setfill('0') << int(b2)
// << std::setw(2) << std::setfill('0') << int(b1)
// << ' '
// << "(0x"
// << c
// << ") ";
ucs2.push_back(c);
}
//lyxerr << endl;
return ucs2;
}
} // anon namespace
std::vector<boost::uint32_t> utf8_to_ucs4(std::vector<char> const & utf8str)
{
//lyxerr << "Buff = " << string(utf8str.begin(), utf8str.end())
// << " (" << utf8str.size() << ")" << endl;
//lyxerr << "Res = " << string(res.begin(), res.end())
// << " (" << res.size() << ")" << endl;
std::vector<char> res = iconv_convert("UCS-4", "UTF-8", utf8str);
return bytes_to_ucs4(res);
}
std::vector<boost::uint32_t>
ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str)
{
// TODO: Simplify and speed up.
std::vector<char> in;
std::vector<unsigned short>::const_iterator cit = ucs2str.begin();
std::vector<unsigned short>::const_iterator end = ucs2str.end();
//lyxerr << std::hex;
for (; cit != end; ++cit) {
unsigned short s = *cit;
in.push_back(static_cast<char>(s & 0x00ff));
in.push_back(static_cast<char>((s & 0xff00) >> 8));
lyxerr << std::setw(2) << std::setfill('0') << (s & 0x00ff) << endl;
lyxerr << std::setw(2) << std::setfill('0') << ((s & 0xff00) >> 8) << endl;
}
std::vector<char> res = iconv_convert("UCS-4", "UCS-2", in);
return bytes_to_ucs4(res);
}
std::vector<unsigned short>
ucs4_to_ucs2(std::vector<boost::uint32_t> const & ucs4str)
{
std::vector<char> in;
std::vector<boost::uint32_t>::const_iterator cit = ucs4str.begin();
std::vector<boost::uint32_t>::const_iterator end = ucs4str.end();
for (; cit != end; ++cit) {
boost::uint32_t s = *cit;
in.push_back(static_cast<char>((s & 0xff000000) >> 24));
in.push_back(static_cast<char>((s & 0x00ff0000) >> 16));
in.push_back(static_cast<char>((s & 0x0000ff00) >> 8));
in.push_back(static_cast<char>(s & 0x000000ff));
}
std::vector<char> res = iconv_convert("UCS-2", "UCS-4", in);
return bytes_to_ucs2(res);
}
std::vector<unsigned short>
ucs4_to_ucs2(boost::uint32_t const * s, size_t ls)
{
std::vector<char> in;
for (size_t i = 0; i < ls; ++i) {
in.push_back(static_cast<char>((s[i] & 0xff000000) >> 24));
in.push_back(static_cast<char>((s[i] & 0x00ff0000) >> 16));
in.push_back(static_cast<char>((s[i] & 0x0000ff00) >> 8));
in.push_back(static_cast<char>(s[i] & 0x000000ff));
}
std::vector<char> res = iconv_convert("UCS-2", "UCS-4", in);
return bytes_to_ucs2(res);
}
unsigned short
ucs4_to_ucs2(boost::uint32_t c)
{
std::vector<char> in;
in.push_back(static_cast<char>((c & 0xff000000) >> 24));
in.push_back(static_cast<char>((c & 0x00ff0000) >> 16));
in.push_back(static_cast<char>((c & 0x0000ff00) >> 8));
in.push_back(static_cast<char>(c & 0x000000ff));
std::vector<char> res = iconv_convert("UCS-2", "UCS-4", in);
std::vector<unsigned short> us = bytes_to_ucs2(res);
if (!us.empty())
return us[0];
else
return 0xfffd; // unknown character
}
std::vector<char> ucs4_to_utf8(std::vector<boost::uint32_t> const & ucs4str)
{
std::vector<char> in;
std::vector<boost::uint32_t>::const_iterator cit = ucs4str.begin();
std::vector<boost::uint32_t>::const_iterator end = ucs4str.end();
for (; cit != end; ++cit) {
boost::uint32_t s = *cit;
in.push_back(static_cast<char>((s & 0xff000000) >> 24));
in.push_back(static_cast<char>((s & 0x00ff0000) >> 16));
in.push_back(static_cast<char>((s & 0x0000ff00) >> 8));
in.push_back(static_cast<char>(s & 0x000000ff));
}
std::vector<char> res = iconv_convert("UTF-8", "UCS-4", in);
return res;
}
std::vector<char> ucs4_to_utf8(boost::uint32_t c)
{
std::vector<char> in;
in.push_back(static_cast<char>((c & 0xff000000) >> 24));
in.push_back(static_cast<char>((c & 0x00ff0000) >> 16));
in.push_back(static_cast<char>((c & 0x0000ff00) >> 8));
in.push_back(static_cast<char>(c & 0x000000ff));
std::vector<char> res = iconv_convert("UTF-8", "UCS-4", in);
return res;
}

40
src/support/unicode.h Normal file
View File

@ -0,0 +1,40 @@
/**
* \file unicode.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*
* A collection of unicode conversion functions, using iconv.
*/
#ifndef LYX_SUPPORT_UNICODE_H
#define LYX_SUPPORT_UNICODE_H
#include <boost/cstdint.hpp>
#include <vector>
std::vector<boost::uint32_t>
utf8_to_ucs4(std::vector<char> const & utf8str);
std::vector<boost::uint32_t>
ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
std::vector<unsigned short>
ucs4_to_ucs2(std::vector<boost::uint32_t> const & ucs4str);
std::vector<unsigned short>
ucs4_to_ucs2(boost::uint32_t const * s, size_t ls);
unsigned short
ucs4_to_ucs2(boost::uint32_t c);
std::vector<char>
ucs4_to_utf8(std::vector<boost::uint32_t> const & ucs4str);
std::vector<char>
ucs4_to_utf8(boost::uint32_t c);
#endif

116
src/text.C
View File

@ -75,6 +75,7 @@
#include <sstream>
using lyx::docstring;
using lyx::char_type;
using lyx::pit_type;
using lyx::pos_type;
@ -161,9 +162,17 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
BufferParams const & bp = buf.params();
if (token[0] != '\\') {
#if 0
string::const_iterator cit = token.begin();
for (; cit != token.end(); ++cit)
par.insertChar(par.size(), (*cit), font, change);
#else
lyx::docstring dstr = lex.getDocString();
lyx::docstring::const_iterator cit = dstr.begin();
lyx::docstring::const_iterator cend = dstr.end();
for (; cit != cend; ++cit)
par.insertChar(par.size(), *cit, font, change);
#endif
} else if (token == "\\begin_layout") {
lex.eatLine();
string layoutname = lex.getString();
@ -492,7 +501,9 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
if (isMainText())
l_margin += changebarMargin();
l_margin += font_metrics::signedWidth(tclass.leftmargin(), params.getFont());
string leftm = tclass.leftmargin();
docstring dleft(leftm.begin(), leftm.end());
l_margin += font_metrics::signedWidth(dleft, params.getFont());
if (par.getDepth() != 0) {
// find the next level paragraph
@ -520,42 +531,65 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
if (!layout->leftmargin.empty())
l_margin += font_metrics::signedWidth(layout->leftmargin,
params.getFont());
if (!par.getLabelstring().empty()) {
l_margin += font_metrics::signedWidth(layout->labelindent,
if (!layout->leftmargin.empty()) {
string leftm = layout->leftmargin;
docstring dleft(leftm.begin(), leftm.end());
l_margin += font_metrics::signedWidth(dleft,
params.getFont());
}
if (!par.getLabelstring().empty()) {
string labin = layout->labelindent;
docstring dlabin(labin.begin(), labin.end());
l_margin += font_metrics::signedWidth(dlabin,
labelfont);
l_margin += font_metrics::width(par.getLabelstring(),
string labstr = par.getLabelstring();
docstring dlabstr(labstr.begin(), labstr.end());
l_margin += font_metrics::width(dlabstr,
labelfont);
l_margin += font_metrics::width(layout->labelsep, labelfont);
string labsep = layout->labelsep;
docstring dlabsep(labsep.begin(), labsep.end());
l_margin += font_metrics::width(dlabsep, labelfont);
}
break;
case MARGIN_MANUAL:
l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
case MARGIN_MANUAL: {
string labin = layout->labelindent;
docstring dlabin(labin.begin(), labin.end());
l_margin += font_metrics::signedWidth(dlabin, labelfont);
// The width of an empty par, even with manual label, should be 0
if (!par.empty() && pos >= par.beginOfBody()) {
if (!par.getLabelWidthString().empty()) {
l_margin += font_metrics::width(par.getLabelWidthString(),
string labstr = par.getLabelWidthString();
docstring dlabstr(labstr.begin(), labstr.end());
l_margin += font_metrics::width(dlabstr,
labelfont);
l_margin += font_metrics::width(layout->labelsep, labelfont);
string labsep = layout->labelsep;
docstring dlabsep(labsep.begin(), labsep.end());
l_margin += font_metrics::width(dlabsep, labelfont);
}
}
break;
case MARGIN_STATIC:
l_margin += font_metrics::signedWidth(layout->leftmargin, params.getFont()) * 4
}
case MARGIN_STATIC: {
string leftm = layout->leftmargin;
docstring dleft(leftm.begin(), leftm.end());
l_margin += font_metrics::signedWidth(dleft, params.getFont()) * 4
/ (par.getDepth() + 4);
break;
}
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
if (pos >= par.beginOfBody()) {
l_margin += font_metrics::signedWidth(layout->leftmargin,
string leftm = layout->leftmargin;
docstring dleft(leftm.begin(), leftm.end());
l_margin += font_metrics::signedWidth(dleft,
labelfont);
} else {
l_margin += font_metrics::signedWidth(layout->labelindent,
string labin = layout->labelindent;
docstring dlabin(labin.begin(), labin.end());
l_margin += font_metrics::signedWidth(dlabin,
labelfont);
}
} else if (pos != 0
@ -564,17 +598,24 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
&& !isFirstInSequence(pit, pars_))) {
l_margin += font_metrics::signedWidth(layout->leftmargin,
string leftm = layout->leftmargin;
docstring dleft(leftm.begin(), leftm.end());
l_margin += font_metrics::signedWidth(dleft,
labelfont);
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
&& layout->labeltype != LABEL_BIBLIO
&& layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
l_margin += font_metrics::signedWidth(layout->labelindent,
string labin = layout->labelindent;
docstring dlabin(labin.begin(), labin.end());
l_margin += font_metrics::signedWidth(dlabin,
labelfont);
l_margin += font_metrics::width(layout->labelsep, labelfont);
l_margin += font_metrics::width(par.getLabelstring(),
labelfont);
string labsep = layout->labelsep;
docstring dlabsep(labsep.begin(), labsep.end());
l_margin += font_metrics::width(dlabsep, labelfont);
string labstr = par.getLabelstring();
docstring dlabstr(labstr.begin(), labstr.end());
l_margin += font_metrics::width(dlabstr, labelfont);
}
break;
@ -631,7 +672,8 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
{
l_margin += font_metrics::signedWidth(parindent, params.getFont());
docstring din(parindent.begin(), parindent.end());
l_margin += font_metrics::signedWidth(din, params.getFont());
}
return l_margin;
@ -646,11 +688,15 @@ int LyXText::rightMargin(Paragraph const & par) const
BufferParams const & params = bv()->buffer()->params();
LyXTextClass const & tclass = params.getLyXTextClass();
string trmarg = tclass.rightmargin();
docstring dtrmarg(trmarg.begin(), trmarg.end());
string lrmarg = par.layout()->rightmargin;
docstring dlrmarg(lrmarg.begin(), lrmarg.end());
int const r_margin =
::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
+ font_metrics::signedWidth(dtrmarg,
params.getFont())
+ font_metrics::signedWidth(par.layout()->rightmargin,
+ font_metrics::signedWidth(dlrmarg,
params.getFont())
* 4 / (par.getDepth() + 4);
@ -731,7 +777,9 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
int add = font_metrics::width(layout->labelsep, getLabelFont(par));
string lsep = layout->labelsep;
docstring dlsep(lsep.begin(), lsep.end());
int add = font_metrics::width(dlsep, getLabelFont(par));
if (par.isLineSeparator(i - 1))
add -= singleWidth(par, i - 1);
@ -805,6 +853,7 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const
Paragraph const & par = pars_[pit];
string const & labelsep = par.layout()->labelsep;
docstring dlsep(labelsep.begin(), labelsep.end());
int w = leftMargin(pit, row.pos());
pos_type const body_pos = par.beginOfBody();
@ -814,7 +863,7 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const
FontIterator fi = FontIterator(*this, par, i);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
w += font_metrics::width(labelsep, getLabelFont(par));
w += font_metrics::width(dlsep, getLabelFont(par));
if (par.isLineSeparator(i - 1))
w -= singleWidth(par, i - 1);
w = max(w, labelEnd(pit));
@ -825,7 +874,7 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const
}
if (body_pos > 0 && body_pos >= end) {
w += font_metrics::width(labelsep, getLabelFont(par));
w += font_metrics::width(dlsep, getLabelFont(par));
if (end > 0 && par.isLineSeparator(end - 1))
w -= singleWidth(par, end - 1);
w = max(w, labelEnd(pit));
@ -857,7 +906,8 @@ int LyXText::labelFill(Paragraph const & par, Row const & row) const
if (label.empty())
return 0;
return max(0, font_metrics::width(label, getLabelFont(par)) - w);
docstring dlab(label.begin(), label.end());
return max(0, font_metrics::width(dlab, getLabelFont(par)) - w);
}
@ -1332,7 +1382,9 @@ LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
string lsep = layout->labelsep;
docstring dlsep(lsep.begin(), lsep.end());
result.x += font_metrics::width(dlsep, getLabelFont(par));
if (body_pos <= end)
result.x += result.label_hfill;
}
@ -2201,8 +2253,10 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
string lsep = par.layout()->labelsep;
docstring dlsep(lsep.begin(), lsep.end());
x += m.label_hfill
+ font_metrics::width(par.layout()->labelsep,
+ font_metrics::width(dlsep,
getLabelFont(par));
if (par.isLineSeparator(body_pos - 1))
x -= singleWidth(par, body_pos - 1);

5
src/text2.C
View File

@ -57,6 +57,7 @@
#include <sstream>
using lyx::docstring;
using lyx::pit_type;
using lyx::pos_type;
@ -797,8 +798,10 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
c = bidi.vis2log(vc);
last_tmpx = tmpx;
if (body_pos > 0 && c == body_pos - 1) {
string lsep = layout->labelsep;
docstring dlsep(lsep.begin(), lsep.end());
tmpx += r.label_hfill +
font_metrics::width(layout->labelsep, getLabelFont(par));
font_metrics::width(dlsep, getLabelFont(par));
if (par.isLineSeparator(body_pos - 1))
tmpx -= singleWidth(par, body_pos - 1);
}

11
src/text3.C
View File

@ -64,6 +64,7 @@
#include "support/lyxlib.h"
#include "support/convert.h"
#include "support/lyxtime.h"
#include "support/unicode.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
@ -73,6 +74,7 @@
#include <clocale>
#include <sstream>
using lyx::char_type;
using lyx::pos_type;
using lyx::cap::copySelection;
@ -1100,11 +1102,20 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
cur.clearSelection();
LyXFont const old_font = real_current_font;
#if 0
string::const_iterator cit = cmd.argument.begin();
string::const_iterator end = cmd.argument.end();
for (; cit != end; ++cit)
bv->owner()->getIntl().getTransManager().
translateAndInsert(*cit, this);
#else
std::vector<char> in(cmd.argument.begin(), cmd.argument.end());
std::vector<boost::uint32_t> const res = utf8_to_ucs4(in);
std::vector<boost::uint32_t>::const_iterator cit = res.begin();
std::vector<boost::uint32_t>::const_iterator end = res.end();
for (; cit != end; ++cit)
insertChar(bv->cursor(), *cit);
#endif
cur.resetAnchor();
moveCursor(cur, false);