Unify naming of menu items

[features.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 1e9e3eca2bc7fc74a0af3fcf5bc740d00441352b..9ab7f110376c25e299bbf6167be797079ecc8538 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -26,8 +26,8 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace std;
@@ -480,6 +480,18 @@ bool Row::shortenIfNeeded(pos_type const keep, int const w, 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 it the row is already short enough after
+                * this inset, then cut right after this element.
+                */
+               if (wid_brk <= w && brk.type == INSET
+                   && brk.inset->rowFlags() & Inset::CanBreakAfter) {
+                       end_ = brk.endpos;
+                       dim_.wid = wid_brk;
+                       elements_.erase(cit_brk + 1, end);
+                       return true;
+               }
+               // assume now that the current element is not there
                wid_brk -= brk.dim.wid;
                /*
                 * Some Asian languages split lines anywhere (no notion of
@@ -489,9 +501,6 @@ bool Row::shortenIfNeeded(pos_type const keep, int const w, int const next_width
                 *
                 * FIXME: Something shall be done about characters which are
                 * not allowed at the beginning or end of line.
-                *
-                * FIXME: hardcoding languages is bad. Put this information in
-                * `languages' file.
                */
                bool const word_wrap = brk.font.language()->wordWrap();
                // When there is text before the body part (think description