X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=03553138d5e993a968d567dfc49c0dc8685d1c8b;hb=8dfabc02615ad25d5450cb5f42e194ce50a7be18;hp=2a81201e5d2ae1be4230a9b8b2dcb5edc83401eb;hpb=0973486ec8558635a0aefc13eb3aa346d3a0fa77;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 2a81201e5d..03553138d5 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -3,30 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BOOK_HH
 #define BOOK_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
-#include "smobs.hh"
+#include "std-vector.hh"
+#include "object-key.hh"
+#include "std-string.hh"
+#include "virtual-methods.hh"
 
-class Book : public Input
+class Book
 {
-  DECLARE_SMOBS (Book, foo);
+  DECLARE_SMOBS (Book);
 
 public:
+  string user_key_;
   SCM header_;
-  Output_def *bookpaper_;
-  
-  Link_array<Score> scores_;
-  Book ();
+  Output_def *paper_;
+  SCM scores_;
+  SCM input_location_;
 
-  Paper_book* process (String, Output_def*);
+  Book (Book const &);
+  Input *origin() const;
+  VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
+  Book ();
+  void add_score (SCM);
+  Paper_book *process (Output_def *def_paper,
+		       Output_def *def_layout);
+  void set_keys ();
 };
+
 DECLARE_UNSMOB (Book, book);
 
 #endif /* BOOK_HH */