Run `make grand-replace'.

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 74829492edc3c7ef501ee6ce8f097182a5a5b8c0..1294dd144cde89dc3c26aadf9391dbd030e0e03d 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2007  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2008  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #ifndef PAPER_BOOK_HH
 #define PAPER_BOOK_HH
@@ -32,6 +32,7 @@ public:
   SCM header_0_;
   SCM scores_;
   SCM bookparts_;
+  Paper_book *parent_;
   Output_def *paper_;
 
   Paper_book ();
@@ -51,13 +52,16 @@ public:
   Stencil book_title ();
   Stencil score_title (SCM);
   
-  void classic_output_aux (SCM output);
   void classic_output (SCM output_channel);
-  int output_aux (SCM output_channel,
-                  int first_page_number,
-                  bool is_first,
-                  bool is_last);
   void output (SCM output_channel);
+
+protected:
+  void classic_output_aux (SCM output,
+                          int *first_performance_number);
+  void output_aux (SCM output_channel,
+                  bool is_last,
+                  int *first_page_number,
+                  int *first_performance_number);
 };
 
 DECLARE_UNSMOB (Paper_book, paper_book)