#include "LColor.h"
#include "lyxrc.h"
#include "lyxrow.h"
-#include "lyxrow_funcs.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "vspace.h"
#include "frontends/FontMetrics.h"
-#include "frontends/nullpainter.h"
#include "frontends/Painter.h"
#include "insets/insettext.h"
#include <boost/crc.hpp>
-using lyx::docstring;
-using lyx::frontend::Painter;
-using lyx::frontend::NullPainter;
-using lyx::frontend::FontMetrics;
-using lyx::char_type;
-using lyx::pit_type;
-using lyx::pos_type;
-using lyx::Point;
+namespace lyx {
+
+using frontend::Painter;
+using frontend::FontMetrics;
using std::endl;
using std::max;
private:
void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
- void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font);
- void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font);
- void paintChars(lyx::pos_type & vpos, LyXFont font,
+ void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
+ void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
+ void paintChars(pos_type & vpos, LyXFont font,
bool hebrew, bool arabic);
int paintAppendixStart(int y);
- void paintFromPos(lyx::pos_type & vpos);
- void paintInset(lyx::pos_type const pos, LyXFont const & font);
+ void paintFromPos(pos_type & vpos);
+ void paintInset(pos_type const pos, LyXFont const & font);
/// return left margin
int leftMargin() const;
bv_.buffer()->params().getFont() :
font;
pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
- pi.erased_ = erased_ || isDeletedText(par_, pos);
+ pi.erased_ = erased_ || par_.isDeleted(pos);
bv_.coordCache().insets().add(inset, int(x_), yo_);
InsetText const * const in = inset->asTextInset();
// non-wide insets are painted completely. Recursive
if (isPrintableNonspace(c)) {
int const width2 =
text_.singleWidth(par_, i, c, text_.getFont(par_, i));
+ // FIXME UNICODE
+ // This does not work anymore, and non-ascii
+ // characters in source files are forbidden
+ // anyway.
// dalet / resh
dx = (c == 'ø' || c == 'ã')
? width2 - width
str += par_.getChar(pos);
#else
std::vector<char_type> str;
+ str.reserve(100);
str.push_back(par_.getChar(pos));
#endif
if (arabic) {
if (pos < font_span.first || pos > font_span.last)
break;
- // FIXME: change tracking (MG)
- if (Change(prev_change) != par_.lookupChange(pos))
+ if (prev_change != par_.lookupChange(pos).type)
break;
char_type c = par_.getChar(pos);
void RowPainter::paintDepthBar()
{
- Paragraph::depth_type const depth = par_.getDepth();
+ depth_type const depth = par_.getDepth();
if (depth <= 0)
return;
- Paragraph::depth_type prev_depth = 0;
+ depth_type prev_depth = 0;
if (!text_.isFirstRow(pit_, row_)) {
pit_type pit2 = pit_;
if (row_.pos() == 0)
prev_depth = pars_[pit2].getDepth();
}
- Paragraph::depth_type next_depth = 0;
+ depth_type next_depth = 0;
if (!text_.isLastRow(pit_, row_)) {
pit_type pit2 = pit_;
if (row_.endpos() >= pars_[pit2].size())
next_depth = pars_[pit2].getDepth();
}
- for (Paragraph::depth_type i = 1; i <= depth; ++i) {
+ for (depth_type i = 1; i <= depth; ++i) {
int const w = nestMargin() / 5;
int x = int(xo_) + w * i;
// only consider the changebar space if we're drawing outermost text
LyXFont const font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
- // FIXME UNICODE
- docstring const str = lyx::from_utf8(par_.getLabelstring());
+ docstring const str = par_.getLabelstring();
if (!str.empty()) {
double x = x_;
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
} else {
// FIXME UNICODE
- docstring lab = lyx::from_utf8(layout->labelsep);
+ docstring lab = from_utf8(layout->labelsep);
if (is_rtl) {
x = width_ - leftMargin()
+ fm.width(lab);
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
LyXFont font = getLabelFont();
if (!par_.getLabelstring().empty()) {
- docstring const str = lyx::from_utf8(par_.getLabelstring());
+ docstring const str = par_.getLabelstring();
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
case END_LABEL_STATIC: {
LyXFont font = getLabelFont();
FontMetrics const & fm = theFontMetrics(font);
- // FIXME UNICODE
- docstring const & str = lyx::from_utf8(par_.layout()->endlabelstring());
+ docstring const & str = par_.layout()->endlabelstring();
double const x = is_rtl ?
x_ - fm.width(str)
: - text_.rightMargin(par_) - row_.width();
continue;
}
- is_struckout = isDeletedText(par_, pos);
+ is_struckout = par_.isDeleted(pos);
if (is_struckout && !running_strikeout) {
running_strikeout = true;
if (body_pos > 0 && pos == body_pos - 1) {
// FIXME UNICODE
int const lwidth = theFontMetrics(getLabelFont())
- .width(lyx::from_utf8(layout->labelsep));
+ .width(from_utf8(layout->labelsep));
x_ += label_hfill_ + lwidth - width_pos;
}
pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
- if (hfillExpansion(par_, row_, pos)) {
+ if (par_.hfillExpansion(row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
}
-lyx::size_type calculateRowSignature(Row const & row, Paragraph const & par,
+size_type calculateRowSignature(Row const & row, Paragraph const & par,
int x, int y)
{
boost::crc_32_type crc;
- for (lyx::pos_type i = row.pos(); i < row.endpos(); ++i) {
- const unsigned char b[] = { par.getChar(i) };
+ for (pos_type i = row.pos(); i < row.endpos(); ++i) {
+ char_type const b[] = { par.getChar(i) };
crc.process_bytes(b, 1);
}
- const unsigned char b[] = { x, y, row.width() };
+ char_type const b[] = { x, y, row.width() };
crc.process_bytes(b, 3);
return crc.checksum();
}
{
// Is there a cursor on this row (or inside inset on row)
LCursor & cur = pi.base.bv->cursor();
- for (lyx::size_type d = 0; d < cur.depth(); d++) {
+ for (size_type d = 0; d < cur.depth(); ++d) {
CursorSlice const & sl = cur[d];
if (sl.text() == &text
&& sl.pit() == pit
LCursor & cur = pi.base.bv->cursor();
if (rit->pos() + 1 != rit->endpos())
return false;
- for (lyx::size_type d = 0; d < cur.depth(); d++) {
+ for (size_type d = 0; d < cur.depth(); d++) {
CursorSlice const & sl = cur[d];
if (sl.text() == &text
&& sl.pit() == pit
bool repaintAll)
{
// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl;
- static NullPainter nop;
- static PainterInfo nullpi(pi.base.bv, nop);
int const ww = pi.base.bv->workHeight();
pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
RowList::const_iterator const re = par.rows().end();
y -= rb->ascent();
- lyx::size_type rowno(0);
+ size_type rowno = 0;
for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
y += rit->ascent();
// Allow setting of refreshInside for nested insets in
bool tmp = refreshInside;
// Row signature; has row changed since last paint?
- lyx::size_type const row_sig = calculateRowSignature(*rit, par, x, y);
+ size_type const row_sig = calculateRowSignature(*rit, par, x, y);
bool row_has_changed = par.rowSignature()[rowno] != row_sig;
bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
bool const inside = (y + rit->descent() >= 0
&& y - rit->ascent() < ww);
- RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
+ RowPainter rp(pi, text, pit, *rit, x, y);
// Clear background of this row
// (if paragraph background was not cleared)
if (!repaintAll &&
Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
}
- if (vi.p2 < lyx::pit_type(text.paragraphs().size()) - 1) {
+ if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
text.redoParagraph(vi.p2 + 1);
bv.coordCache().parPos()[&text][vi.p2 + 1] =
Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
y += text.getPar(pit).descent();
}
}
+
+
+} // namespace lyx