#include "support/debug.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/lyxalgo.h"
+#include "support/lyxlib.h"
+#include <algorithm>
#include <ostream>
using namespace std;
x += cit->full_width();
++cit;
}
- return int(x + 0.5);
+ return support::iround(x);
}
else
break;
}
- return int(x + 0.5);
+ return support::iround(x);
}
--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
*
* 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