* lily/page-breaking.cc (make_pages): honour the first-page-number

[lilypond.git] / lily / page-breaking.cc

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index b1fd686e2b05aafff4c074dab0ef6516eb3cd5ed..e552c667b1a6456d00082e0fbd014915c6ef5d22 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -189,11 +189,12 @@ Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
   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]);
@@ -224,7 +225,7 @@ void
 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))))
        {
@@ -264,7 +265,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
          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]);