Move page-breaking-wrapper into C++.

This is in preparation for deleting layout-page-layout.scm.

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index fd519d5d751fee66e7af54d84a8f14b989c40e04..3db1321f5e495b199915d39007a937638b71f76d 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -601,8 +601,11 @@ Paper_book::pages ()
     }
   else if (scm_is_pair (scores_))
     {
-      SCM proc = paper_->c_variable ("page-breaking-wrapper");
-      pages_ = scm_apply_0 (proc, scm_list_1 (self_scm ()));
+      SCM page_breaking = paper_->c_variable ("page-breaking");
+      pages_ = scm_apply_0 (page_breaking, scm_list_1 (self_scm ()));
+      SCM post_process = paper_->c_variable ("page-post-process");
+      if (ly_is_procedure (post_process))
+       scm_apply_2 (post_process, paper_->self_scm (), pages_, SCM_EOL);
 
       /* set systems_ from the pages */
       if (systems_ == SCM_BOOL_F)

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 9d2725ede0d20f533f880105500cf9d86c6b942c..4bd187cbbe7cf6795d2882f5db6cafe0932dfd4e 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -97,7 +97,6 @@
        (word-space . 0.6)))
 
     #(define page-breaking ly:optimal-breaking)
-    #(define page-breaking-wrapper page-breaking-wrapper)
     #(define page-post-process post-process-pages)
 
     #(define write-page-layout (ly:get-option 'dump-tweaks))

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index ffd6d632c4d2d8e4bdd4ba4536eb0652e6b9d6fd..d1c18ab57305419014decc701e3357f5d1ccf17f 100644 (file)
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -128,15 +128,6 @@
                  (cdr spacing)))))
       page)))
 
-(define (page-breaking-wrapper paper-book)
-  "Compute line and page breaks by calling the page-breaking paper variable,
-  then performs the post process function using the page-post-process paper
-  variable. Finally, return the pages."
-  (let* ((paper (ly:paper-book-paper paper-book))
-         (pages ((ly:output-def-lookup paper 'page-breaking) paper-book)))
-    ((ly:output-def-lookup paper 'page-post-process) paper pages)
-    pages))
-
 (define (post-process-pages layout pages)
   "If the write-page-layout paper variable is true, dumps page breaks
   and tweaks."