Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index e911feff113587b8a803cc7ad4f745cfa92c7dc2..b85ef3d18b05bfb853efe9ddd911c33ac9dcec89 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -425,6 +425,7 @@ bool Row::sameString(Font const & f, Change const & ch) const
 }
 
 
+// FIXME: remove this and move the changebar update to Row::push_back()
 void Row::finalizeLast()
 {
        if (elements_.empty())
@@ -509,15 +510,14 @@ void Row::addMarginSpace(pos_type const pos, int const width,
 
 void Row::push_back(Row::Element const & e)
 {
-       dim_.wid += e.dim.wid + ((e.type == INSET) ? e.extra : 0);
+       dim_.wid += e.dim.wid;
        elements_.push_back(e);
 }
 
 
 void Row::pop_back()
 {
-       Element const & e = elements_.back();
-       dim_.wid -= e.dim.wid + ((e.type == INSET) ? e.extra : 0);
+       dim_.wid -= elements_.back().dim.wid;
        elements_.pop_back();
 }
 
@@ -574,9 +574,9 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
                --cit_brk;
                // make a copy of the element to work on it.
                Element brk = *cit_brk;
-               /* If the current element is an inset that allows breaking row
-                * after itself, and if the row is already short enough after
-                * this element, then cut right after it.
+               /* If the current element allows breaking row after itself,
+                * and if the row is already short enough after this element,
+                * then cut right after it.
                 */
                if (wid_brk <= max_width && brk.row_flags & CanBreakAfter) {
                        end_ = brk.endpos;
@@ -586,9 +586,9 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
                }
                // assume now that the current element is not there
                wid_brk -= brk.dim.wid;
-               /* If the current element is an inset that allows breaking row
-                * before itself, and if the row is already short enough before
-                * this element, then cut right before it.
+               /* If the current element allows breaking row before itself,
+                * and if the row is already short enough before this element,
+                * then cut right before it.
                 */
                if (wid_brk <= max_width && brk.row_flags & CanBreakBefore && cit_brk != beg) {
                        end_ = (cit_brk -1)->endpos;
@@ -604,24 +604,26 @@ Row::Elements Row::shortenIfNeeded(int const max_width, int const next_width)
                 */
                int const split_width =  min(max_width - wid_brk, brk.dim.wid - 2);
                if (brk.splitAt(split_width, next_width, BEST_EFFORT, tail)) {
-                       // if we did not manage to fit a part of the element into
-                       // the split_width limit, at least remember that we can
-                       // shorten the row if needed.
-                       if (brk.dim.wid > split_width) {
-                               min_row_wid = wid_brk + brk.dim.wid;
-                               tail.clear();
-                               continue;
-                       }
                        /* if this element originally did not cause a row overflow
                         * in itself, and the remainder of the row would still be
                         * too large after breaking, then we will have issues in
-                        * next row. Thus breaking does not help.
+                        * next row. Thus breaking here does not help.
                         */
                        if (wid_brk + cit_brk->dim.wid < max_width
                            && min_row_wid - (wid_brk + brk.dim.wid) >= next_width) {
                                tail.clear();
                                break;
                        }
+                       /* if we did not manage to fit a part of the element into
+                        * the split_width limit, at least remember that we can
+                        * shorten the row if needed.
+                        */
+                       if (brk.dim.wid > split_width) {
+                               min_row_wid = wid_brk + brk.dim.wid;
+                               tail.clear();
+                               continue;
+                       }
+                       // We have found a proper place where to break this string element.
                        end_ = brk.endpos;
                        *cit_brk = brk;
                        dim_.wid = wid_brk + brk.dim.wid;