Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 48988380813d419bc3b93d25812ffe02dee1b6d6..90e816f66da6257ae6d94af69736635bacffdd72 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--2009  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 #ifndef PAPER_BOOK_HH
 #define PAPER_BOOK_HH
@@ -52,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);
+  int output_aux (SCM output_channel,
+                 bool is_last,
+                 int *first_page_number,
+                 int *first_performance_number);
 };
 
 DECLARE_UNSMOB (Paper_book, paper_book)