Merge branch 'master' into nested-bookparts

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 1aaf6fab0a04e1353b18ee93ca5d2860a28f117f..d06f8fdd7c7306e13515d95f02d50462750ece27 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -32,6 +32,7 @@ public:
   SCM header_0_;
   SCM scores_;
   SCM bookparts_;
+  Paper_book *parent_;
   Output_def *paper_;
 
   Paper_book ();
@@ -51,15 +52,16 @@ public:
   Stencil book_title ();
   Stencil score_title (SCM);
   
-  void classic_output_aux (SCM output,
-                           int *first_performance_number);
   void classic_output (SCM output_channel);
-  void output_aux (SCM output_channel,
-                   bool is_first,
-                   bool is_last,
-                   int *first_page_number,
-                   int *first_performance_number);
   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)