X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbook.cc;h=335507601d37fc46d3e1fa381e904b4b27421f82;hb=a74f4a786ff2dd07adb02b16d15095263271801f;hp=01e52ce9cdce87151b731a9301e653813a399af1;hpb=ee4bc843ba15ebbedd8578cbb8e5e477925c413f;p=lilypond.git

diff --git a/lily/book.cc b/lily/book.cc
index 01e52ce9cd..335507601d 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -20,6 +20,7 @@ using namespace std;
 #include "warn.hh"
 #include "performance.hh"
 #include "paper-score.hh"
+#include "page-marker.hh"
 
 #include "ly-smobs.icc"
 
@@ -60,7 +61,7 @@ Book::Book (Book const &s)
       Score *newscore = unsmob_score (scm_car (p))->clone ();
 
       *t = scm_cons (newscore->self_scm (), SCM_EOL);
-      t = SCM_CDRLOC(*t);
+      t = SCM_CDRLOC (*t);
       newscore->unprotect ();
     }
 }
@@ -145,15 +146,16 @@ Book::process (Output_def *default_paper,
 		paper_book->add_performance (perf->self_scm ());
 	      else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
 		{
-		  if (ly_is_module (score->header_))
-		    paper_book->add_score (score->header_);
+		  if (ly_is_module (score->get_header ()))
+		    paper_book->add_score (score->get_header ());
 		  paper_book->add_score (pscore->self_scm ());
 		}
 
 	      outputs = scm_cdr (outputs);
 	    }
 	}
-      else if (Text_interface::is_markup (scm_car (s)))
+      else if (Text_interface::is_markup_list (scm_car (s))
+	       || unsmob_page_marker (scm_car (s)))
 	paper_book->add_score (scm_car (s));
       else
 	assert (0);