X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-registration-scheme.cc;h=fb81a9cbd6b4a8f1d1b5e8ecdd86792a8a5d59fa;hb=66a5682bede438bf6663f04fec05e1c1e864e4b0;hp=be54412d8e3721e9dfc6624eba7497a1a1d67f3e;hpb=a1e6874fbb4437f8afbf7be161ff55e4c66197fa;p=lilypond.git diff --git a/lily/tweak-registration-scheme.cc b/lily/tweak-registration-scheme.cc index be54412d8e..fb81a9cbd6 100644 --- a/lily/tweak-registration-scheme.cc +++ b/lily/tweak-registration-scheme.cc @@ -1,21 +1,18 @@ /* - tweak-registration-scheme.cc -- implement Tweak_registry bindings + tweak-registration-scheme.cc -- implement Tweak_registry bindings source file of the GNU LilyPond music typesetter - (c) 2004--2005 Han-Wen Nienhuys - + (c) 2004--2006 Han-Wen Nienhuys */ - #include "tweak-registration.hh" #include "grob.hh" #include "object-key-undumper.hh" LY_DEFINE (ly_clear_tweak_registry, "ly:tweak-clear-registry", 0, 0, 0, (), - "Clear global tweak registry" - ) + "Clear global tweak registry") { global_registry_->clear (); return SCM_UNSPECIFIED; @@ -24,15 +21,14 @@ LY_DEFINE (ly_clear_tweak_registry, "ly:tweak-clear-registry", LY_DEFINE (ly_grob_insert_tweak, "ly:grob-insert-tweak", 2, 0, 0, (SCM grob, SCM tweak), - "add new tweak for grob." - ) + "add new tweak for grob.") { Grob *gr = unsmob_grob (grob); SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "Grob"); SCM_ASSERT_TYPE (scm_list_p (tweak) == SCM_BOOL_T - && ly_c_procedure_p (scm_car (tweak)), + && ly_is_procedure (scm_car (tweak)), tweak, SCM_ARG2, __FUNCTION__, "Tweak"); - + global_registry_->insert_grob_tweak (gr, tweak); return SCM_UNSPECIFIED; } @@ -40,43 +36,36 @@ LY_DEFINE (ly_grob_insert_tweak, "ly:grob-insert-tweak", LY_DEFINE (ly_grob_replace_tweak, "ly:grob-replace-tweak", 2, 0, 0, (SCM grob, SCM tweak), - "Replace tweak for grob." - ) + "Replace tweak for grob.") { Grob *gr = unsmob_grob (grob); SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "Grob"); SCM_ASSERT_TYPE (scm_list_p (tweak) == SCM_BOOL_T - && ly_c_procedure_p (scm_car (tweak)), + && ly_is_procedure (scm_car (tweak)), tweak, SCM_ARG2, __FUNCTION__, "Tweak"); - + global_registry_->replace_grob_tweak (gr, tweak); return SCM_UNSPECIFIED; } - LY_DEFINE (ly_tweak_read_keys, "ly:tweak-define-keys", 1, 0, 0, (SCM keys), - "Read keys" - ) + "Read keys") { - global_registry_->undumper ()->parse_contents (keys); + global_registry_->undumper ()->parse_contents (keys); return SCM_UNSPECIFIED; } - LY_DEFINE (ly_all_tweaks, "ly:all-tweaks", 0, 0, 0, (), - "all tweaks" - ) + "all tweaks") { return global_registry_->list_tweaks (); } - LY_DEFINE (ly_tweak_read_tweaks, "ly:tweak-define-tweaks", 1, 0, 0, (SCM tweaks), - "Read tweaks" - ) + "Read tweaks") { for (SCM s = tweaks; scm_is_pair (s); s = scm_cdr (s)) global_registry_->insert_tweak_from_file (scm_car (s));