X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=a4c993b75644a943fa5ce77255385bf71793c367;hb=585959e4a373db9658d84ace8f3d4f4f6af7b190;hp=84c237cbcd42ec244065b41a23bd9244aaea1d06;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 84c237cbcd..a4c993b756 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,15 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "property-iterator.hh" -#include "music.hh" + #include "context-def.hh" #include "global-context.hh" +#include "international.hh" +#include "music.hh" -bool check_grob(Music *mus, SCM sym); +bool check_grob (Music *mus, SCM sym); /** There is no real processing to a property: just lookup the @@ -21,10 +23,10 @@ void Property_iterator::process (Moment m) { SCM sym = get_music ()->get_property ("symbol"); - if (gh_symbol_p (sym)) + if (scm_is_symbol (sym)) { SCM val = get_music ()->get_property ("value"); - bool ok= true; + bool ok = true; if (val != SCM_EOL) ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); if (ok) @@ -37,18 +39,18 @@ void Property_unset_iterator::process (Moment m) { SCM sym = get_music ()->get_property ("symbol"); - type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); + type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); get_outlet ()->unset_property (sym); Simple_music_iterator::process (m); } -MAKE_SCHEME_CALLBACK(Property_iterator,once_finalization, 2); +MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 2); SCM -Property_iterator::once_finalization(SCM translator, SCM music ) +Property_iterator::once_finalization (SCM translator, SCM music) { - Music * m = unsmob_music (music); - Context * tg + Music *m = unsmob_music (music); + Context *tg = dynamic_cast (unsmob_context (translator)); SCM sym = m->get_property ("symbol"); @@ -59,41 +61,41 @@ Property_iterator::once_finalization(SCM translator, SCM music ) void Property_iterator::do_quit () { - if (to_boolean (get_music ()->get_property ("once"))) + if (to_boolean (get_music ()->get_property ("once"))) { - SCM trans = get_outlet ()->self_scm(); - SCM music = get_music()->self_scm(); + SCM trans = get_outlet ()->self_scm (); + SCM music = get_music ()->self_scm (); - Global_context * tg = get_outlet ()->get_global_context (); + Global_context *tg = get_outlet ()->get_global_context (); tg->add_finalization (scm_list_n (once_finalization_proc, trans, music, SCM_UNDEFINED)); } } +bool +check_grob (Music *mus, SCM sym) +{ + bool g = to_boolean (scm_object_property (sym, ly_symbol2scm ("is-grob?"))); -SCM list_p = 0; + if (!g) + mus->origin ()->warning (_f ("not a grob name, `%s'", + ly_symbol2string (sym))); -/* - This is a rather crude check: we merely check if the translator - property is a list. - */ -bool -check_grob(Music *mus, SCM sym) + return g; +} + +SCM +get_property_path (Music *m) { - if (!list_p) - { - list_p = gh_eval_str ("list?"); - } - - - SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?")); - bool ok = type == list_p; + SCM grob_property_path = m->get_property ("grob-property-path"); - if (!ok) + SCM eprop = m->get_property ("grob-property"); + if (scm_is_symbol (eprop)) { - mus->origin()->warning (_f("Not a grob name, `%s'." , ly_symbol2string (sym))); + grob_property_path = scm_list_1 (eprop); } - return ok; + + return grob_property_path; } void @@ -102,32 +104,32 @@ Push_property_iterator::process (Moment m) SCM sym = get_music ()->get_property ("symbol"); if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_property ("grob-property"); + SCM grob_property_path = get_property_path (get_music ()); SCM val = get_music ()->get_property ("grob-value"); if (to_boolean (get_music ()->get_property ("pop-first")) - && !to_boolean (get_music ()->get_property ("once")) - ) - execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED); + && !to_boolean (get_music ()->get_property ("once"))) + + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED); - execute_pushpop_property (get_outlet (), sym, eprop, val); + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, val); } Simple_music_iterator::process (m); } -MAKE_SCHEME_CALLBACK(Push_property_iterator,once_finalization, 2); +MAKE_SCHEME_CALLBACK (Push_property_iterator, once_finalization, 2); SCM Push_property_iterator::once_finalization (SCM trans, SCM music) { - Music * mus = unsmob_music (music); - Context * tg = dynamic_cast (unsmob_context (trans)); - + Music *mus = unsmob_music (music); + Context *tg = dynamic_cast (unsmob_context (trans)); + SCM sym = mus->get_property ("symbol"); if (check_grob (mus, sym)) { - SCM eprop = mus->get_property ("grob-property"); - - execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED); + SCM grob_property_path = get_property_path (mus); + + execute_general_pushpop_property (tg, sym, grob_property_path, SCM_UNDEFINED); } return SCM_UNSPECIFIED; } @@ -135,12 +137,12 @@ Push_property_iterator::once_finalization (SCM trans, SCM music) void Push_property_iterator::do_quit () { - if (to_boolean (get_music ()->get_property ("once"))) + if (to_boolean (get_music ()->get_property ("once"))) { - SCM trans = get_outlet ()->self_scm(); - SCM music = get_music ()->self_scm(); + SCM trans = get_outlet ()->self_scm (); + SCM music = get_music ()->self_scm (); - Global_context * tg= get_outlet ()->get_global_context (); + Global_context *tg = get_outlet ()->get_global_context (); tg->add_finalization (scm_list_n (once_finalization_proc, trans, music, SCM_UNDEFINED)); } @@ -150,17 +152,15 @@ void Pop_property_iterator::process (Moment m) { SCM sym = get_music ()->get_property ("symbol"); - + if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_property ("grob-property"); -execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED); + SCM grob_property_path = get_property_path (get_music ()); + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED); } Simple_music_iterator::process (m); } - - IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator); IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_iterator);