(descend_to_child): call

descend_to_child() for all types of music.

diff --git a/ChangeLog b/ChangeLog
index aef9ff851068bd06a7ee48b9f2d621dee93b3651..bbbe9a6a27c5609930fa3a91752a934186ec82be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/sequential-iterator.cc (descend_to_child): call
+       descend_to_child() for all types of music.
+
 2003-03-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/translator-property-description.scm: Add
@@ -10,6 +15,9 @@
 
 2003-03-08  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 b327fcfa96622331b17aad9ab8a84a5477d1ce30..0e08f27e77f3e8e77dd9b6344c22e18300e378f3 100644 (file)
--- 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 0658853a122a0d14c86879bed50a3d89db8cffff..e5ef71e315383419d03601c96baf32d3286d6092 100644 (file)
--- 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 6446ea9fee46d29062534631393ca315b6bb0531..687af1316bcc7228926536eb9b0b471b083ad4e4 100644 (file)
--- 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);