Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 88b9207c3e23730005826f23e7365979bcad9f7f..9ef2ca21301db146dba7f373061bbaec98747f08 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BOOK_HH
@@ -11,23 +11,25 @@
 
 #include "input.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "object-key.hh"
-#include "string.hh"
+#include "std-string.hh"
 
 class Book : public Input
 {
   DECLARE_SMOBS (Book, foo);
 
 public:
-  String user_key_;
+  string user_key_;
   SCM header_;
   Output_def *paper_;
   SCM scores_;
 
+  Book *clone () const;
   Book ();
   void add_score (SCM);
-  Paper_book *process (String, Output_def *);
+  Paper_book *process (Output_def *def_paper,
+                      Output_def *def_layout);
   void set_keys ();
 };