X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=4725406323e46efceef64fb788543788009c6c76;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=78c2b3ec714612d5c10b3ab63ed0c8555010bfd6;hpb=c76d27c59244a331a2873a40e0d7e40ad378d4b8;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 78c2b3ec71..4725406323 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -1,15 +1,28 @@ /* - property-iterator.cc -- implement Property_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #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); @@ -18,82 +31,56 @@ bool check_grob (Music *mus, SCM sym); translation unit, and set the property. */ void -Property_iterator::process (Moment m) +Property_iterator::process (Moment mom) { - SCM sym = get_music ()->get_property ("symbol"); - if (scm_is_symbol (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); - } - Simple_music_iterator::process (m); -} + Context *o = get_outlet (); + Music *m = get_music (); -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 (o, "SetProperty", m->origin (), + ly_symbol2scm ("symbol"), m->get_property ("symbol"), + ly_symbol2scm ("value"), m->get_property ("value"), + ly_symbol2scm ("once"), m->get_property ("once")); - Simple_music_iterator::process (m); + Simple_music_iterator::process (mom); } -MAKE_SCHEME_CALLBACK (Property_iterator,once_finalization, 2); -SCM -Property_iterator::once_finalization (SCM translator, SCM music ) +void +Property_unset_iterator::process (Moment mom) { - Music * m = unsmob_music (music); - Context * tg - = dynamic_cast (unsmob_context (translator)); - SCM sym = m->get_property ("symbol"); + Context *o = get_outlet (); + Music *m = get_music (); + + send_stream_event (o, "UnsetProperty", m->origin (), + ly_symbol2scm ("symbol"), m->get_property ("symbol"), + ly_symbol2scm ("once"), m->get_property ("once")); - tg->unset_property (sym); - return SCM_UNSPECIFIED; + Simple_music_iterator::process (mom); } -void -Property_iterator::do_quit () +bool +check_grob (Music *mus, SCM sym) { - 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)); - } -} + 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))); -SCM list_p = 0; + return g; +} -/* - This is a rather crude check: we merely check if the translator - property is a list. - */ -bool -check_grob (Music *mus, SCM sym) +SCM +get_property_path (Music *m) { - 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; + 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,66 +89,44 @@ 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"); + SCM once = get_music ()->get_property ("once"); 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); + && !to_boolean (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 ("once"), once, + 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 trans, SCM music) -{ - 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); - } - return SCM_UNSPECIFIED; -} - void -Push_property_iterator::do_quit () +Pop_property_iterator::process (Moment mom) { - 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)); - } -} + Music *m = get_music (); + SCM sym = m->get_property ("symbol"); -void -Pop_property_iterator::process (Moment m) -{ - SCM sym = get_music ()->get_property ("symbol"); - - if (check_grob (get_music (), sym)) + if (check_grob (m, 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 (m); + + send_stream_event (get_outlet (), "Revert", m->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("once"), m->get_property ("once"), + ly_symbol2scm ("property-path"), grob_property_path); } - Simple_music_iterator::process (m); + Simple_music_iterator::process (mom); } - - IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator); IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator); -