*/
#include <config.h>
-#include <algorithm>
#include "RowPainter.h"
#include "Row.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
+#include "ParagraphList.h"
#include "ParagraphParameters.h"
+#include "Text.h"
#include "TextMetrics.h"
-#include "VSpace.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include "insets/InsetText.h"
-
-#include "mathed/InsetMath.h"
-
#include "support/debug.h"
#include "support/gettext.h"
-#include "support/textutils.h"
-
#include "support/lassert.h"
-#include <boost/crc.hpp>
-#include <stdlib.h>
+#include <algorithm>
using namespace std;
Text const & text, Row const & row, int x, int y)
: pi_(pi), text_(text),
tm_(pi_.base.bv->textMetrics(&text)),
- pars_(text.paragraphs()),
row_(row), par_(text.paragraphs()[row.pit()]),
- change_(pi_.change_),
xo_(x), yo_(y)
{
x_ = row_.left_margin + xo_;
}
-FontInfo RowPainter::labelFont() const
+FontInfo RowPainter::labelFont(bool end) const
{
FontInfo f = text_.labelFont(par_);
// selected text?
- if (row_.begin_margin_sel || pi_.selected)
+ if ((end ? row_.end_margin_sel : row_.begin_margin_sel)
+ || pi_.selected)
f.setPaintColor(Color_selectiontext);
return f;
}
// requires a full repaint
bool const pi_full_repaint = pi_.full_repaint;
bool const pi_do_spellcheck = pi_.do_spellcheck;
- Change const pi_change = pi_.change_;
+ Change const pi_change = pi_.change;
pi_.base.font = e.inset->inheritFont() ? e.font.fontInfo() :
pi_.base.bv->buffer().params().getFont().fontInfo();
pi_.ltr_pos = !e.font.isVisibleRightToLeft();
- pi_.change_ = change_.changed() ? change_ : e.change;
+ pi_.change = pi_.change.changed() ? pi_.change : e.change;
pi_.do_spellcheck &= e.inset->allowSpellCheck();
int const x1 = int(x_);
e.inset->drawBackground(pi_, x1, yo_);
e.inset->drawSelection(pi_, x1, yo_);
e.inset->draw(pi_, x1, yo_);
+ paintTextDecoration(e);
// Restore full_repaint status.
pi_.full_repaint = pi_full_repaint;
- pi_.change_ = pi_change;
+ pi_.change = pi_change;
pi_.do_spellcheck = pi_do_spellcheck;
pi_.selected = pi_selected;
}
+void RowPainter::paintLanguageMarkings(Row::Element const & e) const
+{
+ paintForeignMark(e);
+ paintNoSpellingMark(e);
+}
+
+
void RowPainter::paintForeignMark(Row::Element const & e) const
{
Language const * lang = e.font.language();
return;
int const desc = e.inset ? e.dim.descent() : 0;
- int const y = yo_ + pi_.base.solidLineOffset()
- + desc + pi_.base.solidLineThickness() / 2;
- pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
+ int const y = yo_ + min(3 * pi_.base.solidLineOffset() / 2 + desc,
+ row_.descent() - 1);
+ pi_.pain.line(int(x_), y, int(x_ + e.full_width() - 1), y, Color_language,
Painter::line_solid, pi_.base.solidLineThickness());
}
+void RowPainter::paintNoSpellingMark(Row::Element const & e) const
+{
+ //if (!lyxrc.mark_no_spelling)
+ // return;
+ if (e.font.language() == latex_language)
+ return;
+ if (e.font.fontInfo().nospellcheck() != FONT_ON)
+ return;
+
+ // We at the same voffset than the misspelled mark, since
+ // these two are mutually exclusive
+ int const desc = e.inset ? e.dim.descent() : 0;
+ int y = yo_ + pi_.base.solidLineOffset() + desc
+ + pi_.base.solidLineThickness()
+ + (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
+ + 1;
+ // Make sure that the mark does not go below the row rectangle
+ y = min(y, yo_ + row_.descent() - 1);
+
+ pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
+ Painter::line_onoffdash, pi_.base.solidLineThickness());
+}
+
+
void RowPainter::paintMisspelledMark(Row::Element const & e) const
{
+ if (e.font.fontInfo().nospellcheck() == FONT_ON)
+ return;
// if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset
FontMetrics const & fm = theFontMetrics(e.font);
int const thickness = max(fm.lineWidth(), 2);
- int const y = yo_ + pi_.base.solidLineOffset() + pi_.base.solidLineThickness()
+ int y = yo_ + pi_.base.solidLineOffset() + pi_.base.solidLineThickness()
+ (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
+ 1 + thickness / 2;
+ // Make sure that the mark does not go below the row rectangle
+ y = min(y, yo_ + row_.descent() - 1);
//FIXME: this could be computed only once, it is probably not costly.
// check for cursor position
}
+void RowPainter::paintTextDecoration(Row::Element const & e) const
+{
+ // element selected?
+ bool const sel = (e.pos >= row_.sel_beg && e.endpos <= row_.sel_end)
+ || pi_.selected;
+ FontInfo copy = e.font.fontInfo();
+ if (sel || e.change.changed()) {
+ Color const col = e.change.changed() ? e.change.color()
+ : Color_selectiontext;
+ copy.setPaintColor(col);
+ }
+ pi_.pain.textDecoration(copy, int(x_), yo_, int(e.full_width()));
+}
+
+
void RowPainter::paintChange(Row::Element const & e) const
{
e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo());
void RowPainter::paintChangeBar() const
{
- int const height = tm_.isLastRow(row_)
- ? row_.ascent()
- : row_.height();
-
- pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color_changebar);
+ pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, row_.height(), Color_changebar);
}
void RowPainter::paintDepthBar() const
{
- depth_type depth = par_.getDepth();
-
- // We also mark follow-up paragraphs in a paragraph group
- if (par_.layout().isParagraphGroup()
- && !text_.isFirstInSequence(row_.pit()))
- ++depth;
+ depth_type const depth = par_.getDepth();
+ ParagraphList const & pars = text_.paragraphs();
if (depth <= 0)
return;
pit_type pit2 = row_.pit();
if (row_.pos() == 0)
--pit2;
- prev_depth = pars_[pit2].getDepth();
- // We also mark follow-up paragraphs in a paragraph group
- if (pars_[pit2].layout().isParagraphGroup()
- && !text_.isFirstInSequence(pit2))
- ++prev_depth;
+ prev_depth = pars[pit2].getDepth();
}
depth_type next_depth = 0;
if (!tm_.isLastRow(row_)) {
pit_type pit2 = row_.pit();
- if (row_.endpos() >= pars_[pit2].size())
+ if (row_.endpos() >= pars[pit2].size())
++pit2;
- next_depth = pars_[pit2].getDepth();
- // We also mark follow-up paragraphs in a paragraph group
- if (pars_[pit2].layout().isParagraphGroup()
- && !text_.isFirstInSequence(pit2))
- ++next_depth;
+ next_depth = pars[pit2].getDepth();
}
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
+ // consider the bufferview left margin if we're drawing outermost text
if (text_.isMainText())
- x += changebarMargin();
+ x += pi_.base.bv->leftMargin();
int const starty = yo_ - row_.ascent();
int const h = row_.height() - 1 - (i - next_depth - 1) * 3;
return;
Layout const & layout = par_.layout();
- FontInfo const font = labelFont();
+ FontInfo const font = labelFont(false);
FontMetrics const & fm = theFontMetrics(font);
- double x = x_;
+ int const x = row_.isRTL() ? row_.width() + fm.width(layout.labelsep)
+ : row_.left_margin - fm.width(layout.labelsep) - fm.width(str);
- if (row_.isRTL())
- x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
- else
- x = x_ - fm.width(layout.labelsep) - fm.width(str);
-
- pi_.pain.text(int(x), yo_, str, font);
+ pi_.pain.text(int(xo_) + x, yo_, str, font);
}
BufferParams const & bparams = pi_.base.bv->buffer().params();
ParagraphParameters const & pparams = par_.params();
Layout const & layout = par_.layout();
- FontInfo const font = labelFont();
+ FontInfo const font = labelFont(false);
docstring const str = par_.labelString();
if (str.empty())
return;
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
- x -= fm.width(str) / 2;
+ /* Currently, x points at row_.left_margin (which contains the
+ * indent). First remove that, and then center the title with
+ * respect to the left and right margins.
+ */
+ int const leftm = row_.isRTL() ? tm_.rightMargin(row_.pit())
+ : tm_.leftMargin(row_.pit());
+ int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit())
+ : tm_.rightMargin(row_.pit());
+ x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
+ - fm.width(str) / 2;
} else if (row_.isRTL()) {
- x = tm_.width() - row_.right_margin - fm.width(str);
+ x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
-/** Check if the current paragraph is the last paragraph in a
- proof environment */
-static int getEndLabel(pit_type p, Text const & text)
-{
- ParagraphList const & pars = text.paragraphs();
- pit_type pit = p;
- depth_type par_depth = pars[p].getDepth();
- while (pit != pit_type(pars.size())) {
- Layout const & layout = pars[pit].layout();
- int const endlabeltype = layout.endlabeltype;
-
- if (endlabeltype != END_LABEL_NO_LABEL) {
- if (p + 1 == pit_type(pars.size()))
- return endlabeltype;
-
- depth_type const next_depth =
- pars[p + 1].getDepth();
- if (par_depth > next_depth ||
- (par_depth == next_depth && layout != pars[p + 1].layout()))
- return endlabeltype;
- break;
- }
- if (par_depth == 0)
- break;
- pit = text.outerHook(pit);
- if (pit != pit_type(pars.size()))
- par_depth = pars[pit].getDepth();
- }
- return END_LABEL_NO_LABEL;
-}
-
-
void RowPainter::paintLast() const
{
- int const endlabel = getEndLabel(row_.pit(), text_);
-
- // paint imaginary end-of-paragraph character
-
- Change const & change = par_.lookupChange(par_.size());
- if (change.changed()) {
- FontMetrics const & fm =
- theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const length = fm.maxAscent() / 2;
- Color col = change.color();
-
- pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
- Painter::line_solid, 3);
-
- if (change.deleted()) {
- pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1 + length,
- yo_ + 2, col, Painter::line_solid, 3);
- } else {
- pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
- yo_ + 2, col, Painter::line_solid, 3);
- }
- }
-
- // draw an endlabel
-
+ int const endlabel = text_.getEndLabel(row_.pit());
switch (endlabel) {
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
- FontInfo const font = labelFont();
+ FontInfo font = labelFont(true);
+ if (font.realColor() != Color_selectiontext)
+ font.setPaintColor(Color_eolmarker);
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
int x = 0;
if (row_.isRTL()) {
int const normal_x = nestMargin() + changebarMargin();
- x = min(normal_x, row_.left_margin - size - Inset::TEXT_TO_INSET_OFFSET);
+ x = min(normal_x, row_.left_margin - size - Inset::textOffset(pi_.base.bv));
} else {
int const normal_x = tm_.width() - row_.right_margin
- - size - Inset::TEXT_TO_INSET_OFFSET;
+ - size - Inset::textOffset(pi_.base.bv);
x = max(normal_x, row_.width());
}
if (endlabel == END_LABEL_BOX)
- pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
+ pi_.pain.rectangle(int(xo_) + x, y, size, size, font.realColor());
else
- pi_.pain.fillRectangle(x, y, size, size, Color_eolmarker);
+ pi_.pain.fillRectangle(int(xo_) + x, y, size, size, font.realColor());
break;
}
case END_LABEL_STATIC: {
- FontInfo const font = labelFont();
+ FontInfo const font = labelFont(true);
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
double const x = row_.isRTL() ? x_ - fm.width(str) : x_;
void RowPainter::paintOnlyInsets()
{
- Row::const_iterator cit = row_.begin();
- Row::const_iterator const & end = row_.end();
- for ( ; cit != end ; ++cit) {
- Row::Element const & e = *cit;
+ for (Row::Element const & e : row_) {
if (e.type == Row::INSET) {
paintInset(e);
- // The line that indicates word in a different language
- paintForeignMark(e);
+ // The markings of foreign languages
+ // and of text ignored for spellchecking
+ paintLanguageMarkings(e);
// change tracking (not for insets that handle it themselves)
if (!e.inset->canPaintChange(*pi_.base.bv))
paintChange(e);
void RowPainter::paintText()
{
- Row::const_iterator cit = row_.begin();
- Row::const_iterator const & end = row_.end();
- for ( ; cit != end ; ++cit) {
- Row::Element const & e = *cit;
-
+ for (Row::Element const & e : row_) {
switch (e.type) {
case Row::STRING:
case Row::VIRTUAL:
break;
case Row::SPACE:
- pi_.pain.textDecoration(e.font.fontInfo(), int(x_), yo_, int(e.full_width()));
+ paintTextDecoration(e);
}
- // The line that indicates word in a different language
- paintForeignMark(e);
+ // The markings of foreign languages
+ // and of text ignored for spellchecking
+ paintLanguageMarkings(e);
// change tracking (not for insets that handle it themselves)
if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))