Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 42dc8c0065918bee7e44220200b54c2ff3d1d5a6..9530c94b7076fb5a9137253adbcd8732a6900836 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--2014  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,10 +27,13 @@
     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 () const;
+  static const char * const type_p_name_;
+  virtual ~Paper_book ();
+private:
   SCM systems_;
   SCM pages_;
   SCM performances_;