(LY_DEFINE): use scm_c_make_hash_table().

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

diff --git a/lily/include/book.hh b/lily/include/book.hh
index f3255ed8f67ad415561fd776d19b3ed4f29d113e..2563bc122700745efaec2a8268d66d8d092930d6 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -12,21 +12,23 @@
 #include "input.hh"
 #include "lily-proto.hh"
 #include "parray.hh"
-#include "smobs.hh"
+#include "object-key.hh"
+#include "string.hh"
 
 class Book : public Input
 {
   DECLARE_SMOBS (Book, foo);
-
 public:
-  SCM header_;
-  Output_def *bookpaper_;
+  String user_key_;
   
+  SCM header_;
+  Output_def *paper_;
+
+  void add_score (Score*);
   Link_array<Score> scores_;
   Book ();
-
-  void process (String outname, Output_def*, SCM header);
-  SCM to_stencil (Output_def*, SCM header);
+  void set_keys ();
+  Paper_book* process (String, Output_def*);
 };
 DECLARE_UNSMOB (Book, book);