Web-ja: update introduction

[lilypond.git] / lily / page-marker.cc

diff --git a/lily/page-marker.cc b/lily/page-marker.cc
index f1c143a18b92ee3d6da2b27af286fdf36adbc397..af62bdc95e27409ce44c14eea4bd4740ffe5f956 100644 (file)
--- a/lily/page-marker.cc
+++ b/lily/page-marker.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2010 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  Copyright (C) 2007--2015 Nicolas Sceaux <nicolas.sceaux@free.fr>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 */
 
 #include "page-marker.hh"
-#include "ly-smobs.icc"
 
 Page_marker::Page_marker ()
 {
@@ -29,6 +28,7 @@ Page_marker::Page_marker ()
 }
 
 Page_marker::Page_marker (Page_marker const &src)
+  : Smob<Page_marker> ()
 {
   symbol_ = src.symbol_;
   permission_ = src.permission_;
@@ -40,29 +40,17 @@ Page_marker::~Page_marker ()
 {
 }
 
-IMPLEMENT_SMOBS (Page_marker);
-IMPLEMENT_DEFAULT_EQUAL_P (Page_marker);
-IMPLEMENT_TYPE_P (Page_marker, "ly:page-marker?");
+const char * const Page_marker::type_p_name_ = "ly:page-marker?";
 
 SCM
-Page_marker::mark_smob (SCM smob)
+Page_marker::mark_smob () const
 {
-  Page_marker *pm = (Page_marker *) SCM_CELL_WORD_1 (smob);
-  scm_gc_mark (pm->symbol_);
-  scm_gc_mark (pm->permission_);
-  scm_gc_mark (pm->label_);
+  scm_gc_mark (symbol_);
+  scm_gc_mark (permission_);
+  scm_gc_mark (label_);
   return SCM_EOL;
 }
 
-int
-Page_marker::print_smob (SCM smob, SCM port, scm_print_state *)
-{
-  Page_marker *pm = (Page_marker *) SCM_CELL_WORD_1 (smob);
-  (void) pm;
-  scm_puts ("#<Page_marker>", port);
-  return 1;
-}
-
 SCM
 Page_marker::permission_symbol ()
 {