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

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index 94bb17f05e..8c2e493e0e 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-book.hh"
@@ -12,7 +12,7 @@
 
 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 ();
@@ -20,12 +20,16 @@ LY_DEFINE (ly_paper_book_pages, "ly:paper-book-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 scopes = SCM_EOL;
+  if (pb->parent_)
+    {
+      scopes = ly_paper_book_scopes (pb->parent_->self_scm ());
+    }
   if (ly_is_module (pb->header_))
     scopes = scm_cons (pb->header_, scopes);
 
@@ -42,7 +46,7 @@ LY_DEFINE (ly_paper_book_performances, "ly: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 ();
@@ -50,7 +54,7 @@ LY_DEFINE (ly_paper_book_systems, "ly:paper-book-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}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
   Paper_book *pbook = unsmob_paper_book (pb);