X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=a29cb074498a2e8bc9304a94a7a9cb8e52c2251c;hb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;hp=6441b0eee008763776c52c5b94659e6c5ddc1d1c;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 6441b0eee0..a29cb07449 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -11,9 +11,9 @@
 
 #include "lily-proto.hh"
 #include "std-vector.hh"
-#include "object-key.hh"
 #include "std-string.hh"
 #include "virtual-methods.hh"
+#include "smobs.hh"
 
 class Book
 {
@@ -24,6 +24,7 @@ public:
   SCM header_;
   Output_def *paper_;
   SCM scores_;
+  SCM bookparts_;
   SCM input_location_;
 
   Book (Book const &);
@@ -31,9 +32,24 @@ public:
   VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
   Book ();
   void add_score (SCM);
+  void add_bookpart (SCM);
   Paper_book *process (Output_def *def_paper,
 		       Output_def *def_layout);
+  Paper_book *process (Output_def *default_paper,
+		       Output_def *default_layout,
+		       Paper_book *parent_part);
   void set_keys ();
+
+protected:
+  void set_parent (Book *parent);
+  void add_scores_to_bookpart ();
+  bool error_found ();
+  void process_score (SCM score,
+		      Paper_book *output_paper_book,
+		      Output_def *layout);
+  void process_bookparts (Paper_book *output_paper_book,
+			  Output_def *paper,
+			  Output_def *layout);
 };
 
 DECLARE_UNSMOB (Book, book);