X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-scheme.cc;h=e3aa2aaab29aba19712b7f2d56d834279cddde21;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=00fc5e154d2a152497dd0ed3d6adae76bd12ae9a;hpb=ddd59edaae68e71d5d3ea2576b3d0d25807fb500;p=lilypond.git diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc index 00fc5e154d..e3aa2aaab2 100644 --- a/lily/engraver-scheme.cc +++ b/lily/engraver-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2009 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 @@ -21,20 +21,36 @@ #include "grob.hh" LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob", - 3, 0, 0, (SCM engraver, SCM grob_name, SCM cause), - "Creates a grob originating from given engraver instance, " - "with give @code{grob_name}, a symbol. " - "@code{cause} should either be another grob " - "or a music event.") + 3, 0, 0, (SCM engraver, SCM grob_name, SCM cause), + "Create a grob originating from given @var{engraver} instance," + " with given @var{grob-name}, a symbol." + " @var{cause} should either be another grob" + " or a music event.") { - LY_ASSERT_TYPE (unsmob_engraver, engraver, 1); + LY_ASSERT_SMOB (Engraver, engraver, 1); LY_ASSERT_TYPE (ly_is_symbol, grob_name, 2); LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3); - Grob *g = unsmob_engraver (engraver)-> - internal_make_grob(grob_name, cause, - ly_symbol2string (grob_name).c_str (), - "scheme", 0, "scheme"); + Grob *g = Engraver::unsmob (engraver)-> + internal_make_grob (grob_name, cause, + ly_symbol2string (grob_name).c_str (), + "scheme", 0, "scheme"); return g->self_scm (); } +LY_DEFINE (ly_engraver_announce_end_grob, "ly:engraver-announce-end-grob", + 3, 0, 0, (SCM engraver, SCM grob, SCM cause), + "Announce the end of a grob (i.e., the end of a spanner)" + " originating from given @var{engraver} instance, with" + " @var{grob} being a grob. @var{cause} should either" + " be another grob or a music event.") +{ + LY_ASSERT_SMOB (Engraver, engraver, 1); + LY_ASSERT_SMOB (Grob, grob, 2); + LY_ASSERT_TYPE (ly_is_grob_cause, cause, 3); + + Engraver::unsmob (engraver)-> + announce_end_grob (Grob::unsmob (grob), cause); + + return SCM_UNSPECIFIED; +}