X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-book.hh;h=40a40a39b67183201a87ff77318c3e75d4064e8f;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=48988380813d419bc3b93d25812ffe02dee1b6d6;hpb=97c36d88858b16986ce00b690da4b9382ffb02bb;p=lilypond.git

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 4898838081..40a40a39b6 100644
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -1,9 +1,20 @@
 /*
-  paper-book.hh -- declare Paper_book
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2015  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2007  Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef PAPER_BOOK_HH
 #define PAPER_BOOK_HH
@@ -16,17 +27,20 @@
     exports them to the output backend, either as systems or as
     completely formatted pages.  */
 
-class Paper_book
+class Paper_book : public Smob<Paper_book>
 {
-  DECLARE_SMOBS (Paper_book);
-
+public:
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Paper_book ();
+private:
   SCM systems_;
   SCM pages_;
   SCM performances_;
 
   void add_score_title (SCM);
   SCM get_score_title (SCM);
-  
+
 public:
   SCM header_;
   SCM header_0_;
@@ -48,21 +62,20 @@ public:
   SCM pages ();
   SCM get_system_specs ();
 
-
   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,
+                           long *first_performance_number);
+  long output_aux (SCM output_channel,
+                   bool is_last,
+                   long *first_page_number,
+                   long *first_performance_number);
 };
 
-DECLARE_UNSMOB (Paper_book, paper_book)
 
 #endif /* PAPER_BOOK_HH */