Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/book.hh b/lily/include/book.hh
index d92bcc72a25e346e164c4418f452f3e61a3caf35..d7ae2278010844495a8474497e9540ab2ae78339 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef BOOK_HH
@@ -32,16 +32,24 @@ public:
   VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
   Book ();
   void add_score (SCM);
-  void add_bookpart ();
   void add_bookpart (SCM);
-  void set_parent (Book *parent);
-  bool error_found ();
   Paper_book *process (Output_def *def_paper,
                       Output_def *def_layout);
   Paper_book *process (Output_def *default_paper,
-                       Output_def *default_layout,
-                       Output_def *parent_paper);
+                      Output_def *default_layout,
+                      Paper_book *parent_part);
   void set_keys ();
+
+protected:
+  void set_parent (Book *parent);
+  void add_scores_to_bookpart ();
+  bool error_found ();
+  void process_score (SCM score,
+                     Paper_book *output_paper_book,
+                     Output_def *layout);
+  void process_bookparts (Paper_book *output_paper_book,
+                         Output_def *paper,
+                         Output_def *layout);
 };
 
 DECLARE_UNSMOB (Book, book);