#include "frontends/font_metrics.h"
#include "lyxlex.h"
#include "lyxfont.h"
+#include "metricsinfo.h"
using std::ostream;
using std::max;
+using std::auto_ptr;
InsetSpecialChar::InsetSpecialChar(Kind k)
}
-void InsetSpecialChar::dimension(BufferView *, LyXFont const & font,
- Dimension & dim) const
+void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ LyXFont & font = mi.base.font;
dim.asc = font_metrics::maxAscent(font);
dim.des = font_metrics::maxDescent(font);
dim.wid = font_metrics::width(s, font);
if (kind_ == HYPHENATION && dim.wid > 5)
dim.wid -= 2; // to make it look shorter
+ dim_ = dim;
}
-void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x) const
+void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
{
- Painter & pain = bv->painter();
- LyXFont font(f);
+ LyXFont font = pi.base.font;
switch (kind_) {
case HYPHENATION:
{
font.setColor(LColor::special);
- pain.text(int(x), baseline, '-', font);
- x += width(bv, font);
+ pi.pain.text(x, y, '-', font);
break;
}
case LIGATURE_BREAK:
{
font.setColor(LColor::special);
- pain.text(int(x), baseline, '|', font);
- x += width(bv, font);
+ pi.pain.text(x, y, '|', font);
break;
}
case END_OF_SENTENCE:
{
font.setColor(LColor::special);
- pain.text(int(x), baseline, '.', font);
- x += width(bv, font);
+ pi.pain.text(x, y, '.', font);
break;
}
case LDOTS:
{
font.setColor(LColor::special);
- pain.text(int(x), baseline, ". . .", font);
- x += width(bv, font);
+ pi.pain.text(x, y, ". . .", 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) + int(x);
+ int ox = font_metrics::width(' ', font) + x;
int h = font_metrics::ascent('x', font);
int xp[4], yp[4];
- xp[0] = ox; yp[0] = baseline;
- xp[1] = ox; yp[1] = baseline - h;
- xp[2] = ox + w; yp[2] = baseline - h/2;
- xp[3] = ox; yp[3] = baseline;
+ xp[0] = ox; yp[0] = y;
+ xp[1] = ox; yp[1] = y - h;
+ xp[2] = ox + w; yp[2] = y - h/2;
+ xp[3] = ox; yp[3] = y;
- pain.lines(xp, yp, 4, LColor::special);
- x += width(bv, font);
+ pi.pain.lines(xp, yp, 4, LColor::special);
break;
}
}
}
-Inset * InsetSpecialChar::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetSpecialChar::clone() const
{
- return new InsetSpecialChar(kind_);
+ return auto_ptr<InsetBase>(new InsetSpecialChar(kind_));
}
-// Inset * InsetSpecialChar::clone(Buffer const &, bool) const
-// {
-// return new InsetSpecialChar(kind_);
-// }
-
-
void InsetSpecialChar::validate(LaTeXFeatures & features) const
{
if (kind_ == MENU_SEPARATOR) {