X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=cbdf210071503b299487dc95290ee14888427609;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=61f8a5b2d826f3a960f4ecf122c91c3b87c10819;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 61f8a5b2d8..cbdf210071 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ @@ -165,7 +165,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect) } if (do_repcommands) - add_repeat_command (scm_listify (ly_symbol2scm ("volta"), + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED)); } } @@ -199,7 +199,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect) alternative_cons_ = ly_cdr (alternative_cons_); if (do_repcommands) - add_repeat_command (scm_listify (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); @@ -223,7 +223,7 @@ Unfolded_repeat_iterator::next_element (bool side_effect) if (do_repcommands) { String repstr = to_str (done_count_ + 1) + "."; - add_repeat_command (scm_listify (ly_symbol2scm ("volta"), + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), ly_str02scm (repstr.ch_C ()), SCM_UNDEFINED)); add_repeat_command (ly_symbol2scm ("end-repeat")); } @@ -259,7 +259,7 @@ Unfolded_repeat_iterator::construct_children () Repeated_music * mus =dynamic_cast (music_l ()); alternative_cons_ = (mus->alternatives ()) - ? mus->alternatives ()->music_list () + ? mus->alternatives () : SCM_EOL; for (SCM p = alternative_cons_; gh_pair_p (p); p = ly_cdr (p)) @@ -289,14 +289,14 @@ void Unfolded_repeat_iterator::add_repeat_command (SCM what) { SCM reps = ly_symbol2scm ("repeatCommands"); - SCM current_reps = report_to_l ()->get_property (reps); + SCM current_reps = report_to_l ()->internal_get_property (reps); Translator_group * where = report_to_l ()->where_defined (reps); if (where && current_reps == SCM_EOL || gh_pair_p (current_reps)) { current_reps = gh_cons (what, current_reps); - where->set_property (reps, current_reps); + where->internal_set_property (reps, current_reps); } }