Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index 48a5a4c5524c49dbfd95b0977b9104872ff69bff..86eeda1b39061207c2a4c02ad2bdabaa699d1f13 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -127,8 +127,8 @@ Book::set_parent (Book *parent)
       paper_->unprotect ();
     }
   paper_->parent_ = parent->paper_;
-  /* If this part is the first child of parent, copy its header */
-  if (ly_is_module (parent->header_) && (scm_is_null (parent->bookparts_)))
+  /* Copy the header block of the parent */
+  if (ly_is_module (parent->header_))
     {
       SCM tmp_header = ly_make_anonymous_module (false);
       ly_module_copy (tmp_header, parent->header_);
@@ -277,6 +277,7 @@ Book::process (Output_def *default_paper,
     }
   else
     {
+      paper_book->paper_->normalize ();
       /* Process scores */
   /* Render in order of parsing.  */
       for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))