Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/paper-book-scheme.cc b/lily/paper-book-scheme.cc
index da2522b56055ad5a18416b04bf3a7d5727028378..01fa9da459b2f24a7b59d0cfe7fd52844c03b133 100644 (file)
--- a/lily/paper-book-scheme.cc
+++ b/lily/paper-book-scheme.cc
@@ -18,7 +18,6 @@
 */
 
 #include "paper-book.hh"
-#include "ly-module.hh"
 #include "output-def.hh"
 
 LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
@@ -26,7 +25,7 @@ LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
            "Return pages in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return Paper_book::unsmob (pb)->pages ();
+  return unsmob<Paper_book> (pb)->pages ();
 }
 
 LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
@@ -34,7 +33,7 @@ LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
            "Return scopes in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *book = Paper_book::unsmob (pb);
+  Paper_book *book = unsmob<Paper_book> (pb);
 
   SCM scopes = SCM_EOL;
   if (book->parent_)
@@ -52,7 +51,7 @@ LY_DEFINE (ly_paper_book_performances, "ly:paper-book-performances",
            "Return performances in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return Paper_book::unsmob (pb)->performances ();
+  return unsmob<Paper_book> (pb)->performances ();
 }
 
 LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
@@ -60,7 +59,7 @@ LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
            "Return systems in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  return Paper_book::unsmob (pb)->systems ();
+  return unsmob<Paper_book> (pb)->systems ();
 }
 
 LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",
@@ -69,7 +68,7 @@ LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",
            " in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *pbook = Paper_book::unsmob (pb);
+  Paper_book *pbook = unsmob<Paper_book> (pb);
   return pbook->paper_->self_scm ();
 }
 
@@ -79,6 +78,6 @@ LY_DEFINE (ly_paper_book_header, "ly:paper-book-header",
            " in @code{Paper_book} object @var{pb}.")
 {
   LY_ASSERT_SMOB (Paper_book, pb, 1);
-  Paper_book *pbook = Paper_book::unsmob (pb);
+  Paper_book *pbook = unsmob<Paper_book> (pb);
   return pbook->header_;
 }