X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=97c76dfd7e5b5b82f1ce02186118981ac67a42c9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=20f9dc68e8aba9b8e3ad24a82b56b288b0a5aaa1;hpb=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 20f9dc68e8..97c76dfd7e 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,13 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 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); @@ -20,16 +22,10 @@ bool check_grob (Music *mus, SCM sym); void Property_iterator::process (Moment m) { - SCM sym = get_music ()->get_property ("symbol"); - if (ly_c_symbol_p (sym)) - { - SCM val = get_music ()->get_property ("value"); - bool ok= true; - if (val != SCM_EOL) - ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); - if (ok) - get_outlet ()->internal_set_property (sym, val); - } + send_stream_event (get_outlet (), "SetProperty", get_music ()->origin (), + ly_symbol2scm ("symbol"), get_music ()->get_property ("symbol"), + ly_symbol2scm ("value"), get_music ()->get_property ("value")); + Simple_music_iterator::process (m); } @@ -37,63 +33,62 @@ void Property_unset_iterator::process (Moment m) { SCM sym = get_music ()->get_property ("symbol"); - type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); - get_outlet ()->unset_property (sym); + send_stream_event (get_outlet (), "UnsetProperty", get_music ()->origin (), + ly_symbol2scm ("symbol"), 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 ctx, SCM music) { - Music * m = unsmob_music (music); - Context * tg - = dynamic_cast (unsmob_context (translator)); - SCM sym = m->get_property ("symbol"); + Music *m = unsmob_music (music); + Context *c = unsmob_context (ctx); - tg->unset_property (sym); + send_stream_event (c, "UnsetProperty", m->origin (), + ly_symbol2scm ("symbol"), m->get_property ("symbol")); return SCM_UNSPECIFIED; } 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 (); - 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)); } } - -SCM list_p = 0; - -/* - This is a rather crude check: we merely check if the translator - property is a list. - */ bool check_grob (Music *mus, SCM sym) { - if (!list_p) - { - list_p = scm_c_eval_string ("list?"); - } - - - SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?")); - bool ok = type == list_p; + bool g = to_boolean (scm_object_property (sym, ly_symbol2scm ("is-grob?"))); - if (!ok) + if (!g) + mus->origin ()->warning (_f ("not a grob name, `%s'", + ly_symbol2string (sym))); + + return g; +} + +SCM +get_property_path (Music *m) +{ + SCM grob_property_path = m->get_property ("grob-property-path"); + + 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,31 +97,38 @@ 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); - - execute_pushpop_property (get_outlet (), sym, eprop, val); + send_stream_event (get_outlet (), "Revert", get_music ()->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); + + send_stream_event (get_outlet (), "Override", get_music ()->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path, + ly_symbol2scm ("value"), 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) +Push_property_iterator::once_finalization (SCM ctx, SCM music) { - Music * mus = unsmob_music (music); - Context * tg = dynamic_cast (unsmob_context (trans)); - + Music *mus = unsmob_music (music); + Context *c = unsmob_context (ctx); + 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); + + send_stream_event (c, "Revert", mus->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); } return SCM_UNSPECIFIED; } @@ -134,12 +136,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 (); - 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)); } @@ -149,19 +151,19 @@ 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 ()); + + send_stream_event (get_outlet (), "Revert", get_music ()->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); } Simple_music_iterator::process (m); } - - IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator); IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator); -