X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book-scheme.cc;h=d9832e4c0e2dd47b0e0cd17aad2aa812a48a03ec;hb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;hp=8b5d6c866e0d30f99ec379d6ac881383f5146bac;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 8b5d6c866e..d9832e4c0e 100644
--- 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"
@@ -12,35 +12,51 @@
 
 LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
 	   1, 0, 0, (SCM pb),
-	   "Return pages in book PB.")
+	   "Return pages in book @var{pb}.")
 {
+  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}.")
+	   "Return scopes 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_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.")
+	   "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 ();
 }