source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#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);
void
Property_iterator::process (Moment m)
{
- 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);
- }
+ 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);
}
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);
SCM
-Property_iterator::once_finalization (SCM translator, SCM music)
+Property_iterator::once_finalization (SCM ctx, SCM music)
{
Music *m = unsmob_music (music);
- Context *tg
- = dynamic_cast<Context *> (unsmob_context (translator));
- SCM sym = m->get_property ("symbol");
+ Context *c = unsmob_context (ctx);
- tg->unset_property (sym);
+ send_stream_event (c, "UnsetProperty", m->origin (),
+ ly_symbol2scm ("symbol"), m->get_property ("symbol"));
return SCM_UNSPECIFIED;
}
return g;
}
+SCM
+get_property_path (Music *m)
+{
+ SCM grob_property_path = m->get_property ("grob-property-path");
+
+ SCM eprop = m->get_property ("grob-property");
+ if (scm_is_symbol (eprop))
+ {
+ grob_property_path = scm_list_1 (eprop);
+ }
+
+ return grob_property_path;
+}
void
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);
+ 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<Context *> (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;
}
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);
}
IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
IMPLEMENT_CTOR_CALLBACK (Property_iterator);
IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);
-