X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=20f9dc68e8aba9b8e3ad24a82b56b288b0a5aaa1;hb=6d2e47f69fe7ca82e89334abaa640e82cd1581ef;hp=cde3cc848e39f2481613c69bf4bed673eca56ade;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index cde3cc848e..20f9dc68e8 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,17 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "property-iterator.hh" #include "music.hh" -#include "translator-def.hh" -#include "translator-group.hh" -#include "global-translator.hh" +#include "context-def.hh" +#include "global-context.hh" - -bool check_grob(Music *mus, SCM sym); +bool check_grob (Music *mus, SCM sym); /** There is no real processing to a property: just lookup the @@ -22,15 +20,15 @@ bool check_grob(Music *mus, SCM sym); void Property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); - if (gh_symbol_p (sym)) + SCM sym = get_music ()->get_property ("symbol"); + if (ly_c_symbol_p (sym)) { - SCM val = get_music ()->get_mus_property ("value"); + 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) - report_to ()->internal_set_property (sym, val); + get_outlet ()->internal_set_property (sym, val); } Simple_music_iterator::process (m); } @@ -38,21 +36,21 @@ Property_iterator::process (Moment m) void Property_unset_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); + SCM sym = get_music ()->get_property ("symbol"); type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); - report_to ()->unset_property (sym); + get_outlet ()->unset_property (sym); Simple_music_iterator::process (m); } -MAKE_SCHEME_CALLBACK(Property_iterator,once_finalization, 2); +MAKE_SCHEME_CALLBACK (Property_iterator,once_finalization, 2); SCM -Property_iterator::once_finalization(SCM translator, SCM music ) +Property_iterator::once_finalization (SCM translator, SCM music ) { Music * m = unsmob_music (music); - Translator_group * tg - = dynamic_cast (unsmob_translator (translator)); - SCM sym = m->get_mus_property ("symbol"); + Context * tg + = dynamic_cast (unsmob_context (translator)); + SCM sym = m->get_property ("symbol"); tg->unset_property (sym); return SCM_UNSPECIFIED; @@ -61,13 +59,12 @@ Property_iterator::once_finalization(SCM translator, SCM music ) void Property_iterator::do_quit () { - if (to_boolean (get_music ()->get_mus_property ("once"))) + if (to_boolean (get_music ()->get_property ("once"))) { - SCM trans = report_to()->self_scm(); - SCM music = get_music()->self_scm(); - - Global_translator * tg= report_to()->top_translator (); + 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)); } @@ -81,11 +78,11 @@ SCM list_p = 0; property is a list. */ bool -check_grob(Music *mus, SCM sym) +check_grob (Music *mus, SCM sym) { if (!list_p) { - list_p = gh_eval_str ("list?"); + list_p = scm_c_eval_string ("list?"); } @@ -94,7 +91,7 @@ check_grob(Music *mus, SCM sym) if (!ok) { - mus->origin()->warning (_f("Not a grob name, `%s'." , ly_symbol2string (sym))); + mus->origin ()->warning (_f ("Not a grob name, `%s'." , ly_symbol2string (sym))); } return ok; } @@ -102,35 +99,34 @@ check_grob(Music *mus, SCM sym) void Push_property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); + SCM sym = get_music ()->get_property ("symbol"); if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_mus_property ("grob-property"); - SCM val = get_music ()->get_mus_property ("grob-value"); + SCM eprop = get_music ()->get_property ("grob-property"); + SCM val = get_music ()->get_property ("grob-value"); - if (to_boolean (get_music ()->get_mus_property ("pop-first")) - && !to_boolean (get_music ()->get_mus_property ("once")) - ) - report_to()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); + 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); - report_to()->execute_pushpop_property (sym, eprop, val); + execute_pushpop_property (get_outlet (), sym, eprop, val); } Simple_music_iterator::process (m); } -MAKE_SCHEME_CALLBACK(Push_property_iterator,once_finalization, 2); +MAKE_SCHEME_CALLBACK (Push_property_iterator,once_finalization, 2); SCM Push_property_iterator::once_finalization (SCM trans, SCM music) { Music * mus = unsmob_music (music); - Translator_group * tg = dynamic_cast (unsmob_translator (trans)); + Context * tg = dynamic_cast (unsmob_context (trans)); - SCM sym = mus->get_mus_property ("symbol"); + SCM sym = mus->get_property ("symbol"); if (check_grob (mus, sym)) { - SCM eprop = mus->get_mus_property ("grob-property"); + SCM eprop = mus->get_property ("grob-property"); - tg->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); + execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED); } return SCM_UNSPECIFIED; } @@ -138,12 +134,12 @@ Push_property_iterator::once_finalization (SCM trans, SCM music) void Push_property_iterator::do_quit () { - if (to_boolean (get_music ()->get_mus_property ("once"))) + if (to_boolean (get_music ()->get_property ("once"))) { - SCM trans = report_to()->self_scm(); - SCM music = get_music ()->self_scm(); + SCM trans = get_outlet ()->self_scm (); + SCM music = get_music ()->self_scm (); - Global_translator * tg= report_to()->top_translator (); + Global_context * tg= get_outlet ()->get_global_context (); tg->add_finalization (scm_list_n (once_finalization_proc, trans, music, SCM_UNDEFINED)); } @@ -152,13 +148,13 @@ Push_property_iterator::do_quit () void Pop_property_iterator::process (Moment m) { - SCM sym = get_music ()->get_mus_property ("symbol"); + SCM sym = get_music ()->get_property ("symbol"); if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_mus_property ("grob-property"); - report_to()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); - } + SCM eprop = get_music ()->get_property ("grob-property"); +execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED); + } Simple_music_iterator::process (m); }