Run grand replace for 2015.

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

diff --git a/lily/include/book.hh b/lily/include/book.hh
index f99b7875f0156ef751dc3b0545513f77125a3436..6b1c2bfb14ca48e7a60380fcab1b3b883d9e7601 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,11 +26,12 @@
 #include "virtual-methods.hh"
 #include "smobs.hh"
 
-class Book
+class Book : public Smob<Book>
 {
-  DECLARE_SMOBS (Book);
-
 public:
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Book ();
   SCM header_;
   Output_def *paper_;
   SCM scores_;
@@ -44,10 +45,10 @@ public:
   void add_score (SCM);
   void add_bookpart (SCM);
   Paper_book *process (Output_def *def_paper,
-                      Output_def *def_layout);
+                       Output_def *def_layout);
   Paper_book *process (Output_def *default_paper,
-                      Output_def *default_layout,
-                      Paper_book *parent_part);
+                       Output_def *default_layout,
+                       Paper_book *parent_part);
   void set_keys ();
 
 protected:
@@ -55,13 +56,12 @@ protected:
   void add_scores_to_bookpart ();
   bool error_found ();
   void process_score (SCM score,
-                     Paper_book *output_paper_book,
-                     Output_def *layout);
+                      Paper_book *output_paper_book,
+                      Output_def *layout);
   void process_bookparts (Paper_book *output_paper_book,
-                         Output_def *paper,
-                         Output_def *layout);
+                          Output_def *paper,
+                          Output_def *layout);
 };
 
-DECLARE_UNSMOB (Book, book);
 
 #endif /* BOOK_HH */