X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=c63f47dd078b49597c22ee8aeaef54368cb564d6;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=d5f1c791533b10b4b481159b815ca8e729db3031;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index d5f1c79153..c63f47dd07 100644
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -22,14 +22,13 @@
 #include "output-def.hh"
 #include "score.hh"
 #include "paper-book.hh"
-#include "ly-module.hh"
 
 LY_DEFINE (ly_make_book, "ly:make-book",
            2, 0, 1, (SCM paper, SCM header, SCM scores),
            "Make a @code{\\book} of @var{paper} and @var{header}"
            " (which may be @code{#f} as well) containing @code{\\scores}.")
 {
-  Output_def *odef = Output_def::unsmob (paper);
+  Output_def *odef = unsmob<Output_def> (paper);
   LY_ASSERT_SMOB (Output_def, paper, 1);
 
   Book *book = new Book;
@@ -66,14 +65,14 @@ LY_DEFINE (ly_book_process, "ly:book-process",
            "  For example, it may be a string (for file based outputs)"
            " or a socket (for network based output).")
 {
-  Book *book = Book::unsmob (book_smob);
+  Book *book = unsmob<Book> (book_smob);
 
   LY_ASSERT_SMOB (Book, book_smob, 1);
   LY_ASSERT_SMOB (Output_def, default_paper, 2);
   LY_ASSERT_SMOB (Output_def, default_layout, 3);
 
-  Paper_book *pb = book->process (Output_def::unsmob (default_paper),
-                                  Output_def::unsmob (default_layout));
+  Paper_book *pb = book->process (unsmob<Output_def> (default_paper),
+                                  unsmob<Output_def> (default_layout));
   if (pb)
     {
       pb->output (output);
@@ -96,10 +95,10 @@ LY_DEFINE (ly_book_process_to_systems, "ly:book-process-to-systems",
   LY_ASSERT_SMOB (Output_def, default_paper, 2);
   LY_ASSERT_SMOB (Output_def, default_layout, 3);
 
-  Book *book = Book::unsmob (book_smob);
+  Book *book = unsmob<Book> (book_smob);
 
-  Paper_book *pb = book->process (Output_def::unsmob (default_paper),
-                                  Output_def::unsmob (default_layout));
+  Paper_book *pb = book->process (unsmob<Output_def> (default_paper),
+                                  unsmob<Output_def> (default_layout));
   if (pb)
     {
       pb->classic_output (output);
@@ -114,7 +113,7 @@ LY_DEFINE (ly_book_add_score_x, "ly:book-add-score!",
            "Add @var{score} to @var{book-smob} score list.")
 {
   LY_ASSERT_SMOB (Book, book_smob, 1);
-  Book *book = Book::unsmob (book_smob);
+  Book *book = unsmob<Book> (book_smob);
   book->add_score (score);
   return SCM_UNSPECIFIED;
 }
@@ -124,7 +123,7 @@ LY_DEFINE (ly_book_add_bookpart_x, "ly:book-add-bookpart!",
            "Add @var{book-part} to @var{book-smob} book part list.")
 {
   LY_ASSERT_SMOB (Book, book_smob, 1);
-  Book *book = Book::unsmob (book_smob);
+  Book *book = unsmob<Book> (book_smob);
   book->add_bookpart (book_part);
   return SCM_UNSPECIFIED;
 }
@@ -134,7 +133,7 @@ LY_DEFINE (ly_book_book_parts, "ly:book-book-parts",
            "Return book parts in @var{book}.")
 {
   LY_ASSERT_SMOB (Book, book, 1);
-  Book *b = Book::unsmob (book);
+  Book *b = unsmob<Book> (book);
   return b->bookparts_;
 }
 
@@ -143,7 +142,7 @@ LY_DEFINE (ly_book_paper, "ly:book-paper",
            "Return paper in @var{book}.")
 {
   LY_ASSERT_SMOB (Book, book, 1);
-  Book *b = Book::unsmob (book);
+  Book *b = unsmob<Book> (book);
   return b->paper_ ? b->paper_->self_scm () : SCM_BOOL_F;
 }
 
@@ -152,8 +151,8 @@ LY_DEFINE (ly_book_header, "ly:book-header",
            "Return header in @var{book}.")
 {
   LY_ASSERT_SMOB (Book, book, 1);
-  Book *b = Book::unsmob (book);
-  return b->header_ ? b->header_ : SCM_BOOL_F;
+  Book *b = unsmob<Book> (book);
+  return ly_is_module (b->header_) ? b->header_ : SCM_BOOL_F;
 }
 
 LY_DEFINE (ly_book_set_header_x, "ly:book-set-header!",
@@ -164,7 +163,7 @@ LY_DEFINE (ly_book_set_header_x, "ly:book-set-header!",
   SCM_ASSERT_TYPE (ly_is_module (module), module, SCM_ARG2, __FUNCTION__,
                    "module");
 
-  Book *b = Book::unsmob (book);
+  Book *b = unsmob<Book> (book);
   b->header_ = (module);
   return SCM_UNSPECIFIED;
 }
@@ -174,9 +173,9 @@ LY_DEFINE (ly_book_scores, "ly:book-scores",
            "Return scores in @var{book}.")
 {
   LY_ASSERT_SMOB (Book, book, 1);
-  Book *b = Book::unsmob (book);
+  Book *b = unsmob<Book> (book);
   return b->scores_;
 }
 
 
-const char Book::type_p_name_[] = "ly:book?";
+const char * const Book::type_p_name_ = "ly:book?";