X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-marker.cc;h=af62bdc95e27409ce44c14eea4bd4740ffe5f956;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=ba5342ab2bdb603d8b4cf53dca2adc25320c2b28;hpb=bf090c279f6f8e0ebbffc72d7ee435172dfaddc8;p=lilypond.git diff --git a/lily/page-marker.cc b/lily/page-marker.cc index ba5342ab2b..af62bdc95e 100644 --- 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--2014 Nicolas Sceaux + Copyright (C) 2007--2015 Nicolas Sceaux LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ Page_marker::Page_marker () } Page_marker::Page_marker (Page_marker const &src) + : Smob () { symbol_ = src.symbol_; permission_ = src.permission_; @@ -39,27 +40,17 @@ Page_marker::~Page_marker () { } -const char Page_marker::type_p_name_[] = "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 ("#", port); - return 1; -} - SCM Page_marker::permission_symbol () {