X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=f067a6628212b29ec6d2d9350676fb7483adbd03;hb=9ae52034113dcfbbc98fd7a0f8075ca3ea2cf3c9;hp=480b506858d7fe62b885c1cf14861351a42ec91c;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 480b506858..f067a66282 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,16 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "property-iterator.hh" -#include "music.hh" -#include "translator-def.hh" -#include "translator-group.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,82 +22,147 @@ bool check_grob(Music *mus, SCM sym); void Property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); - if (gh_symbol_p (sym)) - { - SCM val = get_music ()->get_mus_property ("value"); - bool ok= true; - if (val != SCM_EOL) - ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); - if (ok) - report_to ()->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); } void Property_unset_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); - type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); - report_to ()->unset_property (sym); + SCM sym = get_music ()->get_property ("symbol"); + 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); +SCM +Property_iterator::once_finalization (SCM ctx, SCM music) +{ + Music *m = unsmob_music (music); + Context *c = unsmob_context (ctx); -SCM list_p = 0; + send_stream_event (c, "UnsetProperty", m->origin (), + ly_symbol2scm ("symbol"), m->get_property ("symbol")); + return SCM_UNSPECIFIED; +} -bool -check_grob(Music *mus, SCM sym) +void +Property_iterator::do_quit () { - if (!list_p) + if (to_boolean (get_music ()->get_property ("once"))) { - list_p = gh_eval_str ("list?"); + SCM trans = get_outlet ()->self_scm (); + SCM music = get_music ()->self_scm (); + + Global_context *tg = get_outlet ()->get_global_context (); + tg->add_finalization (scm_list_n (once_finalization_proc, + trans, music, SCM_UNDEFINED)); } - - - SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?")); - bool ok = type == list_p; +} + +bool +check_grob (Music *mus, SCM sym) +{ + bool g = to_boolean (scm_object_property (sym, ly_symbol2scm ("is-grob?"))); + + 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"); - 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 Push_property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); + SCM sym = get_music ()->get_property ("symbol"); if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_mus_property ("grob-property"); - SCM val = get_music ()->get_mus_property ("grob-value"); + 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"))) + 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); +} - if (to_boolean (get_music ()->get_mus_property ("pop-first"))) - Translator_def::apply_pushpop_property (report_to (), - sym, eprop, SCM_UNDEFINED); +MAKE_SCHEME_CALLBACK (Push_property_iterator, once_finalization, 2); +SCM +Push_property_iterator::once_finalization (SCM ctx, SCM music) +{ + Music *mus = unsmob_music (music); + Context *c = unsmob_context (ctx); + + SCM sym = mus->get_property ("symbol"); + if (check_grob (mus, sym)) + { + SCM grob_property_path = get_property_path (mus); - Translator_def::apply_pushpop_property (report_to (), sym, eprop, val); + send_stream_event (c, "Revert", mus->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); + } + return SCM_UNSPECIFIED; +} + +void +Push_property_iterator::do_quit () +{ + 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 (); + tg->add_finalization (scm_list_n (once_finalization_proc, + trans, music, SCM_UNDEFINED)); } - Simple_music_iterator::process (m); } void Pop_property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); + SCM sym = get_music ()->get_property ("symbol"); + if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_mus_property ("grob-property"); - Translator_def::apply_pushpop_property (report_to (), 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);