Run grand replace for 2015.

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 84baf79407f70e9c49d780aeb9826f4ee5e8ee20..40a40a39b67183201a87ff77318c3e75d4064e8f 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2009  Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015  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
@@ -27,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_;
@@ -59,22 +62,20 @@ public:
   SCM pages ();
   SCM get_system_specs ();
 
-
   Stencil book_title ();
   Stencil score_title (SCM);
-  
+
   void classic_output (SCM output_channel);
   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);
+                           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 */