Remove boost/format support

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 05e1c97b2ac1c1cc42b875d66db8a95b0e84392a..fdf0da692672c78798b2feb956187108df06c0b8 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -443,12 +443,13 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                if (row_index == pm.rows().size())
                        pm.rows().push_back(Row());
                Row & row = pm.rows()[row_index];
+               row.pit(pit);
                row.pos(first);
                breakRow(row, right_margin, pit);
                setRowHeight(row, pit);
                row.setChanged(false);
                if (row_index || row.endpos() < par.size()
-                       || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE))
+                   || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) {
                        /* If there is more than one row or the row has been
                         * broken by a display inset or a newline, expand the text
                         * to the full allowable width. This setting here is
@@ -458,7 +459,9 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                         * that, and it triggers when using a caption in a
                         * longtable (see bugs #9945 and #9757).
                         */
-                       dim_.wid = max_width_;
+                       if (dim_.wid < max_width_)
+                               dim_.wid = max_width_;
+               }
                int const max_row_width = max(dim_.wid, row.width());
                computeRowMetrics(pit, row, max_row_width);
                first = row.endpos();
@@ -791,6 +794,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
        pos_type const pos = row.pos();
        pos_type const body_pos = par.beginOfBody();
        bool const is_rtl = text_->isRTL(par);
+       bool need_new_row = false;
 
        row.clear();
        row.left_margin = leftMargin(max_width_, pit, pos);
@@ -803,11 +807,6 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
        // the width available for the row.
        int const width = max_width_ - row.right_margin;
 
-       if (pos >= end) {
-               row.endpos(end);
-               return;
-       }
-
        ParagraphList const & pars = text_->paragraphs();
 
 #if 0
@@ -829,6 +828,9 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
        pos_type i = pos;
        FontIterator fi = FontIterator(*this, par, pit, pos);
        do {
+               // this can happen for an empty row after a newline
+               if (i >= end)
+                       break;
                char_type c = par.getChar(i);
                // The most special cases are handled first.
                if (par.isInset(i)) {
@@ -887,6 +889,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
                    || (!row.empty() && row.back().inset
                        && row.back().inset->display())) {
                        row.right_boundary(true);
+                       need_new_row = par.isNewline(i);
                        ++i;
                        break;
                }
@@ -898,7 +901,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
        row.endpos(i);
 
        // End of paragraph marker
-       if (lyxrc.paragraph_markers
+       if (lyxrc.paragraph_markers && !need_new_row
            && i == end && size_type(pit + 1) < pars.size()) {
                // add a virtual element for the end-of-paragraph
                // marker; it is shown on screen, but does not exist
@@ -1111,6 +1114,16 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
        int const xo = origin_.x_;
        x -= xo;
 
+       int offset = 0;
+       CursorSlice rowSlice(const_cast<InsetText &>(text_->inset()));
+       rowSlice.pit() = row.pit();
+       rowSlice.pos() = row.pos();
+
+       // Adapt to cursor row scroll offset if applicable.
+       if (bv_->currentRowSlice() == rowSlice)
+               offset = bv_->horizScrollOffset();
+       x += offset;
+
        pos_type pos = row.pos();
        boundary = false;
        if (row.empty())
@@ -1156,11 +1169,18 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
         * row is larger than the end of its last element.
         */
        if (!row.empty() && pos == row.back().endpos
-           && row.back().endpos == row.endpos())
-               boundary = true;
+           && row.back().endpos == row.endpos()) {
+               Inset const * inset = row.back().inset;
+               if (inset && (inset->lyxCode() == NEWLINE_CODE
+                             || inset->lyxCode() == SEPARATOR_CODE))
+                       pos = row.back().pos;
+               else
+                       boundary = row.right_boundary();
+       }
 
-       x += xo;
+       x += xo - offset;
        //LYXERR0("getPosNearX ==> pos=" << pos << ", boundary=" << boundary);
+
        return pos;
 }
 
@@ -1589,7 +1609,8 @@ bool TextMetrics::cursorEnd(Cursor & cur)
                        boundary = true;
                else
                        --end;
-       }
+       } else if (cur.paragraph().isEnvSeparator(end-1))
+               --end;
        return text_->setCursor(cur, cur.pit(), end, true, boundary);
 }