X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book-scheme.cc;h=8c2e493e0e091ef18166b588704e82772c65fab1;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=37cf9874e419cf9cfb211f7e37643dac1d019706;hpb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;p=lilypond.git

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 37cf9874e4..8c2e493e0e 100644
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -1,10 +1,9 @@
 /*
-  paper-book-scheme.cc --  implement Paper_book bindings
+  paper-book-scheme.cc -- implement Paper_book bindings
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-book.hh"
@@ -12,36 +11,52 @@
 #include "output-def.hh"
 
 LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
-	  1, 0, 0, (SCM pb),
-	  "Return pages in book PB.")
+	   1, 0, 0, (SCM pb),
+	   "Return pages in book @var{pb}.")
 {
-  return unsmob_paper_book(pb)->pages ();
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
+  return unsmob_paper_book (pb)->pages ();
 }
 
 LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
-	  1, 0, 0, (SCM book),
-	  "Return pages in layout book @var{book}.")
+	   1, 0, 0, (SCM book),
+	   "Return scopes in layout book @var{book}.")
 {
-  Paper_book *pb = unsmob_paper_book(book);
-  SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book");
-  
+  LY_ASSERT_SMOB (Paper_book, book, 1);
+  Paper_book *pb = unsmob_paper_book (book);
+
   SCM scopes = SCM_EOL;
-  if (ly_c_module_p (pb->header_))
+  if (pb->parent_)
+    {
+      scopes = ly_paper_book_scopes (pb->parent_->self_scm ());
+    }
+  if (ly_is_module (pb->header_))
     scopes = scm_cons (pb->header_, 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.")
+	   "Return systems in book @var{pb}.")
 {
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
   return unsmob_paper_book (pb)->systems ();
 }
 
 LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",
-	  1, 0, 0, (SCM pb),
-	  "Return pages in book PB.")
+	   1, 0, 0, (SCM pb),
+	   "Return pages in book @var{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 ();
 }