X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-scheme.cc;h=1bbc53212ab2b04fa3280fcbd1639d3b2b4a1182;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=e5976a569b799b4db7a4fa6562afe6ee4953cb0f;hpb=a27aa206869ce9f5520de3a825b72c71070f5077;p=lilypond.git diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index e5976a569b..1bbc53212a 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2012 Jan Nieuwenhuizen + Copyright (C) 1998--2014 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -25,6 +25,7 @@ #include "paper-score.hh" #include "simple-closure.hh" #include "system.hh" +#include "unpure-pure-container.hh" #include "warn.hh" // error () LY_DEFINE (ly_grob_property_data, "ly:grob-property-data", @@ -450,7 +451,7 @@ LY_DEFINE (ly_grob_chain_callback, "ly:grob-chain-callback", Grob *gr = unsmob_grob (grob); LY_ASSERT_SMOB (Grob, grob, 1); - LY_ASSERT_TYPE (ly_is_procedure, proc, 2); + SCM_ASSERT_TYPE (ly_is_procedure (proc) || is_unpure_pure_container (proc), proc, SCM_ARG2, __FUNCTION__, "procedure or unpure pure container"); LY_ASSERT_TYPE (ly_is_symbol, sym, 3); chain_callback (gr, proc, sym);