X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=53d88d548ca6544f5f8c00ec075dcced72cf54ac;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=9ff020881b234aa10f55832fafdcbb7219896b00;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 9ff020881b..53d88d548c 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -1,16 +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--2014 Han-Wen Nienhuys - (c) 1997--2005 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); @@ -19,80 +31,90 @@ 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)) + Context *o = get_outlet (); + Music *m = get_music (); + bool once = to_boolean (m->get_property ("once")); + SCM symbol = m->get_property ("symbol"); + SCM previous_value = SCM_UNDEFINED; + if (once) { + Context *w = o->where_defined (symbol, &previous_value); + if (o != w) + previous_value = SCM_UNDEFINED; + } + send_stream_event (o, "SetProperty", m->origin (), + ly_symbol2scm ("symbol"), symbol, + ly_symbol2scm ("value"), m->get_property ("value")); + + /* For \once \set install a finalization hook to reset the property to the + * previous value after the timestep */ + if (once) { - 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); + Global_context *tg = get_outlet ()->get_global_context (); + tg->add_finalization (scm_list_n (once_finalization_proc, + o->self_scm (), m->self_scm (), + ly_quote_scm (previous_value), SCM_UNDEFINED)); } - Simple_music_iterator::process (m); + + Simple_music_iterator::process (mom); } 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, 3); SCM -Property_iterator::once_finalization (SCM translator, SCM music) +Property_iterator::once_finalization (SCM ctx, SCM music, SCM previous_value) { Music *m = unsmob_music (music); - Context *tg - = dynamic_cast (unsmob_context (translator)); - SCM sym = m->get_property ("symbol"); + Context *c = unsmob_context (ctx); + + // Do not use UnsetProperty, which sets the default, but rather + // cache the value before the \once \set command and restore it now + send_stream_event (c, "SetProperty", m->origin (), + ly_symbol2scm ("symbol"), m->get_property ("symbol"), + ly_symbol2scm ("value"), previous_value); - tg->unset_property (sym); return SCM_UNSPECIFIED; } void 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)); - } } -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?"); - } + 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 type = scm_object_property (sym, ly_symbol2scm ("translation-type?")); - bool ok = type == list_p; + 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 @@ -101,31 +123,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); + && !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 trans, SCM music) +Push_property_iterator::once_finalization (SCM ctx, SCM music) { Music *mus = unsmob_music (music); - Context *tg = dynamic_cast (unsmob_context (trans)); + Context *c = unsmob_context (ctx); SCM sym = mus->get_property ("symbol"); if (check_grob (mus, sym)) { - SCM eprop = mus->get_property ("grob-property"); + SCM grob_property_path = get_property_path (mus); - execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED); + send_stream_event (c, "Revert", mus->origin (), + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); } return SCM_UNSPECIFIED; } @@ -140,7 +169,7 @@ Push_property_iterator::do_quit () Global_context *tg = get_outlet ()->get_global_context (); tg->add_finalization (scm_list_n (once_finalization_proc, - trans, music, SCM_UNDEFINED)); + trans, music, SCM_UNDEFINED)); } } @@ -151,8 +180,11 @@ Pop_property_iterator::process (Moment m) 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); } @@ -161,4 +193,3 @@ IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator); IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator); -