X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=d7ae2278010844495a8474497e9540ab2ae78339;hb=7267d0cf8c18cf2ffcdeb7cff6f0ad4c86b8db18;hp=4765f332f19ea75a9c335a5e20cd339693373795;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 4765f332f1..d7ae227801 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -3,33 +3,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BOOK_HH
 #define BOOK_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
-#include "object-key.hh"
-#include "string.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
+#include "virtual-methods.hh"
+#include "smobs.hh"
 
-class Book : public Input
+class Book
 {
-  DECLARE_SMOBS (Book, foo);
+  DECLARE_SMOBS (Book);
 
 public:
-  String user_key_;
+  string user_key_;
   SCM header_;
   Output_def *paper_;
   SCM scores_;
+  SCM bookparts_;
+  SCM input_location_;
 
+  Book (Book const &);
+  Input *origin() const;
+  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);