Always cap shortest_playing_len by measure length.

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

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 1a32d7e7f1135d55c6e1e0dfcd47aa7275e95ca3..b43c302367053bf5418ea7f77db00530f2cf2fcc 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -175,17 +175,23 @@ Page_breaking::breakpoint_property (vsize breakpoint, char const *str)
 SCM
 Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
 {
-  SCM module = scm_c_resolve_module ("scm layout-page-layout");
-  SCM make_page = scm_c_module_lookup (module, "make-page-from-systems");
+  SCM layout_module = scm_c_resolve_module ("scm layout-page-layout");
+  SCM page_module = scm_c_resolve_module ("scm page");
+
+  SCM make_page = scm_c_module_lookup (layout_module, "make-page-from-systems");
+  SCM page_stencil = scm_c_module_lookup (page_module, "page-stencil");
   make_page = scm_variable_ref (make_page);
+  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]);
@@ -193,10 +199,12 @@ Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
       SCM page = scm_apply_0 (make_page,
                              scm_list_n (book, lines, page_num, ragged, last, SCM_UNDEFINED));
 
+      scm_apply_1 (page_stencil, page, SCM_EOL);
       ret = scm_cons (page, ret);
       systems = scm_list_tail (systems, line_count);
     }
-  return scm_reverse (ret);
+  ret = scm_reverse (ret);
+  return ret;
 }
 
 /* The page-turn-page-breaker needs to have a line-breaker between any two
@@ -211,10 +219,19 @@ 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))))
-       all_.push_back (System_spec (ps));
+       {
+         SCM system_count = ps->layout ()->c_variable ("system-count");
+
+         if (scm_is_number (system_count))
+           s = scm_append (scm_list_3 (scm_list_1 (scm_car (s)),
+                                       scm_vector_to_list (ps->get_paper_systems ()),
+                                       scm_cdr (s)));
+         else
+           all_.push_back (System_spec (ps));
+       }
       else
         {
           Prob *pb = unsmob_prob (scm_car (s));
@@ -242,7 +259,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]);
@@ -260,8 +277,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
              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
        {
@@ -270,7 +286,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
            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));
        }
     }
 }