source file of the GNU LilyPond music typesetter
- (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
+ (c) 2006--2008 Joe Neeman <joeneeman@gmail.com>
*/
#include "international.hh"
#include "system.hh"
static bool
-is_break (Grob *g)
+is_break (Grob *)
{
- (void) g; /* shutup warning */
return false;
}
Page_spacing_result best;
vsize page_count = robust_scm2int (forced_page_count, 1);
- Line_division ideal_line_division;
- Line_division best_division;
- vsize min_sys_count = 0;
+ Line_division ideal_line_division = current_configuration (0);
+ Line_division best_division = ideal_line_division;
+ vsize min_sys_count = 1;
vsize ideal_sys_count = system_count ();
if (!scm_is_integer (forced_page_count))
best = space_systems_on_best_pages (0, first_page_num);
page_count = best.systems_per_page_.size ();
- ideal_line_division = current_configuration (0);
- best_division = ideal_line_division;
ideal_sys_count = best.system_count ();
min_sys_count = ideal_sys_count - best.systems_per_page_.back ();
if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1)
min_sys_count -= best.systems_per_page_[page_count - 2];
+
+ min_sys_count = max (min_sys_count, (vsize)1);
+ }
+ else
+ {
+ /* todo: the following line will spit out programming errors if the
+ ideal line spacing doesn't fit on PAGE_COUNT pages */
+ best = space_systems_on_n_pages (0, page_count, first_page_num);
+ min_sys_count = page_count;
}
if (page_count == 1)
vsize min_p_count = min_page_count (i, first_page_num);
Page_spacing_result cur;
- if (min_p_count > page_count)
- continue;
- else if (min_p_count == page_count)
+ if (min_p_count == page_count || scm_is_integer (forced_page_count))
cur = space_systems_on_n_pages (i, page_count, first_page_num);
else
cur = space_systems_on_n_or_one_more_pages (i, page_count-1, first_page_num);
break;
}
- message ("Drawing systems...");
+ message (_ ("Drawing systems..."));
break_into_pieces (0, end, best_division);
SCM lines = systems ();
return make_pages (best.systems_per_page_, lines);