vector<Column_x_positions>
Constrained_breaking::best_solution (vsize start, vsize end)
{
- vsize min_systems = min_system_count (start, end);
+ vsize min_systems = min_system_count (start, end);
vsize max_systems = max_system_count (start, end);
Real best_demerits = infinity_f;
vector<Column_x_positions> best_so_far;
int
Constrained_breaking::max_system_count (vsize start, vsize end)
{
- vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end];
+ vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end];
return brk - starting_breakpoints_[start];
}
initialize ();
}
+static SCM
+min_permission (SCM perm1, SCM perm2)
+{
+ if (perm1 == ly_symbol2scm ("force"))
+ return perm2;
+ if (perm1 == ly_symbol2scm ("allow")
+ && perm2 != ly_symbol2scm ("force"))
+ return perm2;
+ return SCM_EOL;
+}
+
/* find the forces for all possible lines and cache ragged_ and ragged_right_ */
void
Constrained_breaking::initialize ()
ragged_right_);
for (vsize i = 0; i + 1 < breaks_.size (); i++)
{
- Real max_ext = 0;
for (vsize j = i + 1; j < breaks_.size (); j++)
{
int start = Paper_column::get_rank (all_[breaks_[i]]);
line.force_ = forces[i*breaks_.size () + j];
if (ragged && last && !isinf (line.force_))
- line.force_ = (line.force_ < 0) ? infinity_f : 0;
+ line.force_ = (line.force_ < 0 && j > i + 1) ? infinity_f : 0;
if (isinf (line.force_))
break;
line.break_permission_ = c->get_property ("line-break-permission");
line.page_permission_ = c->get_property ("page-break-permission");
line.turn_permission_ = c->get_property ("page-turn-permission");
-
- max_ext = max (max_ext, extent.length ());
- line.extent_ = extent;
+
+ /* turn permission should always be stricter than page permission
+ and page permission should always be stricter than line permission */
+ line.page_permission_ = min_permission (line.break_permission_,
+ line.page_permission_);
+ line.turn_permission_ = min_permission (line.page_permission_,
+ line.turn_permission_);
+
+ line.extent_ = (extent.is_empty ()
+ || isnan (extent[LEFT])
+ || isnan (extent[RIGHT]))
+ ? Interval (0, 0) : extent;
line.padding_ = padding;
line.space_ = space;
line.inverse_hooke_ = extent.length () + space;