#include "BufferView.h"
#include "Changes.h"
#include "Encoding.h"
-#include "support/gettext.h"
#include "Language.h"
#include "Layout.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
#include "ParagraphMetrics.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "TextMetrics.h"
#include "VSpace.h"
#include "insets/InsetText.h"
#include "support/debug.h"
+#include "support/gettext.h"
#include "support/textutils.h"
#include "support/lassert.h"
pars_(text.paragraphs()),
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
pm_(text_metrics_.parMetrics(pit)),
- bidi_(bidi), erased_(pi_.erased_),
+ bidi_(bidi), change_(pi_.change_),
xo_(x), yo_(y), width_(text_metrics_.width())
{
bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
FontInfo RowPainter::labelFont() const
{
- return text_.labelFont(pi_.base.bv->buffer(), par_);
+ FontInfo f = text_.labelFont(par_);
+ // selected text?
+ if (row_.begin_margin_sel || pi_.selected)
+ f.setPaintColor(Color_selectiontext);
+ return f;
}
pi_.base.bv->buffer().params().getFont().fontInfo() :
font.fontInfo();
pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
- pi_.erased_ = erased_ || par_.isDeleted(pos);
- pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
+ pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
+
+ int const x1 = int(x_);
+ pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
// insets are painted completely. Recursive
- inset->drawBackground(pi_, int(x_), yo_);
- inset->drawSelection(pi_, int(x_), yo_);
- inset->draw(pi_, int(x_), yo_);
+ inset->drawBackground(pi_, x1, yo_);
+ inset->drawSelection(pi_, x1, yo_);
+ inset->draw(pi_, x1, yo_);
Dimension const & dim = pm_.insetDimension(inset);
pi_.full_repaint = pi_full_repaint;
#ifdef DEBUG_METRICS
- int const x1 = int(x_ - dim.width());
- Dimension dim2;
- LASSERT(max_witdh_ > 0, /**/);
- int right_margin = text_metrics_.rightMargin(pm_);
- int const w = max_witdh_ - leftMargin() - right_margin;
- MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
- inset->metrics(mi, dim2);
- if (dim.wid != dim2.wid)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw width " << dim.width()
- << "> metrics width " << dim2.wid << "." << endl;
- if (dim->asc != dim2.asc)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw ascent " << dim.ascent()
- << "> metrics ascent " << dim2.asc << "." << endl;
- if (dim2.descent() != dim.des)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw ascent " << dim.descent()
- << "> metrics descent " << dim2.des << "." << endl;
- LASSERT(dim2.wid == dim.wid, /**/);
- LASSERT(dim2.asc == dim.asc, /**/);
- LASSERT(dim2.des == dim.des, /**/);
int const x2 = x1 + dim.wid;
int const y1 = yo_ + dim.des;
int const y2 = yo_ - dim.asc;
Change const & change_running = par_.lookupChange(pos);
// selected text?
- bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+ bool const selection = (pos >= row_.sel_beg && pos < row_.sel_end)
+ || pi_.selected;
+
+ // spelling correct?
+ bool const spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
char_type prev_char = ' ';
// collect as much similar chars as we can
// Selection ends or starts here.
break;
+ bool const new_spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+ if (new_spell_state != spell_state)
+ // Spell checker state changed here.
+ break;
+
Change const & change = par_.lookupChange(pos);
if (!change_running.isSimilarTo(change))
// Track change type or author has changed.
FontInfo copy = font;
if (change_running.changed())
- copy.setColor(change_running.color());
+ copy.setPaintColor(change_running.color());
else if (selection)
- copy.setColor(Color_selectiontext);
+ copy.setPaintColor(Color_selectiontext);
x_ += pi_.pain.text(int(x_), yo_, s, copy);
}
}
-void RowPainter::paintFromPos(pos_type & vpos)
+void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
+{
+ // derive the offset from zoom factor specified by user in percent
+ // if changed the misspelled marker gets placed slightly lower than normal
+ // to avoid drawing at the same vertical offset
+ int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent]
+ int const y = yo_ + desc + (changed ? offset : 0);
+ pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 1.0);
+}
+
+
+void RowPainter::paintFromPos(pos_type & vpos, bool changed)
{
pos_type const pos = bidi_.vis2log(vpos);
Font const orig_font = text_metrics_.displayFont(pit_, pos);
bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
lang == "farsi";
+ // spelling correct?
+ bool const misspelled_ =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+
// draw as many chars as we can
if ((!hebrew && !arabic)
|| (hebrew && !Encodings::isHebrewComposeChar(c))
}
paintForeignMark(orig_x, orig_font.language());
+
+ if (lyxrc.spellcheck_continuously && misspelled_) {
+ paintMisspelledMark(orig_x, 2, changed);
+ }
}
void RowPainter::paintAppendix()
{
// only draw the appendix frame once (for the main text)
- if (!par_.params().appendix() || !text_.isMainText(pi_.base.bv->buffer()))
+ if (!par_.params().appendix() || !text_.isMainText())
return;
int y = yo_ - row_.ascent();
int const w = nestMargin() / 5;
int x = int(xo_) + w * i;
// only consider the changebar space if we're drawing outermost text
- if (text_.isMainText(pi_.base.bv->buffer()))
+ if (text_.isMainText())
x += changebarMargin();
int const starty = yo_ - row_.ascent();
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = par_.params();
+ ParagraphParameters const & pparams = par_.params();
+ Buffer const & buffer = pi_.base.bv->buffer();
+ BufferParams const & bparams = buffer.params();
+ Layout const & layout = par_.layout();
int y_top = 0;
// start of appendix?
- if (parparams.startOfAppendix())
+ if (pparams.startOfAppendix())
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
- Buffer const & buffer = pi_.base.bv->buffer();
- Layout const & layout = par_.layout();
-
- if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
- if (pit_ != 0) {
- if (layout.latextype == LATEX_PARAGRAPH
- && !par_.getDepth()) {
- y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
- } else {
- Layout const & playout = pars_[pit_ - 1].layout();
- if (playout.latextype == LATEX_PARAGRAPH
- && !pars_[pit_ - 1].getDepth()) {
- // is it right to use defskip here, too? (AS)
- y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
- }
+ if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+ && pit_ != 0) {
+ if (layout.latextype == LATEX_PARAGRAPH
+ && !par_.getDepth()) {
+ y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
+ } else {
+ Layout const & playout = pars_[pit_ - 1].layout();
+ if (playout.latextype == LATEX_PARAGRAPH
+ && !pars_[pit_ - 1].getDepth()) {
+ // is it right to use defskip here, too? (AS)
+ y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
}
}
}
- bool const is_rtl = text_.isRTL(buffer, par_);
- bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+ bool const is_rtl = text_.isRTL(par_);
+ bool const is_seq = text_.isFirstInSequence(pit_);
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
// should we print a label?
// the top.
if (layout.counter == "chapter") {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault()) {
+ spacing_val = pparams.spacing().getValue();
} else {
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
}
int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
docstring const str = par_.labelString();
if (!str.empty()) {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault())
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault())
+ spacing_val = pparams.spacing().getValue();
else
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
FontMetrics const & fm = theFontMetrics(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()
{
- bool const is_rtl = text_.isRTL(pi_.base.bv->buffer(), par_);
- int const endlabel = getEndLabel(pit_, text_.paragraphs());
+ bool const is_rtl = text_.isRTL(par_);
+ int const endlabel = getEndLabel(pit_, text_);
// paint imaginary end-of-paragraph character
FontMetrics const & fm =
theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const length = fm.maxAscent() / 2;
- ColorCode col = change.color();
+ Color col = change.color();
pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
- Painter::line_solid, Painter::line_thick);
+ 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, Painter::line_thick);
+ 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, Painter::line_thick);
+ yo_ + 2, col, Painter::line_solid, 3);
}
-
}
// draw an endlabel
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
- double const x = is_rtl ?
- x_ - fm.width(str)
- : - text_metrics_.rightMargin(pm_) - row_.width();
+ double const x = is_rtl ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}
case END_LABEL_NO_LABEL:
+ if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
+ docstring const s = docstring(1, char_type(0x00B6));
+ FontInfo f = FontInfo();
+ FontMetrics const & fm = theFontMetrics(f);
+ f.setColor(Color_paragraphmarker);
+ pi_.pain.text(int(x_), yo_, s, f);
+ x_ += fm.width(s);
+ }
break;
}
}
void RowPainter::paintOnlyInsets()
{
+ CoordCache const & cache = pi_.base.bv->coordCache();
pos_type const end = row_.endpos();
for (pos_type pos = row_.pos(); pos != end; ++pos) {
// If outer row has changed, nested insets are repaint completely.
Inset const * inset = par_.getInset(pos);
if (!inset)
continue;
- if (x_ > pi_.base.bv->workWidth())
+ if (x_ > pi_.base.bv->workWidth()
+ || !cache.getInsets().has(inset))
continue;
- x_ = pi_.base.bv->coordCache().getInsets().x(inset);
+ x_ = cache.getInsets().x(inset);
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
+ && cur.normalAnchor().text() == &text_)
pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
Inset const * inset = par_.getInset(pos);
bool const highly_editable_inset = inset
- && inset->editable() == Inset::HIGHLY_EDITABLE;
+ && inset->editable();
// If we reach the end of a change or if the author changes, paint it.
// We also don't paint across things like tables
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid,
- Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
// Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) {
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
+ && cur.normalAnchor().text() == &text_)
pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
} else {
// paint as many characters as possible.
- paintFromPos(vpos);
+ paintFromPos(vpos, change_running.changed());
}
// Is the inline completion after character?
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
change_running.setUnchanged();
}
}
projects / lyx.git / blobdiff