X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=53d88d548ca6544f5f8c00ec075dcced72cf54ac;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=cfa6fb62861cf66f3e641e386e71100cea0fe3a6;hpb=862601226f319d2395794fe1175e7f17485b8e19;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index cfa6fb6286..53d88d548c 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -1,9 +1,20 @@ /* - 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--2006 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" @@ -20,13 +31,33 @@ bool check_grob (Music *mus, SCM sym); translation unit, and set the property. */ void -Property_iterator::process (Moment m) +Property_iterator::process (Moment mom) { - 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); + 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) + { + 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 (mom); } void @@ -34,35 +65,30 @@ 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); + 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 ctx, SCM music) +Property_iterator::once_finalization (SCM ctx, SCM music, SCM previous_value) { Music *m = unsmob_music (music); Context *c = unsmob_context (ctx); - send_stream_event (c, "UnsetProperty", m->origin (), - ly_symbol2scm ("symbol"), m->get_property ("symbol")); + // 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); + 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)); - } } bool @@ -72,7 +98,7 @@ check_grob (Music *mus, SCM sym) if (!g) mus->origin ()->warning (_f ("not a grob name, `%s'", - ly_symbol2string (sym))); + ly_symbol2string (sym))); return g; } @@ -101,15 +127,15 @@ Push_property_iterator::process (Moment m) 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); - + && !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); + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path, + ly_symbol2scm ("value"), val); } Simple_music_iterator::process (m); } @@ -127,8 +153,8 @@ Push_property_iterator::once_finalization (SCM ctx, SCM music) 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); + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); } return SCM_UNSPECIFIED; } @@ -143,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)); } } @@ -157,8 +183,8 @@ Pop_property_iterator::process (Moment m) 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); + ly_symbol2scm ("symbol"), sym, + ly_symbol2scm ("property-path"), grob_property_path); } Simple_music_iterator::process (m); }