bool ragged_last)
{
/* if there is a forced break, this reduces to 2 1-page problems */
- for (vsize i = 0; i < lines.size () - 1; i++)
+ for (vsize i = 0; i + 1 < lines.size (); i++)
if (lines[i].page_permission_ == ly_symbol2scm ("force"))
{
vector<Line_details> lines1 (lines.begin (), lines.begin () + i + 1);
if (ragged || ragged_last)
page2_force[page2_force.size () - 1 - i] =
- (page2.force_ < 0 && i < page1_force.size () - 1) ? infinity_f : 0;
+ (page2.force_ < 0 && i + 1 < page1_force.size ()) ? infinity_f : 0;
else
page2_force[page2_force.size () - 1 - i] = page2.force_;
}
+ ((cur_rod_height > 0) ? lines[i].padding_: 0);
if ((next_height > page_height && cur_rod_height > 0)
- || (i < lines.size () - 1 && lines[i].page_permission_ == ly_symbol2scm ("force")))
+ || (i + 1 < lines.size () && lines[i].page_permission_ == ly_symbol2scm ("force")))
{
ret++;
cur_rod_height = ext_len + (rag ? lines[i].space_ : 0);