/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
{
Context *o = get_outlet ();
Music *m = get_music ();
- SCM previous_value = o->get_property (m->get_property ("symbol"));
+ 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"), m->get_property ("symbol"),
- ly_symbol2scm ("value"), m->get_property ("value"));
+ 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 (to_boolean (m->get_property ("once")))
+ 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));
+ tg->add_finalization (scm_list_4 (once_finalization_proc,
+ o->self_scm (), m->self_scm (),
+ previous_value));
}
-
+
Simple_music_iterator::process (mom);
}
void
-Property_unset_iterator::process (Moment m)
+Property_unset_iterator::process (Moment mom)
{
- SCM sym = get_music ()->get_property ("symbol");
- send_stream_event (get_outlet (), "UnsetProperty", get_music ()->origin (),
- ly_symbol2scm ("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, "UnsetProperty", m->origin (),
+ ly_symbol2scm ("symbol"), symbol);
+
+ /* For \once \unset install a finalization hook to reset the property to the
+ * previous value after the timestep */
+ if (once && !SCM_UNBNDP (previous_value))
+ {
+ Global_context *tg = get_outlet ()->get_global_context ();
+ tg->add_finalization (scm_list_4 (Property_iterator::once_finalization_proc,
+ o->self_scm (), m->self_scm (),
+ previous_value));
+ }
- Simple_music_iterator::process (m);
+ Simple_music_iterator::process (mom);
}
MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 3);
SCM
Property_iterator::once_finalization (SCM ctx, SCM music, SCM previous_value)
{
- Music *m = unsmob_music (music);
- Context *c = unsmob_context (ctx);
+ Music *m = Music::unsmob (music);
+ Context *c = Context::unsmob (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);
+ ly_symbol2scm ("symbol"), m->get_property ("symbol"),
+ ly_symbol2scm ("value"), previous_value);
return SCM_UNSPECIFIED;
}
if (!g)
mus->origin ()->warning (_f ("not a grob name, `%s'",
- ly_symbol2string (sym)));
+ ly_symbol2string (sym)));
return g;
}
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);
}
SCM
Push_property_iterator::once_finalization (SCM ctx, SCM music)
{
- Music *mus = unsmob_music (music);
- Context *c = unsmob_context (ctx);
+ Music *mus = Music::unsmob (music);
+ Context *c = Context::unsmob (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);
+ ly_symbol2scm ("symbol"), sym,
+ ly_symbol2scm ("property-path"), grob_property_path);
}
return SCM_UNSPECIFIED;
}
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));
+ tg->add_finalization (scm_list_3 (once_finalization_proc,
+ trans, music));
}
}
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);
}