public:
/// initialise and run painter
RowPainter(PainterInfo & pi, LyXText const & text,
- pit_type pit, Row & row, int x, int y);
+ pit_type pit, Row const & row, int x, int y);
// paint various parts
void paintAppendix();
void paintText();
private:
- void paintForeignMark(double orig_x, LyXFont const & orig_font);
- void paintHebrewComposeChar(lyx::pos_type & vpos);
- void paintArabicComposeChar(lyx::pos_type & vpos);
- void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
+ void paintForeignMark(double orig_x, LyXFont const & font);
+ 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,
+ bool hebrew, bool arabic);
int paintAppendixStart(int y);
void paintFromPos(lyx::pos_type & vpos);
- void paintInset(lyx::pos_type const pos);
+ void paintInset(lyx::pos_type const pos, LyXFont const & font);
/// return left margin
int leftMargin() const;
ParagraphList & pars_;
/// The row to paint
- Row & row_;
+ Row const & row_;
/// Row's paragraph
pit_type const pit_;
RowPainter::RowPainter(PainterInfo & pi,
- LyXText const & text, pit_type pit, Row & row, int x, int y)
+ LyXText const & text, pit_type pit, Row const & row, int x, int y)
: bv_(*pi.base.bv), pain_(pi.pain), text_(text), pars_(text.paragraphs()),
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
xo_(x), yo_(y), width_(text_.width())
/// "temporary"
LyXFont const RowPainter::getFont(pos_type pos) const
{
- return text_.getFont(par_, pos);
+ LyXFont pf(text_.getFont(par_, pos));
+ text_.applyOuterFont(pf);
+ return pf;
}
}
-void RowPainter::paintInset(pos_type const pos)
+void RowPainter::paintInset(pos_type const pos, LyXFont const & font)
{
InsetBase const * inset = par_.getInset(pos);
BOOST_ASSERT(inset);
PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
- pi.base.font = getFont(pos);
+ pi.base.font = font;
pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
- theCoords.insets_.add(inset, int(x_), yo_);
+ theCoords.insets().add(inset, int(x_), yo_);
inset->drawSelection(pi, int(x_), yo_);
inset->draw(pi, int(x_), yo_);
x_ += inset->width();
}
-void RowPainter::paintHebrewComposeChar(pos_type & vpos)
+void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
{
pos_type pos = text_.bidi.vis2log(vpos);
str += c;
++vpos;
- LyXFont const & font = getFont(pos);
int const width = font_metrics::width(c, font);
int dx = 0;
}
-void RowPainter::paintArabicComposeChar(pos_type & vpos)
+void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
{
pos_type pos = text_.bidi.vis2log(vpos);
string str;
str += c;
++vpos;
- LyXFont const & font = getFont(pos);
int const width = font_metrics::width(c, font);
int dx = 0;
}
-void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
+void RowPainter::paintChars(pos_type & vpos, LyXFont font,
+ bool hebrew, bool arabic)
{
pos_type pos = text_.bidi.vis2log(vpos);
pos_type const end = row_.endpos();
- LyXFont orig_font = getFont(pos);
+ std::pair<lyx::pos_type, lyx::pos_type> const font_span
+ = par_.getFontSpan(pos);
+ Change::Type const prev_change = par_.lookupChange(pos);
// first character
string str;
str[0] = par_.transformChar(c, pos);
}
- bool prev_struckout = isDeletedText(par_, pos);
- bool prev_newtext = isInsertedText(par_, pos);
-
// collect as much similar chars as we can
- for (++vpos; vpos < end && (pos = text_.bidi.vis2log(vpos)) >= 0; ++vpos) {
- char c = par_.getChar(pos);
-
- if (!IsPrintableNonspace(c))
+ for (++vpos ; vpos < end ; ++vpos) {
+ pos = text_.bidi.vis2log(vpos);
+ if (pos < font_span.first || pos > font_span.second)
break;
- if (prev_struckout != isDeletedText(par_, pos))
+ if (prev_change != par_.lookupChange(pos))
break;
- if (prev_newtext != isInsertedText(par_, pos))
+ char c = par_.getChar(pos);
+
+ if (!IsPrintableNonspace(c))
break;
if (arabic && Encodings::IsComposeChar_arabic(c))
if (hebrew && Encodings::IsComposeChar_hebrew(c))
break;
- if (orig_font != getFont(pos))
- break;
-
if (arabic)
c = par_.transformChar(c, pos);
str += c;
}
- if (prev_struckout)
- orig_font.setColor(LColor::strikeout);
- else if (prev_newtext)
- orig_font.setColor(LColor::newtext);
+ if (prev_change == Change::DELETED)
+ font.setColor(LColor::strikeout);
+ else if (prev_change == Change::INSERTED)
+ font.setColor(LColor::newtext);
// Draw text and set the new x position
//lyxerr << "paint row: yo_ " << yo_ << "\n";
- pain_.text(int(x_), yo_, str, orig_font);
- x_ += font_metrics::width(str, orig_font);
+ pain_.text(int(x_), yo_, str, font);
+ x_ += font_metrics::width(str, font);
}
-void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
+void RowPainter::paintForeignMark(double orig_x, LyXFont const & font)
{
if (!lyxrc.mark_foreign_language)
return;
- if (orig_font.language() == latex_language)
+ if (font.language() == latex_language)
return;
- if (orig_font.language() == bv_.buffer()->params().language)
+ if (font.language() == bv_.buffer()->params().language)
return;
int const y = yo_ + 1;
char const c = par_.getChar(pos);
if (c == Paragraph::META_INSET) {
- paintInset(pos);
+ paintInset(pos, orig_font);
++vpos;
paintForeignMark(orig_x, orig_font);
return;
if ((!hebrew && !arabic)
|| (hebrew && !Encodings::IsComposeChar_hebrew(c))
|| (arabic && !Encodings::IsComposeChar_arabic(c))) {
- paintChars(vpos, hebrew, arabic);
+ paintChars(vpos, orig_font, hebrew, arabic);
} else if (hebrew) {
- paintHebrewComposeChar(vpos);
+ paintHebrewComposeChar(vpos, orig_font);
} else if (arabic) {
- paintArabicComposeChar(vpos);
+ paintArabicComposeChar(vpos, orig_font);
}
paintForeignMark(orig_x, orig_font);
// start of appendix?
if (parparams.startOfAppendix())
- y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
+ y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
Buffer const & buffer = *bv_.buffer();
|| layout->latextype != LATEX_ENVIRONMENT
|| is_seq)) {
- LyXFont font = getLabelFont();
- if (!par_.getLabelstring().empty()) {
+ LyXFont const font = getLabelFont();
+ string const str = par_.getLabelstring();
+ if (!str.empty()) {
double x = x_;
- string const str = par_.getLabelstring();
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
// the top.
if (layout->counter == "chapter") {
- if (buffer.params().secnumdepth >= 0) {
- double spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
- } else {
- spacing_val = buffer.params().spacing().getValue();
- }
-#warning Look is this correct?
- int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
-
- int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
- + int(layout->parsep) * defaultRowHeight();
-
- if (is_rtl) {
- x = width_ - leftMargin() -
- font_metrics::width(str, font);
- }
-
- pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+ double spacing_val = 1.0;
+ if (!parparams.spacing().isDefault()) {
+ spacing_val = parparams.spacing().getValue();
+ } else {
+ spacing_val = buffer.params().spacing().getValue();
}
+#ifdef WITH_WARNINGS
+#warning Look is this correct?
+#endif
+ int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
+
+ int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+ + int(layout->parsep) * defaultRowHeight();
+
+ if (is_rtl) {
+ x = width_ - leftMargin() -
+ font_metrics::width(str, font);
+ }
+
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
} else {
if (is_rtl) {
x = width_ - leftMargin()
// if we reach the end of a struck out range, paint it
// we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
- // FIXME this should take real text height into account, not
- // the whole row including padding whitespace
- //int const middle = yo_ + (- row_.ascent() + row_.top_of_text()) / 2;
- int const middle = yo_ - row_.ascent() / 2;
+ // calculate 1/3 height of the buffer's default font
+ int const middle =
+ yo_ - font_metrics::maxAscent(text_.defaultfont_) / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
// if we reach the end of a struck out range, paint it
if (running_strikeout) {
- //top_of_text = font_metrics::maxAscent(font);
- //int const middle = yo_ - top_of_text() / 2;
- int const middle = yo_ - row_.ascent() / 2;
+ // calculate 1/3 height of the buffer's default font
+ int const middle =
+ yo_ - font_metrics::maxAscent(text_.defaultfont_) / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
static NullPainter nop;
static PainterInfo nullpi(pi.base.bv, nop);
int const ww = pi.base.bv->workHeight();
-
+
Paragraph & par = text.paragraphs()[pit];
- RowList::iterator const rb = par.rows().begin();
- RowList::iterator const re = par.rows().end();
- theCoords.pars_[&text][pit] = Point(x, y);
+ RowList::const_iterator const rb = par.rows().begin();
+ RowList::const_iterator const re = par.rows().end();
+ theCoords.parPos()[&text][pit] = Point(x, y);
y -= rb->ascent();
- for (RowList::iterator rit = rb; rit != re; ++rit) {
+ for (RowList::const_iterator rit = rb; rit != re; ++rit) {
y += rit->ascent();
bool const inside = (y + rit->descent() >= 0
&& y - rit->ascent() < ww);
RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
-
+
y += rit->descent();
rp.paintAppendix();
rp.paintDepthBar();
paintPar(pi, *bv.text(), pit, 0, yy);
yy += text->getPar(pit).descent();
}
-
+
// paint one paragraph above and one below
+ // Note MV: this cannot be suppressed even for singlepar.
+ // Try viewing the User Guide Mobius figure
if (vi.p1 > 0) {
text->redoParagraph(vi.p1 - 1);
paintPar(pi, *bv.text(), vi.p1 - 1, 0,
vi.y1 - text->getPar(vi.p1 - 1).descent());
}
- if (vi.p2 < text->paragraphs().size() - 1) {
+ if (vi.p2 < lyx::pit_type(text->paragraphs().size()) - 1) {
text->redoParagraph(vi.p2 + 1);
paintPar(pi, *bv.text(), vi.p2 + 1, 0,
vi.y2 + text->getPar(vi.p2 + 1).ascent());
}
// and grey out above (should not happen later)
- lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
+// lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
if (vi.y1 > 0)
pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea);
// and possibly grey out below
- lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
+// lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
if (vi.y2 < bv.workHeight())
pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
}