Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 9ef2ca21301db146dba7f373061bbaec98747f08..03553138d5e993a968d567dfc49c0dc8685d1c8b 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -9,23 +9,26 @@
 #ifndef BOOK_HH
 #define BOOK_HH
 
-#include "input.hh"
 #include "lily-proto.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 *paper_;
   SCM scores_;
+  SCM input_location_;
 
-  Book *clone () const;
+  Book (Book const &);
+  Input *origin() const;
+  VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
   Book ();
   void add_score (SCM);
   Paper_book *process (Output_def *def_paper,