X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book-scheme.cc;h=01fa9da459b2f24a7b59d0cfe7fd52844c03b133;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=915844453025ece1d1883a41db0a4cbb73c72baa;hpb=eab591fe423ef0eeb03d8bbedf7d43185d2fbc74;p=lilypond.git

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 9158444530..01fa9da459 100644
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -18,23 +18,22 @@
 */
 
 #include "paper-book.hh"
-#include "ly-module.hh"
 #include "output-def.hh"
 
 LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
-	   1, 0, 0, (SCM pb),
-	   "Return pages in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return pages in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return unsmob_paper_book (pb)->pages ();
+  return unsmob<Paper_book> (pb)->pages ();
 }
 
 LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
-	   1, 0, 0, (SCM pb),
-	   "Return scopes in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return scopes in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *book = unsmob_paper_book (pb);
+  Paper_book *book = unsmob<Paper_book> (pb);
 
   SCM scopes = SCM_EOL;
   if (book->parent_)
@@ -48,37 +47,37 @@ LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
 }
 
 LY_DEFINE (ly_paper_book_performances, "ly:paper-book-performances",
-	   1, 0, 0, (SCM pb),
-	   "Return performances in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return performances in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return unsmob_paper_book (pb)->performances ();
+  return unsmob<Paper_book> (pb)->performances ();
 }
 
 LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
-	   1, 0, 0, (SCM pb),
-	   "Return systems in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return systems in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return unsmob_paper_book (pb)->systems ();
+  return unsmob<Paper_book> (pb)->systems ();
 }
 
 LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",
-	   1, 0, 0, (SCM pb),
-	   "Return the paper output definition (@code{\\paper})"
-	   " in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return the paper output definition (@code{\\paper})"
+           " in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *pbook = unsmob_paper_book (pb);
+  Paper_book *pbook = unsmob<Paper_book> (pb);
   return pbook->paper_->self_scm ();
 }
 
 LY_DEFINE (ly_paper_book_header, "ly:paper-book-header",
-	   1, 0, 0, (SCM pb),
-	   "Return the header definition (@code{\\header})"
-	   " in @code{Paper_book} object @var{pb}.")
+           1, 0, 0, (SCM pb),
+           "Return the header definition (@code{\\header})"
+           " in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *pbook = unsmob_paper_book (pb);
+  Paper_book *pbook = unsmob<Paper_book> (pb);
   return pbook->header_;
 }