X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=cfa7f516d4c462e4eb1b47f29ac201ad0dc5a9b5;hb=7303f0caad297d4aacc3e83f43ec0565496f6dd8;hp=27ea7b1b6bb06fda25f2c69a16213672eaaba46b;hpb=48b071d983e9c112f684d19731deaa89e8f9ee50;p=lyx.git diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp index 27ea7b1b6b..cfa7f516d4 100644 --- a/src/rowpainter.cpp +++ b/src/rowpainter.cpp @@ -38,6 +38,8 @@ #include "insets/InsetText.h" +#include "mathed/InsetMath.h" + #include "support/debug.h" #include "support/gettext.h" #include "support/textutils.h" @@ -52,6 +54,7 @@ namespace lyx { using frontend::Painter; using frontend::FontMetrics; + RowPainter::RowPainter(PainterInfo & pi, Text const & text, pit_type pit, Row const & row, Bidi & bidi, int x, int y) : pi_(pi), text_(text), @@ -60,24 +63,36 @@ RowPainter::RowPainter(PainterInfo & pi, row_(row), pit_(pit), par_(text.paragraphs()[pit]), pm_(text_metrics_.parMetrics(pit)), bidi_(bidi), change_(pi_.change_), - xo_(x), yo_(y), width_(text_metrics_.width()) + xo_(x), yo_(y), width_(text_metrics_.width()), + solid_line_thickness_(1.0), solid_line_offset_(1), + dotted_line_thickness_(1.0), dotted_line_offset_(2) { - // derive the line thickness from zoom factor - // the zoom is given in percent - double const scale_ = lyxrc.zoom / 100.0; - bidi_.computeTables(par_, pi_.base.bv->buffer(), row_); - // (increase thickness at 150%, 250% etc.) - line_thickness_ = scale_ < 1.0 ? 1.0 : int(scale_ + 0.5); - line_offset_ = int(1.5 * line_thickness_) + (scale_ < 1.0 ? 1 : 2); + + if (lyxrc.zoom >= 200) { + // derive the line thickness from zoom factor + // the zoom is given in percent + // (increase thickness at 250%, 450% etc.) + solid_line_thickness_ = (float)(int((lyxrc.zoom + 50) / 200.0)); + // adjust line_offset_ too + solid_line_offset_ = 1 + int(0.5 * solid_line_thickness_); + } + if (lyxrc.zoom >= 100) { + // derive the line thickness from zoom factor + // the zoom is given in percent + // (increase thickness at 150%, 250% etc.) + dotted_line_thickness_ = (float)(int((lyxrc.zoom + 50) / 100.0)); + // adjust line_offset_ too + dotted_line_offset_ = int(0.5 * dotted_line_thickness_) + 1; + } x_ = row_.x + xo_; //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl; //row_.dump(); - LASSERT(pit >= 0, /**/); - LASSERT(pit < int(text.paragraphs().size()), /**/); + LBUFERR(pit >= 0); + LBUFERR(pit < int(text.paragraphs().size())); } @@ -111,12 +126,10 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos) // requires a full repaint bool pi_full_repaint = pi_.full_repaint; - // FIXME: We should always use font, see documentation of - // noFontChange() in Inset.h. - pi_.base.font = inset->noFontChange() ? - pi_.base.bv->buffer().params().getFont().fontInfo() : - font.fontInfo(); + pi_.base.font = inset->inheritFont() ? font.fontInfo() : + pi_.base.bv->buffer().params().getFont().fontInfo(); pi_.ltr_pos = (bidi_.level(pos) % 2 == 0); + Change prev_change = change_; pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos); int const x1 = int(x_); @@ -136,6 +149,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos) // Restore full_repaint status. pi_.full_repaint = pi_full_repaint; + pi_.change_ = prev_change; #ifdef DEBUG_METRICS int const x2 = x1 + dim.wid; @@ -224,6 +238,8 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font, str.reserve(100); str.push_back(prev_char); + // FIXME: Why only round brackets and why the difference to + // Hebrew? See also Paragraph::getUChar if (arabic) { char_type c = str[0]; if (c == '(') @@ -256,9 +272,9 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font, // Maybe a more general fix would be draw character by character // for some predefined fonts on some platform. In arabic and // Hebrew we already do paint this way. - if (prev_char == 'f') + if (prev_char == 'f' || lyxrc.force_paint_single_char) break; - + pos = bidi_.vis2log(vpos); if (pos < font_span.first || pos > font_span.last) break; @@ -313,6 +329,8 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font, break; */ + // FIXME: Why only round brackets and why the difference to + // Hebrew? See also Paragraph::getUChar if (arabic) { if (c == '(') c = ')'; @@ -347,6 +365,14 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font, } +void RowPainter::paintSeparator(double orig_x, double width, + FontInfo const & font) +{ + pi_.pain.textDecoration(font, int(orig_x), yo_, int(width)); + x_ += width; +} + + void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc) { @@ -357,9 +383,9 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang, if (lang == pi_.base.bv->buffer().params().language) return; - int const y = yo_ + 1 + desc + int(line_thickness_/2); + int const y = yo_ + solid_line_offset_ + desc + int(solid_line_thickness_/2); pi_.pain.line(int(orig_x), y, int(x_), y, Color_language, - Painter::line_solid, line_thickness_); + Painter::line_solid, solid_line_thickness_); } @@ -367,9 +393,11 @@ void RowPainter::paintMisspelledMark(double orig_x, bool changed) { // if changed the misspelled marker gets placed slightly lower than normal // to avoid drawing at the same vertical offset - int const y = yo_ + (changed ? line_thickness_ + 1 : 0) + line_offset_; - pi_.pain.line(int(orig_x), y, int(x_), y, Color_error, - Painter::line_onoffdash, line_thickness_); + float const y = yo_ + solid_line_offset_ + solid_line_thickness_ + + (changed ? solid_line_thickness_ + 1 : 0) + + dotted_line_offset_; + pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error, + Painter::line_onoffdash, dotted_line_thickness_); } @@ -389,7 +417,7 @@ void RowPainter::paintFromPos(pos_type & vpos, bool changed) lang == "farsi"; // spelling correct? - bool const misspelled_ = + bool const misspelled = lyxrc.spellcheck_continuously && par_.isMisspelled(pos); // draw as many chars as we can @@ -405,8 +433,23 @@ void RowPainter::paintFromPos(pos_type & vpos, bool changed) paintForeignMark(orig_x, orig_font.language()); - if (lyxrc.spellcheck_continuously && misspelled_) { - paintMisspelledMark(orig_x, changed); + if (lyxrc.spellcheck_continuously && misspelled) { + // check for cursor position + // don't draw misspelled marker for words at cursor position + // we don't want to disturb the process of text editing + BufferView const * bv = pi_.base.bv; + DocIterator const nw = bv->cursor().newWord(); + bool new_word = false; + if (!nw.empty() && par_.id() == nw.paragraph().id()) { + pos_type cpos = nw.pos(); + if (cpos > 0 && cpos == par_.size() && !par_.isWordSeparator(cpos-1)) + --cpos; + else if (cpos > 0 && par_.isWordSeparator(cpos)) + --cpos; + new_word = par_.isSameSpellRange(pos, cpos) ; + } + if (!new_word) + paintMisspelledMark(orig_x, changed); } } @@ -519,15 +562,13 @@ int RowPainter::paintAppendixStart(int y) void RowPainter::paintFirst() { - ParagraphParameters const & pparams = par_.params(); - Buffer const & buffer = pi_.base.bv->buffer(); - BufferParams const & bparams = buffer.params(); + BufferParams const & bparams = pi_.base.bv->buffer().params(); Layout const & layout = par_.layout(); int y_top = 0; // start of appendix? - if (pparams.startOfAppendix()) + if (par_.params().startOfAppendix()) y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight()); if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation @@ -545,94 +586,79 @@ void RowPainter::paintFirst() } } - bool const is_rtl = text_.isRTL(par_); - bool const is_seq = text_.isFirstInSequence(pit_); + bool const is_first = + text_.isFirstInSequence(pit_) || !layout.isParagraphGroup(); //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl; - // should we print a label? - if (layout.labeltype >= LABEL_STATIC - && (layout.labeltype != LABEL_STATIC - || layout.latextype != LATEX_ENVIRONMENT - || is_seq)) { + if (layout.labelIsInline() + && (layout.labeltype != LABEL_STATIC || is_first)) { + paintLabel(); + } else if (is_first && layout.labelIsAbove()) { + paintTopLevelLabel(); + } +} - FontInfo const font = labelFont(); - FontMetrics const & fm = theFontMetrics(font); - docstring const str = par_.labelString(); - if (!str.empty()) { - double x = x_; - - // 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") { - double spacing_val = 1.0; - if (!pparams.spacing().isDefault()) { - spacing_val = pparams.spacing().getValue(); - } else { - spacing_val = bparams.spacing().getValue(); - } - - int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val); - - int const maxdesc = int(fm.maxDescent() * layout.spacing.getValue() * spacing_val) - + int(layout.parsep) * defaultRowHeight(); - - if (is_rtl) { - x = width_ - leftMargin() - - fm.width(str); - } - - pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font); - } else { - if (is_rtl) { - x = width_ - leftMargin() - + fm.width(layout.labelsep); - } else { - x = x_ - fm.width(layout.labelsep) - - fm.width(str); - } - - pi_.pain.text(int(x), yo_, str, font); - } - } +void RowPainter::paintLabel() +{ + docstring const str = par_.labelString(); + if (str.empty()) + return; - // the labels at the top of an environment. - // More or less for bibliography - } else if (is_seq && - (layout.labeltype == LABEL_TOP_ENVIRONMENT || - layout.labeltype == LABEL_BIBLIO || - layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) { - FontInfo const font = labelFont(); - docstring const str = par_.labelString(); - if (!str.empty()) { - double spacing_val = 1.0; - if (!pparams.spacing().isDefault()) - spacing_val = pparams.spacing().getValue(); - else - spacing_val = bparams.spacing().getValue(); - - FontMetrics const & fm = theFontMetrics(font); - - int const labeladdon = int(fm.maxHeight() - * layout.spacing.getValue() * spacing_val); - - int maxdesc = - int(fm.maxDescent() * layout.spacing.getValue() * spacing_val - + (layout.labelbottomsep * defaultRowHeight())); - - double x = x_; - if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) { - if (is_rtl) - x = leftMargin(); - x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2; - x -= fm.width(str) / 2; - } else if (is_rtl) { - x = width_ - leftMargin() - fm.width(str); - } - pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font); - } + bool const is_rtl = text_.isRTL(par_); + Layout const & layout = par_.layout(); + FontInfo const font = labelFont(); + FontMetrics const & fm = theFontMetrics(font); + double x = x_; + + if (is_rtl) { + x = width_ - leftMargin() + + fm.width(layout.labelsep); + } else { + x = x_ - fm.width(layout.labelsep) + - fm.width(str); + } + + pi_.pain.text(int(x), yo_, str, font); +} + + +void RowPainter::paintTopLevelLabel() +{ + BufferParams const & bparams = pi_.base.bv->buffer().params(); + bool const is_rtl = text_.isRTL(par_); + ParagraphParameters const & pparams = par_.params(); + Layout const & layout = par_.layout(); + FontInfo const font = labelFont(); + docstring const str = par_.labelString(); + if (str.empty()) + return; + + double spacing_val = 1.0; + if (!pparams.spacing().isDefault()) + spacing_val = pparams.spacing().getValue(); + else + spacing_val = bparams.spacing().getValue(); + + FontMetrics const & fm = theFontMetrics(font); + + int const labeladdon = int(fm.maxHeight() + * layout.spacing.getValue() * spacing_val); + + int maxdesc = + int(fm.maxDescent() * layout.spacing.getValue() * spacing_val + + (layout.labelbottomsep * defaultRowHeight())); + + double x = x_; + if (layout.labeltype == LABEL_CENTERED) { + if (is_rtl) + x = leftMargin(); + x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2; + x -= fm.width(str) / 2; + } else if (is_rtl) { + x = width_ - leftMargin() - fm.width(str); } + pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font); } @@ -750,7 +776,10 @@ void RowPainter::paintOnlyInsets() // If outer row has changed, nested insets are repaint completely. Inset const * inset = par_.getInset(pos); bool const nested_inset = inset && - (inset->asInsetText() || inset->asInsetTabular()); + ((inset->asInsetMath() && + !inset->asInsetMath()->asMacroTemplate()) + || inset->asInsetText() + || inset->asInsetTabular()); if (!nested_inset) continue; if (x_ > pi_.base.bv->workWidth() @@ -862,10 +891,10 @@ void RowPainter::paintText() // Calculate 1/3 height of the buffer's default font FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont()); - int const y_bar = change_running.deleted() ? - yo_ - fm.maxAscent() / 3 : yo_ + line_offset_; - pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, - change_running.color(), Painter::line_solid, line_thickness_); + float const y_bar = change_running.deleted() ? + yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_; + pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar), + change_running.color(), Painter::line_solid, solid_line_thickness_); // Change might continue with a different author or type if (change.changed() && !highly_editable_inset) { @@ -889,9 +918,10 @@ void RowPainter::paintText() if (par_.isSeparator(pos)) { Font const orig_font = text_metrics_.displayFont(pit_, pos); double const orig_x = x_; - x_ += width_pos; + double separator_width = width_pos; if (pos >= body_pos) - x_ += row_.separator; + separator_width += row_.separator; + paintSeparator(orig_x, separator_width, orig_font.fontInfo()); paintForeignMark(orig_x, orig_font.language()); ++vpos; @@ -922,10 +952,10 @@ void RowPainter::paintText() if (change_running.changed()) { FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont()); - int const y_bar = change_running.deleted() ? - yo_ - fm.maxAscent() / 3 : yo_ + line_offset_; - pi_.pain.line(change_last_x, y_bar, int(x_), y_bar, - change_running.color(), Painter::line_solid, line_thickness_); + float const y_bar = change_running.deleted() ? + yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_; + pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar), + change_running.color(), Painter::line_solid, solid_line_thickness_); change_running.setUnchanged(); } } @@ -1050,13 +1080,13 @@ void RowPainter::paintInlineCompletion(Font const & font) swap(c1, c2); } - if (s1.size() > 0) { + if (!s1.empty()) { f.setColor(c1); pi_.pain.text(int(x_), yo_, s1, f); x_ += theFontMetrics(font).width(s1); } - if (s2.size() > 0) { + if (!s2.empty()) { f.setColor(c2); pi_.pain.text(int(x_), yo_, s2, f); x_ += theFontMetrics(font).width(s2);