Correct date

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 423768f9bd48813b4eace31c3fdf26b5888162aa..6edde19e7548f11fa3b27122bd492a1e9e44f427 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -27,6 +27,7 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/textutils.h"
 
 #include <algorithm>
 #include <ostream>
@@ -42,19 +43,11 @@ using frontend::FontMetrics;
 static double const MAX_SPACE_STRETCH = 1.5; //em
 
 
-int Row::Element::countSeparators() const
-{
-       if (type != STRING)
-               return 0;
-       return count(str.begin(), str.end(), ' ');
-}
-
-
 int Row::Element::countExpanders() const
 {
        if (type != STRING)
                return 0;
-       return theFontMetrics(font).countExpanders(str);
+       return support::countExpanders(str);
 }
 
 
@@ -114,6 +107,7 @@ pos_type Row::Element::x2pos(int &x) const
                break;
        case INSET:
        case SPACE:
+       case MARGINSPACE:
                // those elements contain only one position. Round to
                // the closest side.
                if (x > (full_width() + 1) / 2) {
@@ -151,7 +145,7 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
                                                 isRTL(), wrap_any | force);
 
        // if breaking did not really work, give up
-       if (!force && breaks.front().wid > width) {
+       if (!force && breaks.front().nspc_wid > width) {
                if (dim.wid == 0)
                        dim.wid = fm.width(str);
                return false;
@@ -210,14 +204,13 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
 
 void Row::Element::rtrim()
 {
-       if (type != STRING)
+       if (type != STRING || str.empty() || !isSpace(str.back()))
                return;
        /* This is intended for strings that have been created by splitAt.
-        * They may have trailing spaces, but they are not counted in the
-        * string length (QTextLayout feature, actually). We remove them,
-        * and decrease endpos, since spaces at row break are invisible.
+        * If There is a trailing space, we remove it and decrease endpos,
+        * since spaces at row break are invisible.
         */
-       str = support::rtrim(str);
+       str.pop_back();
        endpos = pos + str.length();
        dim.wid = nspc_wid;
 }
@@ -313,6 +306,9 @@ ostream & operator<<(ostream & os, Row::Element const & e)
                break;
        case Row::SPACE:
                os << "SPACE: ";
+               break;
+       case Row::MARGINSPACE:
+               os << "MARGINSPACE: ";
        }
        os << "width=" << e.full_width() << ", row_flags=" << e.row_flags;
        return os;
@@ -340,7 +336,7 @@ ostream & operator<<(ostream & os, Row const & row)
           << " descent: " << row.dim_.des
           << " separator: " << row.separator
           << " label_hfill: " << row.label_hfill
-          << " right_boundary: " << row.right_boundary()
+          << " end_boundary: " << row.end_boundary()
           << " flushed: " << row.flushed() << "\n";
        // We cannot use the operator above, unfortunately
        double x = row.left_margin;
@@ -381,16 +377,6 @@ int Row::right_x() const
 }
 
 
-int Row::countSeparators() const
-{
-       int n = 0;
-       const_iterator const end = elements_.end();
-       for (const_iterator cit = elements_.begin() ; cit != end ; ++cit)
-               n += cit->countSeparators();
-       return n;
-}
-
-
 bool Row::setExtraWidth(int w)
 {
        if (w < 0)
@@ -456,12 +442,12 @@ void Row::add(pos_type const pos, Inset const * ins, Dimension const & dim,
 
 
 void Row::add(pos_type const pos, char_type const c,
-              Font const & f, Change const & ch, bool can_break)
+              Font const & f, Change const & ch)
 {
        if (!sameString(f, ch)) {
                finalizeLast();
                Element e(STRING, pos, f, ch);
-               e.row_flags = can_break ? CanBreakInside : Inline;
+               e.row_flags = CanBreakInside;
                elements_.push_back(e);
        }
        back().str += c;
@@ -498,6 +484,18 @@ void Row::addSpace(pos_type const pos, int const width,
 }
 
 
+void Row::addMarginSpace(pos_type const pos, int const width,
+                  Font const & f, Change const & ch)
+{
+       finalizeLast();
+       Element e(MARGINSPACE, pos, f, ch);
+       e.dim.wid = width;
+       e.row_flags = NoBreakBefore;
+       elements_.push_back(e);
+       dim_.wid += e.dim.wid;
+}
+
+
 void Row::push_back(Row::Element const & e)
 {
        dim_.wid += e.dim.wid;
@@ -521,7 +519,7 @@ void moveElements(Row::Elements & from, Row::Elements::iterator const & it,
        to.insert(to.end(), it, from.end());
        from.erase(it, from.end());
        if (!from.empty())
-               from.back().row_flags = (from.back().row_flags & ~AfterFlags) | BreakAfter;
+               from.back().row_flags = (from.back().row_flags & ~AfterFlags) | AlwaysBreakAfter;
 }
 
 }
@@ -564,7 +562,7 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
                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 inset, then cut right after this element.
+                * this element, then cut right after it.
                 */
                if (wid_brk <= w && brk.row_flags & CanBreakAfter) {
                        end_ = brk.endpos;
@@ -574,6 +572,16 @@ Row::Elements Row::shortenIfNeeded(int const w, 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 (wid_brk <= w && brk.row_flags & CanBreakBefore && cit_brk != beg) {
+                       end_ = (cit_brk -1)->endpos;
+                       dim_.wid = wid_brk;
+                       moveElements(elements_, cit_brk, tail);
+                       return tail;
+               }
                /* We have found a suitable separable element. This is the common case.
                 * Try to break it cleanly at a length that is both
                 * - less than the available space on the row
@@ -629,7 +637,9 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
                return tail;
        }
 
-       return Elements();
+       // cit == beg; remove all elements after the first one.
+       moveElements(elements_, cit + 1, tail);
+       return tail;
 }