X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=c38b899d00e0e443f018dd37db981efc44eb1967;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ff993f9bb0958c3e235e5f1a2de536273cc70d1b;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/clef.cc b/lily/clef.cc index ff993f9bb0..c38b899d00 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys 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,7 +28,7 @@ MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1); SCM Clef::calc_glyph_name (SCM smob) { - Item *s = unsmob_item (smob); + Item *s = Item::unsmob (smob); SCM glyph = s->get_property ("glyph"); if (scm_is_string (glyph)) @@ -53,7 +53,7 @@ MAKE_SCHEME_CALLBACK (Clef, print, 1) SCM Clef::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); SCM glyph_scm = me->get_property ("glyph-name"); if (!scm_is_string (glyph_scm)) return SCM_EOL; @@ -63,6 +63,7 @@ Clef::print (SCM smob) Stencil out = fm->find_by_name (glyph); if (out.is_empty ()) me->warning (_f ("clef `%s' not found", glyph.c_str ())); + return out.smobbed_copy (); }