From c1b4206f2a710b50c5d3f09da8668e96697e2cd0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 9 Mar 2003 13:49:11 +0000 Subject: [PATCH] (descend_to_child): call descend_to_child() for all types of music. --- ChangeLog | 8 ++++++++ lily/include/sequential-music-iterator.hh | 1 - lily/sequential-iterator.cc | 11 +++++++++++ lily/sequential-music-iterator.cc | 20 +------------------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index aef9ff8510..bbbe9a6a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-09 Han-Wen Nienhuys + + * lily/sequential-iterator.cc (descend_to_child): call + descend_to_child() for all types of music. + 2003-03-08 Jan Nieuwenhuizen * scm/translator-property-description.scm: Add @@ -10,6 +15,9 @@ 2003-03-08 Han-Wen Nienhuys + * scripts/midi2ly.py (Note.dump): never dump duration for + dump_dur=0. + * scm/chords-ignatzek.scm (alteration->text-accidental-markup): new function diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh index b327fcfa96..0e08f27e77 100644 --- a/lily/include/sequential-music-iterator.hh +++ b/lily/include/sequential-music-iterator.hh @@ -22,7 +22,6 @@ public: DECLARE_SCHEME_CALLBACK(constructor, ()); private: virtual SCM get_music_list()const; - virtual void descend_to_child (); }; #endif // SEQUENTIAL_MUSIC_ITERATOR_HH diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 0658853a12..e5ef71e315 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -221,6 +221,17 @@ Sequential_iterator::next_element (bool) void Sequential_iterator::descend_to_child () { + Translator_group * child_report = child_report = iter_->report_to (); + Translator_group * me_report = report_to (); + + Translator_group * c = child_report; + while (c && c != me_report) + { + c= c->daddy_trans_; + } + + if (c == me_report) + set_translator (child_report); } diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc index 6446ea9fee..687af1316b 100644 --- a/lily/sequential-music-iterator.cc +++ b/lily/sequential-music-iterator.cc @@ -11,25 +11,7 @@ #include "sequential-music-iterator.hh" #include "music-list.hh" -/* - move to context of child iterator if it is deeper down in the - hierarchy. - */ -void -Sequential_music_iterator::descend_to_child () -{ - Translator_group * child_report = child_report = iter_->report_to (); - Translator_group * me_report = report_to (); - - Translator_group * c = child_report; - while (c && c != me_report) - { - c= c->daddy_trans_; - } - - if (c == me_report) - set_translator (child_report); -} + IMPLEMENT_CTOR_CALLBACK (Sequential_music_iterator); -- 2.39.2