page breaking coding style

[lilypond.git] / lily / include / book.hh

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 44c764703d664e25167cea8589d7dc86d85fe21b..cf478432388fea996d8a35224815a64d1a56de57 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -3,32 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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 input_location_;
 
+  Book (Book const &);
+  Input *origin() const;
+  VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
   Book ();
   void add_score (SCM);
-  Paper_book *process (String,
-                      Output_def *def_paper,
+  Paper_book *process (Output_def *def_paper,
                       Output_def *def_layout);
   void set_keys ();
 };