]> git.lyx.org Git - lyx.git/blobdiff - src/rowpainter.cpp
Add missing space in front of edition in generated bibentry.
[lyx.git] / src / rowpainter.cpp
index bcbf6da6fbbb2c4500c90f351b2a01d7dc2025cd..cfa7f516d4c462e4eb1b47f29ac201ad0dc5a9b5 100644 (file)
@@ -54,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),
@@ -90,8 +91,8 @@ RowPainter::RowPainter(PainterInfo & pi,
        //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()));
 }
 
 
@@ -128,6 +129,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        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_);
@@ -147,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;
@@ -235,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 == '(')
@@ -324,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 = ')';
@@ -358,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)
 {
@@ -547,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
@@ -573,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);
 }
 
 
@@ -920,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;
 
@@ -1081,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);