anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not remove separators at end of rows.

Browse Source 
I am not sure why I addd this code at the time. I do not think there was a good reason.

Fixes bug #9447.
This commit is contained in:
Jean-Marc 2015-04-16 11:39:33 +02:00
parent d592ec06b9
commit bdaa6fbb26
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TextMetrics.cpp
View File

@ -777,7 +777,7 @@ private:
/** This is the function where the hard work is done. The code here is /** This is the function where the hard work is done. The code here is
* very sensitive to small changes :) Note that part of the * very sensitive to small changes :) Note that part of the
* intelligence is also in Row::shorten_if_needed * intelligence is also in Row::shortenIfNeeded.
*/ */
void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit) const void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit) const
{ {
@ -900,12 +900,6 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
// if the row is too large, try to cut at last separator. // if the row is too large, try to cut at last separator.
row.shortenIfNeeded(body_pos, width); row.shortenIfNeeded(body_pos, width);
// if the row ends with a separator that is not at end of
// paragraph, remove it
if (!row.empty() && row.back().type == Row::SEPARATOR
&& row.endpos() < par.size())
row.pop_back();
// make sure that the RTL elements are in reverse ordering // make sure that the RTL elements are in reverse ordering
row.reverseRTL(text_->isRTL(par)); row.reverseRTL(text_->isRTL(par));
} }