Merge with master

[lilypond.git] / lily / paper-book-scheme.cc

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 69b7dc02eedac1595136db5fffbca72c8ee96703..94bb17f05e0f3626f25e451f99372aa88f316b95 100644 (file)
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-book.hh"
@@ -14,6 +14,7 @@ LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
           1, 0, 0, (SCM pb),
           "Return pages in book PB.")
 {
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
   return unsmob_paper_book (pb)->pages ();
 }
 
@@ -21,8 +22,8 @@ LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
           1, 0, 0, (SCM book),
           "Return pages in layout book @var{book}.")
 {
+  LY_ASSERT_SMOB (Paper_book, book, 1);
   Paper_book *pb = unsmob_paper_book (book);
-  SCM_ASSERT_TYPE (pb, book, SCM_ARG1, __FUNCTION__, "Paper_book");
 
   SCM scopes = SCM_EOL;
   if (ly_is_module (pb->header_))
@@ -31,10 +32,19 @@ LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
   return scopes;
 }
 
+LY_DEFINE (ly_paper_book_performances, "ly:paper-book-performances",
+          1, 0, 0, (SCM paper_book),
+          "Return performances in book @var{paper-book}.")
+{
+  LY_ASSERT_SMOB (Paper_book, paper_book, 1);
+  return unsmob_paper_book (paper_book)->performances ();
+}
+
 LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
           1, 0, 0, (SCM pb),
           "Return systems in book PB.")
 {
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
   return unsmob_paper_book (pb)->systems ();
 }
 
@@ -42,5 +52,7 @@ LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",
           1, 0, 0, (SCM pb),
           "Return pages in book PB.")
 {
-  return unsmob_paper_book (pb)->paper_->self_scm ();
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
+  Paper_book *pbook = unsmob_paper_book (pb);
+  return pbook->paper_->self_scm ();
 }