- {
- vsize min_p_count = min_page_count (i, first_page_num);
- Page_spacing_result cur;
-
- if (min_p_count == page_count || scm_is_integer (forced_page_count))
- cur = space_systems_on_n_pages (i, page_count, first_page_num, systems_per_page);
- else
- cur = space_systems_on_n_or_one_more_pages (i, page_count-1, first_page_num, systems_per_page);
-
- if (cur.demerits_ < best_for_this_sys_count.demerits_ || isinf (best_for_this_sys_count.demerits_))
- {
- best_for_this_sys_count = cur;
- bound = current_configuration (i);
- }
- }
-
- if (best_for_this_sys_count.demerits_ < best.demerits_ || isinf (best.demerits_))
- {
- best = best_for_this_sys_count;
- best_division = bound;
- }
-
- /* if the pages are stretched on average, stop trying to reduce sys_count */
- if (best_for_this_sys_count.page_count () < page_count
- && best_for_this_sys_count.average_force () > 0)
- break;
-
-
- if (isinf (best_for_this_sys_count.demerits_))
- break;
+ {
+ Page_spacing_result cur;
+
+ if (scm_is_integer (forced_page_count))
+ cur = space_systems_on_n_pages (i, page_count, first_page_num);
+ else
+ cur = space_systems_on_best_pages (i, first_page_num);
+
+ if (cur.demerits_ < best_for_this_sys_count.demerits_)
+ {
+ best_for_this_sys_count = cur;
+ bound = current_configuration (i);
+ }
+ }
+
+ if (debug_page_breaking_scoring)
+ message (_f ("best score for this sys-count: %f", best_for_this_sys_count.demerits_));
+
+ if (best_for_this_sys_count.demerits_ < best.demerits_)
+ {
+ best = best_for_this_sys_count;
+ best_division = bound;
+ }
+
+ /* Check to see if we already have too few systems. There are two ways
+ we check this: if we are trying one less than the ideal number of pages
+ and the pages are stretched on average then we have too
+ few systems. If the spacing is worse than BAD_SPACING_PENALTY, then we
+ have too few systems. In either case, though, we need to continue reducing
+ the number of systems if max-systems-per-page requires it. */
+ if (!(best.system_count_status_ & SYSTEM_COUNT_TOO_MANY))
+ {
+ if (best_for_this_sys_count.page_count () < page_count
+ && best_for_this_sys_count.average_force () > 0)
+ break;
+
+ if (best_for_this_sys_count.demerits_ >= BAD_SPACING_PENALTY)
+ break;
+ }