X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-breaking.cc;h=b43c302367053bf5418ea7f77db00530f2cf2fcc;hb=3e08e326e7c38c81d3355a3f2e7ef8eb48bd121e;hp=e552c667b1a6456d00082e0fbd014915c6ef5d22;hpb=92154b9f6a54ba6376621cb54e8dcd396519f969;p=lilypond.git

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index e552c667b1..b43c302367 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -176,14 +176,11 @@ SCM
 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 ();
@@ -207,9 +204,6 @@ Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
       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;
 }
 
@@ -283,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
 	{
@@ -293,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));
 	}
     }
 }