X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=97c76dfd7e5b5b82f1ce02186118981ac67a42c9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9d61539a12172c7124da4a3fe1c15b41a59b07c5;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 9d61539a12..97c76dfd7e 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,60 +3,167 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "property-iterator.hh" + +#include "context-def.hh" +#include "global-context.hh" +#include "international.hh" #include "music.hh" -#include "translator-def.hh" -#include "translator-group.hh" + +bool check_grob (Music *mus, SCM sym); /** - There is no real processing to a property: just lookup the - translation unit, and set the property. - */ + There is no real processing to a property: just lookup the + translation unit, and set the property. +*/ void Property_iterator::process (Moment m) { - SCM sym = music_l_->get_mus_property ("symbol"); - if (gh_symbol_p(sym)) + 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_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); + + 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"))) { - SCM val = music_l_->get_mus_property ("value"); - bool ok= true; - if (val != SCM_EOL) - ok = type_check_assignment (val, sym, ly_symbol2scm ("translation-type?")); - if (ok) - report_to_l ()->set_property (sym, val); + 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); +} + +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"); + + SCM eprop = m->get_property ("grob-property"); + if (scm_is_symbol (eprop)) + { + grob_property_path = scm_list_1 (eprop); + } + + return grob_property_path; } void Push_property_iterator::process (Moment m) { - SCM syms = music_l_->get_mus_property ("symbols"); - SCM eprop = music_l_->get_mus_property ("grob-property"); - SCM val = music_l_->get_mus_property ("grob-value"); - - if (to_boolean (music_l_->get_mus_property ( "pop-first"))) - Translator_def::apply_pushpop_property (report_to_l (), - syms, eprop, SCM_UNDEFINED); + SCM sym = get_music ()->get_property ("symbol"); + if (check_grob (get_music (), sym)) + { + SCM grob_property_path = get_property_path (get_music ()); + SCM val = get_music ()->get_property ("grob-value"); - Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val); - + 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); } +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); + + 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)); + } +} + void Pop_property_iterator::process (Moment m) { - SCM syms = music_l_->get_mus_property ("symbols"); - SCM eprop = music_l_->get_mus_property ("grob-property"); - Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, SCM_UNDEFINED); - + SCM sym = get_music ()->get_property ("symbol"); + + if (check_grob (get_music (), sym)) + { + 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 (Pop_property_iterator); +IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); +IMPLEMENT_CTOR_CALLBACK (Property_iterator); +IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);