Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
{
SCM layout_module = scm_c_resolve_module ("scm layout-page-layout");
- SCM dump_module = scm_c_resolve_module ("scm layout-page-dump");
SCM page_module = scm_c_resolve_module ("scm page");
SCM make_page = scm_c_module_lookup (layout_module, "make-page-from-systems");
- SCM write_page_breaks = scm_c_module_lookup (dump_module, "write-page-breaks");
SCM page_stencil = scm_c_module_lookup (page_module, "page-stencil");
make_page = scm_variable_ref (make_page);
- write_page_breaks = scm_variable_ref (write_page_breaks);
page_stencil = scm_variable_ref (page_stencil);
SCM book = book_->self_scm ();
bool ragged_all = to_boolean (book_->paper_->c_variable ("ragged-bottom"));
bool ragged_last = to_boolean (book_->paper_->c_variable ("ragged-last-bottom"));
+ int first_page_number = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1);
SCM ret = SCM_EOL;
for (vsize i = 0; i < lines_per_page.size (); i++)
{
- SCM page_num = scm_from_int (i + 1);
+ SCM page_num = scm_from_int (i + first_page_number);
SCM last = scm_from_bool (i == lines_per_page.size () - 1);
SCM ragged = scm_from_bool (ragged_all || (to_boolean (last) && ragged_last));
SCM line_count = scm_from_int (lines_per_page[i]);
systems = scm_list_tail (systems, line_count);
}
ret = scm_reverse (ret);
-
- if (to_boolean (book_->paper_->c_variable ("write-page-layout")))
- scm_apply_1 (write_page_breaks, ret, SCM_EOL);
return ret;
}
Page_breaking::create_system_list ()
{
SCM specs = book_->get_system_specs ();
- for (SCM s = specs; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s))
{
if (Paper_score *ps = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
{
vector<vsize> line_breaker_columns;
line_breaker_columns.push_back (0);
- for (vsize j = 0; j < cols.size (); j++)
+ for (vsize j = 1; j < cols.size (); j++)
{
bool last = j == cols.size () - 1;
bool break_point = is_break (cols[j]);
if ((break_point || chunk_end) && !last)
line_breaker_columns.push_back (j);
}
- line_breaking_.push_back (Constrained_breaking (line_breaker_columns));
- line_breaking_.back ().set_pscore (all_[i].pscore_);
+ line_breaking_.push_back (Constrained_breaking (all_[i].pscore_, line_breaker_columns));
}
else
{
breaks_.push_back (Break_position (i));
chunks_.push_back (Break_position (i));
- line_breaking_.push_back (Constrained_breaking ());
+ line_breaking_.push_back (Constrained_breaking (NULL));
}
}
}