The last commit was an accident. Revert 3 files that shouldn't have been

[lilypond.git] / lily / paper-book.cc

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 8ef498aaec847516fe388469e4d3f9db22e25bd8..81376da0a4b2e1bb2519cb83df14ff883442b9bb 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -381,7 +381,21 @@ Paper_book::pages ()
 
   pages_ = SCM_EOL;
   SCM proc = paper_->c_variable ("page-breaking");
-  pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
+  pages_ = scm_apply_0 (proc, scm_list_1(self_scm ()));
+
+  /* set systems_ from the pages */
+  if (systems_ == SCM_BOOL_F)
+    {
+      systems_ = SCM_EOL;
+      for (SCM p = pages_; p != SCM_EOL; p = scm_cdr (p))
+       {
+         Prob *page = unsmob_prob (scm_car (p));
+         SCM systems = page->get_property ("lines");
+
+         systems_ = scm_append (scm_list_2 (systems_, systems));
+       }
+    }
+
   return pages_;
 }