Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index f78c022502855ebd0c9aa80c17e28614a0a274d0..c3c45a1c5f8024312092b755f55935c59c9e49d5 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-book.hh"
@@ -12,20 +12,24 @@
 
 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_FIRST_SMOB (Paper_book, 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_FIRST_SMOB (Paper_book, 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);
 
@@ -36,23 +40,24 @@ 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_FIRST_SMOB (Paper_book, 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_FIRST_SMOB (Paper_book, 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 the paper output definition (@code{\\paper})"
+          " in book @var{pb}.")
 {
-  LY_ASSERT_FIRST_SMOB (Paper_book, pb);
+  LY_ASSERT_SMOB (Paper_book, pb, 1);
   Paper_book *pbook = unsmob_paper_book (pb);
   return pbook->paper_->self_scm ();
 }