/*
- 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 <hanwen@xs4all.nl>
- (c) 1997--2009 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
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "property-iterator.hh"
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
{
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
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 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;
}
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));
}
}
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);
}