X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef.cc;h=6f9062190ef46f91b37ffbbc6b99f3cf01dd70f4;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=3c1ca3752537c9fe61ee4501dd333988c160d6db;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/clef.cc b/lily/clef.cc index 3c1ca37525..6f9062190e 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--2012 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 = 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 = 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 (); }